From 65388f15b90ed88de1102db09a7fa17168e7d236 Mon Sep 17 00:00:00 2001
From: Hesam Rahimi <hesam.rahimi@huawei.com>
Date: Tue, 14 Dec 2021 21:24:28 -0500
Subject: Support for 1+1 protection path for a cloud leased-line (CLL)
 service.

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

Former-commit-id: 1f182c0213ea34d45e3255cd63f34a1ff3b1fca9
---
 ...ogy-operation-cll-F1-Activate-w-Protection.json | 3850 ++++++++++
 ...cll-vnf-topology-operation-cll-F1-Activate.json | 2715 +++----
 ...URCE-API_cll-vnf-topology-operation-cll-F1.json | 2573 +++++--
 ...ll-vnf-topology-operation-cll-create-clean.json | 6248 ++++++++++-----
 ...-API_cll-vnf-topology-operation-cll-delete.json | 7508 +++++++++++-------
 ...ration-cll-helper-find-SECONDARY-ROOT-conn.json |  611 ++
 ...-API_cll-vnf-topology-operation-cll-modify.json | 8097 +++++++++++++-------
 ...ogy-operation-get-otn-tunnel-path-from-oof.json | 3214 ++++++--
 .../src/main/resources/graph.versions              |    2 +
 ...logy-operation-cll-F1-Activate-w-Protection.xml |  834 ++
 ..._cll-vnf-topology-operation-cll-F1-Activate.xml |  783 +-
 ...OURCE-API_cll-vnf-topology-operation-cll-F1.xml |  333 +
 ...cll-vnf-topology-operation-cll-create-clean.xml |  525 +-
 ...E-API_cll-vnf-topology-operation-cll-delete.xml |  395 +-
 ...eration-cll-helper-find-SECONDARY-ROOT-conn.xml |   88 +
 ...E-API_cll-vnf-topology-operation-cll-modify.xml |  580 +-
 ...logy-operation-get-otn-tunnel-path-from-oof.xml |  446 +-
 17 files changed, 28038 insertions(+), 10764 deletions(-)
 create mode 100644 platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate-w-Protection.json
 create mode 100644 platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn.json
 create mode 100644 platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate-w-Protection.xml
 create mode 100644 platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn.xml

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

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
new file mode 100644
index 00000000..2fdcec43
--- /dev/null
+++ 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
@@ -0,0 +1,3850 @@
+[
+  {
+    "id": "61751fea.5e29c",
+    "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": 309,
+    "y": 328,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "9390d80.e27dda8",
+        "a2edd3b5.431178",
+        "d95bcddf.5304c8"
+      ]
+    ]
+  },
+  {
+    "id": "9390d80.e27dda8",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 497,
+    "y": 341,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "122deece.249539"
+      ]
+    ]
+  },
+  {
+    "id": "a2edd3b5.431178",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 504.4909362792969,
+    "y": 383.57403564453125,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "d95bcddf.5304c8",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 495,
+    "y": 430,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "c3fd03f5.ced1a"
+      ]
+    ]
+  },
+  {
+    "id": "122deece.249539",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 670,
+    "y": 339,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "26858e32.576aa2"
+      ]
+    ]
+  },
+  {
+    "id": "26858e32.576aa2",
+    "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": 899,
+    "y": 340,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "b9b3eee1.451228"
+      ]
+    ]
+  },
+  {
+    "id": "b9b3eee1.451228",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic='true'>",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 1114,
+    "y": 341,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "1ab82d5c.a19413"
+      ]
+    ]
+  },
+  {
+    "id": "7e7f1310.5e5bcc",
+    "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": 1368,
+    "y": 263,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "55ca13fd.72ee7c",
+        "6e8bc799.ce2fa8"
+      ]
+    ]
+  },
+  {
+    "id": "55ca13fd.72ee7c",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1585,
+    "y": 242,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "1ab82d5c.a19413"
+      ]
+    ]
+  },
+  {
+    "id": "6e8bc799.ce2fa8",
+    "type": "outcomeFalse",
+    "name": "false",
+    "xml": "<outcome value='false'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1585,
+    "y": 291,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "1ab82d5c.a19413",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic='true'>",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 1769,
+    "y": 328,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "554ac9a2.79f95",
+        "2ade390a.34dac6",
+        "c0e6872b.6bc578"
+      ]
+    ]
+  },
+  {
+    "id": "c3307b8c.0344e",
+    "type": "dgstart",
+    "name": "DGSTART",
+    "outputs": 1,
+    "x": 128,
+    "y": 69,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "7e5b3842.1b2ff"
+      ]
+    ]
+  },
+  {
+    "id": "7e5b3842.1b2ff",
+    "type": "service-logic",
+    "name": "GENERIC-RESOURCE-API ${project.version}",
+    "module": "GENERIC-RESOURCE-API",
+    "version": "${project.version}",
+    "comments": "",
+    "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
+    "outputs": 1,
+    "x": 412.2856903076172,
+    "y": 130.23810863494873,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "ff8ac0a6.a31ac8"
+      ]
+    ]
+  },
+  {
+    "id": "ff8ac0a6.a31ac8",
+    "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": 418.42860412597656,
+    "y": 215.00003051757812,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "610b4dde.c4293c"
+      ]
+    ]
+  },
+  {
+    "id": "610b4dde.c4293c",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 728.238037109375,
+    "y": 206.66668701171875,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "61751fea.5e29c",
+        "fda13949.60eb78",
+        "47d2cfff.4a0e4",
+        "8845442c.1d5de8",
+        "72564454.b964f4"
+      ]
+    ]
+  },
+  {
+    "id": "554ac9a2.79f95",
+    "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": 1986,
+    "y": 266,
+    "z": "b60623c5.e2d9e8",
+    "wires": []
+  },
+  {
+    "id": "e1c41eb3.6dc5b8",
+    "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": 4155,
+    "y": 152,
+    "z": "b60623c5.e2d9e8",
+    "wires": []
+  },
+  {
+    "id": "7981558d.d1f29c",
+    "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": 4236,
+    "y": 467,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "4cd7b5eb.5f75fc",
+        "8c7597f3.3a32c"
+      ]
+    ]
+  },
+  {
+    "id": "4cd7b5eb.5f75fc",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4545.5,
+    "y": 436,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "6a15735b.8f38bc"
+      ]
+    ]
+  },
+  {
+    "id": "8c7597f3.3a32c",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4550.5,
+    "y": 501,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "531c74ae.aa6424"
+      ]
+    ]
+  },
+  {
+    "id": "6a15735b.8f38bc",
+    "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": 4721.5,
+    "y": 436,
+    "z": "b60623c5.e2d9e8",
+    "wires": []
+  },
+  {
+    "id": "531c74ae.aa6424",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 4717,
+    "y": 501,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "43cf60a0.0fca68",
+    "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": 4100.5,
+    "y": 721,
+    "z": "b60623c5.e2d9e8",
+    "wires": []
+  },
+  {
+    "id": "1699b103.56f9ff",
+    "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": 4254.5,
+    "y": 769,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "430829b5.022a48",
+        "ab60153e.89b358"
+      ]
+    ]
+  },
+  {
+    "id": "430829b5.022a48",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4600,
+    "y": 750,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "af17e669.a567c"
+      ]
+    ]
+  },
+  {
+    "id": "ab60153e.89b358",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4604,
+    "y": 790,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "879a181e.1e28f"
+      ]
+    ]
+  },
+  {
+    "id": "af17e669.a567c",
+    "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": 4758,
+    "y": 750,
+    "z": "b60623c5.e2d9e8",
+    "wires": []
+  },
+  {
+    "id": "879a181e.1e28f",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 4761.5,
+    "y": 790,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "c2dfb11c.b0c48",
+        "18154ac9.e63ffd"
+      ]
+    ]
+  },
+  {
+    "id": "c2dfb11c.b0c48",
+    "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": 5092,
+    "y": 755,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "4bfe8ff3.b5155",
+    "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": 4956,
+    "y": 714,
+    "z": "b60623c5.e2d9e8",
+    "wires": []
+  },
+  {
+    "id": "18154ac9.e63ffd",
+    "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": 5019,
+    "y": 801,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "be8a4aef.c70ad",
+    "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": 4093,
+    "y": 200,
+    "z": "b60623c5.e2d9e8",
+    "wires": []
+  },
+  {
+    "id": "c13323e9.9191e8",
+    "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": 4119,
+    "y": 317,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "fa844cfe.7b9158",
+        "40f7f2e0.45e324",
+        "9ec0d41c.764348"
+      ]
+    ]
+  },
+  {
+    "id": "fa844cfe.7b9158",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4314.5001220703125,
+    "y": 269,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "c5cba661.1feb9"
+      ]
+    ]
+  },
+  {
+    "id": "40f7f2e0.45e324",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4306.5001220703125,
+    "y": 324,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "fa86521c.e230b8"
+      ]
+    ]
+  },
+  {
+    "id": "c5cba661.1feb9",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 4458.8824462890625,
+    "y": 268.6556701660156,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "fff76825.ceb828"
+      ]
+    ]
+  },
+  {
+    "id": "12d83cc7.207cc3",
+    "type": "outcome",
+    "name": "esr-thirdparty-sdnc",
+    "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5041,
+    "y": 271,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "f3a906e6.516618"
+      ]
+    ]
+  },
+  {
+    "id": "fff76825.ceb828",
+    "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": 4643,
+    "y": 267,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "8f09ed7e.8205c8"
+      ]
+    ]
+  },
+  {
+    "id": "8f09ed7e.8205c8",
+    "type": "switchNode",
+    "name": "switch related-to",
+    "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4838,
+    "y": 267,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "12d83cc7.207cc3"
+      ]
+    ]
+  },
+  {
+    "id": "9ec0d41c.764348",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4311.5001220703125,
+    "y": 381,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "4cb38d5a.2cd9fc"
+      ]
+    ]
+  },
+  {
+    "id": "4cb38d5a.2cd9fc",
+    "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": 4463.5001220703125,
+    "y": 382,
+    "z": "b60623c5.e2d9e8",
+    "wires": []
+  },
+  {
+    "id": "fa86521c.e230b8",
+    "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": 4474.5001220703125,
+    "y": 325,
+    "z": "b60623c5.e2d9e8",
+    "wires": []
+  },
+  {
+    "id": "fd5c650b.7ed3f8",
+    "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": 5426,
+    "y": 284,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "11189fd0.36c55",
+        "2f53389c.6ed7",
+        "160dc233.835476"
+      ]
+    ]
+  },
+  {
+    "id": "f3a906e6.516618",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 5220,
+    "y": 271,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "8e3bb227.50f04",
+        "fd5c650b.7ed3f8"
+      ]
+    ]
+  },
+  {
+    "id": "8e3bb227.50f04",
+    "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": 5456,
+    "y": 232,
+    "z": "b60623c5.e2d9e8",
+    "wires": []
+  },
+  {
+    "id": "11189fd0.36c55",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5636,
+    "y": 275,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "aadf27e6.e781b8"
+      ]
+    ]
+  },
+  {
+    "id": "2f53389c.6ed7",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5628,
+    "y": 330,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "fd2ad840.4523f"
+      ]
+    ]
+  },
+  {
+    "id": "160dc233.835476",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5633,
+    "y": 387,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "2a94704d.0d4"
+      ]
+    ]
+  },
+  {
+    "id": "2a94704d.0d4",
+    "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": 5785,
+    "y": 388,
+    "z": "b60623c5.e2d9e8",
+    "wires": []
+  },
+  {
+    "id": "fd2ad840.4523f",
+    "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": 5796,
+    "y": 333,
+    "z": "b60623c5.e2d9e8",
+    "wires": []
+  },
+  {
+    "id": "aadf27e6.e781b8",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 5780.38232421875,
+    "y": 272.6556701660156,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "cdb54fc1.4aeb5"
+      ]
+    ]
+  },
+  {
+    "id": "cdb54fc1.4aeb5",
+    "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": 5995,
+    "y": 269,
+    "z": "b60623c5.e2d9e8",
+    "wires": []
+  },
+  {
+    "id": "33053457.2cf334",
+    "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": 3562,
+    "y": 1609,
+    "z": "b60623c5.e2d9e8",
+    "wires": []
+  },
+  {
+    "id": "4445f35f.408fdc",
+    "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": 3625,
+    "y": 1938,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "862258db.691038",
+        "af408a0a.92301"
+      ]
+    ]
+  },
+  {
+    "id": "862258db.691038",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3920.5,
+    "y": 1905,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "95d8110a.825b98"
+      ]
+    ]
+  },
+  {
+    "id": "af408a0a.92301",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3925.5,
+    "y": 1970,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "ef7aa326.5032b8"
+      ]
+    ]
+  },
+  {
+    "id": "95d8110a.825b98",
+    "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": 4088.5,
+    "y": 1905,
+    "z": "b60623c5.e2d9e8",
+    "wires": []
+  },
+  {
+    "id": "ef7aa326.5032b8",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 4099,
+    "y": 1970,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "f246db35.fbb0b8",
+    "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": 3501,
+    "y": 1666,
+    "z": "b60623c5.e2d9e8",
+    "wires": []
+  },
+  {
+    "id": "2f733fde.bfa8d8",
+    "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": 3521,
+    "y": 1763,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "d82ed114.d26fe",
+        "9b6a74e2.82fcf",
+        "105e680c.d4fe88"
+      ]
+    ]
+  },
+  {
+    "id": "d82ed114.d26fe",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3723.5001220703125,
+    "y": 1716,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "3d1669ca.d8e9be"
+      ]
+    ]
+  },
+  {
+    "id": "9b6a74e2.82fcf",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3715.5001220703125,
+    "y": 1771,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "28df2cef.da0a5c"
+      ]
+    ]
+  },
+  {
+    "id": "3d1669ca.d8e9be",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 3867.8824462890625,
+    "y": 1713.6556701660156,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "b0c477a0.14b6b8"
+      ]
+    ]
+  },
+  {
+    "id": "b0c477a0.14b6b8",
+    "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": 4052,
+    "y": 1728,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "e68df009.7524f"
+      ]
+    ]
+  },
+  {
+    "id": "105e680c.d4fe88",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3720.5001220703125,
+    "y": 1828,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "3376d063.6334f8"
+      ]
+    ]
+  },
+  {
+    "id": "3376d063.6334f8",
+    "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": 3872.5001220703125,
+    "y": 1829,
+    "z": "b60623c5.e2d9e8",
+    "wires": []
+  },
+  {
+    "id": "28df2cef.da0a5c",
+    "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": 3883.5001220703125,
+    "y": 1774,
+    "z": "b60623c5.e2d9e8",
+    "wires": []
+  },
+  {
+    "id": "86c78b55.020ad8",
+    "type": "outcome",
+    "name": "esr-thirdparty-sdnc",
+    "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4450,
+    "y": 1732,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "de4526ed.169098"
+      ]
+    ]
+  },
+  {
+    "id": "e68df009.7524f",
+    "type": "switchNode",
+    "name": "switch related-to",
+    "xml": "<switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4247,
+    "y": 1728,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "86c78b55.020ad8"
+      ]
+    ]
+  },
+  {
+    "id": "bd56a946.09bfc8",
+    "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": 4835,
+    "y": 1731,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "e62cd9e9.79901",
+        "3835956c.352dfa",
+        "ef4cce16.af464"
+      ]
+    ]
+  },
+  {
+    "id": "de4526ed.169098",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 4627,
+    "y": 1724,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "84662003.28e938",
+        "bd56a946.09bfc8"
+      ]
+    ]
+  },
+  {
+    "id": "84662003.28e938",
+    "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": 4865,
+    "y": 1679,
+    "z": "b60623c5.e2d9e8",
+    "wires": []
+  },
+  {
+    "id": "2e3a7484.41bcbc",
+    "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": 5194,
+    "y": 1835,
+    "z": "b60623c5.e2d9e8",
+    "wires": []
+  },
+  {
+    "id": "acb63215.67cbc8",
+    "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": 5205,
+    "y": 1780,
+    "z": "b60623c5.e2d9e8",
+    "wires": []
+  },
+  {
+    "id": "bb7e5ab5.c4089",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 5189.38232421875,
+    "y": 1719.6556701660156,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "7c187be.7c53484"
+      ]
+    ]
+  },
+  {
+    "id": "7c187be.7c53484",
+    "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": 5404,
+    "y": 1716,
+    "z": "b60623c5.e2d9e8",
+    "wires": []
+  },
+  {
+    "id": "e62cd9e9.79901",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5045,
+    "y": 1722,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "bb7e5ab5.c4089"
+      ]
+    ]
+  },
+  {
+    "id": "3835956c.352dfa",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5037,
+    "y": 1777,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "acb63215.67cbc8"
+      ]
+    ]
+  },
+  {
+    "id": "ef4cce16.af464",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5042,
+    "y": 1834,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "2e3a7484.41bcbc"
+      ]
+    ]
+  },
+  {
+    "id": "1dc25027.0c33f8",
+    "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": 3076,
+    "y": 680,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "22e86b98.d5cd94",
+        "18519633.e9ee92"
+      ]
+    ]
+  },
+  {
+    "id": "22e86b98.d5cd94",
+    "type": "outcome",
+    "name": "Null",
+    "xml": "<outcome value=''>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3290,
+    "y": 717,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "d8801466.520d4"
+      ]
+    ]
+  },
+  {
+    "id": "18519633.e9ee92",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3292,
+    "y": 655,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "6bc727fb.e5e2c8"
+      ]
+    ]
+  },
+  {
+    "id": "d8801466.520d4",
+    "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": 2870,
+    "y": 1960,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "57adf29e.03275c",
+        "3c463d1c.a1e9ca"
+      ]
+    ]
+  },
+  {
+    "id": "57adf29e.03275c",
+    "type": "outcome",
+    "name": "Null",
+    "xml": "<outcome value=''>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3123,
+    "y": 1994,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "163451dc.e800ce"
+      ]
+    ]
+  },
+  {
+    "id": "3c463d1c.a1e9ca",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3123,
+    "y": 1938,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "72b99bc1.9d63c4"
+      ]
+    ]
+  },
+  {
+    "id": "163451dc.e800ce",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+    "comments": "",
+    "x": 3274,
+    "y": 1994,
+    "z": "b60623c5.e2d9e8",
+    "wires": []
+  },
+  {
+    "id": "2a6d840b.d2c9ec",
+    "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": 4150,
+    "y": 92,
+    "z": "b60623c5.e2d9e8",
+    "wires": []
+  },
+  {
+    "id": "24792ed6.12e172",
+    "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": 3558,
+    "y": 1551,
+    "z": "b60623c5.e2d9e8",
+    "wires": []
+  },
+  {
+    "id": "fe0662dd.a80948",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 3841,
+    "y": 349,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "2a6d840b.d2c9ec",
+        "e1c41eb3.6dc5b8",
+        "be8a4aef.c70ad",
+        "c13323e9.9191e8",
+        "7981558d.d1f29c",
+        "1721d523.151643",
+        "9094f518.043e98",
+        "f54721e.ec69de"
+      ]
+    ]
+  },
+  {
+    "id": "72b99bc1.9d63c4",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 3274,
+    "y": 1937,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "24792ed6.12e172",
+        "33053457.2cf334",
+        "f246db35.fbb0b8",
+        "2f733fde.bfa8d8",
+        "4445f35f.408fdc",
+        "7c2a5c1b.45951c",
+        "db1559a9.21dcb8",
+        "64935ddb.b635b4"
+      ]
+    ]
+  },
+  {
+    "id": "1ddc6cc6.41baa3",
+    "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": 3512,
+    "y": 2236,
+    "z": "b60623c5.e2d9e8",
+    "wires": []
+  },
+  {
+    "id": "88e2026c.753db8",
+    "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": 3666,
+    "y": 2284,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "e41adb3.0072828",
+        "6a4db145.9abb38"
+      ]
+    ]
+  },
+  {
+    "id": "e41adb3.0072828",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4011.5,
+    "y": 2265,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "b46428d7.0cf41"
+      ]
+    ]
+  },
+  {
+    "id": "6a4db145.9abb38",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4015.5,
+    "y": 2305,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "1616e093.24d98f"
+      ]
+    ]
+  },
+  {
+    "id": "b46428d7.0cf41",
+    "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": 4169.5,
+    "y": 2265,
+    "z": "b60623c5.e2d9e8",
+    "wires": []
+  },
+  {
+    "id": "1616e093.24d98f",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 4173,
+    "y": 2305,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "f5ad5aa7.4c2ca",
+        "f30a934b.4a146"
+      ]
+    ]
+  },
+  {
+    "id": "f5ad5aa7.4c2ca",
+    "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": 4513,
+    "y": 2304,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "14882444.425ec4",
+    "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": 4371,
+    "y": 2262,
+    "z": "b60623c5.e2d9e8",
+    "wires": []
+  },
+  {
+    "id": "f30a934b.4a146",
+    "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": 4442,
+    "y": 2353,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "35b5f42.3d7048c",
+    "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": 3067,
+    "y": 620,
+    "z": "b60623c5.e2d9e8",
+    "wires": []
+  },
+  {
+    "id": "672937f1.5c86c",
+    "type": "comment",
+    "name": "only dst ttp exists. No src",
+    "info": "",
+    "comments": "",
+    "x": 3662,
+    "y": 306,
+    "z": "b60623c5.e2d9e8",
+    "wires": []
+  },
+  {
+    "id": "cf6d8000.914ec",
+    "type": "comment",
+    "name": "only src ttp exists. No dst",
+    "info": "",
+    "comments": "",
+    "x": 3219,
+    "y": 1884,
+    "z": "b60623c5.e2d9e8",
+    "wires": []
+  },
+  {
+    "id": "6bc727fb.e5e2c8",
+    "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": 3398,
+    "y": 468,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "16d04d16.35cc13",
+        "81d801a9.0be79"
+      ]
+    ]
+  },
+  {
+    "id": "81d801a9.0be79",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3640,
+    "y": 1057,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "87bd1b21.78447"
+      ]
+    ]
+  },
+  {
+    "id": "16d04d16.35cc13",
+    "type": "outcome",
+    "name": "Null",
+    "xml": "<outcome value=''>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3634,
+    "y": 348,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "fe0662dd.a80948"
+      ]
+    ]
+  },
+  {
+    "id": "87bd1b21.78447",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 3798,
+    "y": 1056,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "6a4fd43b.29d0a4",
+        "bb732000.b077a",
+        "14bb373f.07c761",
+        "ee3130b2.515378",
+        "25e58429.ad4ee4",
+        "13fd978.b0ce7e9"
+      ]
+    ]
+  },
+  {
+    "id": "bb732000.b077a",
+    "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": 4062,
+    "y": 939,
+    "z": "b60623c5.e2d9e8",
+    "wires": []
+  },
+  {
+    "id": "25e58429.ad4ee4",
+    "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": 4143,
+    "y": 1254,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "69f73464.0e3e8c",
+        "5f37ff67.4bb2f"
+      ]
+    ]
+  },
+  {
+    "id": "69f73464.0e3e8c",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4452.5,
+    "y": 1223,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "43cec921.9d623"
+      ]
+    ]
+  },
+  {
+    "id": "5f37ff67.4bb2f",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4457.5,
+    "y": 1288,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "a900d0fc.b4f8e"
+      ]
+    ]
+  },
+  {
+    "id": "43cec921.9d623",
+    "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": 4628.5,
+    "y": 1223,
+    "z": "b60623c5.e2d9e8",
+    "wires": []
+  },
+  {
+    "id": "a900d0fc.b4f8e",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 4624,
+    "y": 1288,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "14bb373f.07c761",
+    "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": 4000,
+    "y": 987,
+    "z": "b60623c5.e2d9e8",
+    "wires": []
+  },
+  {
+    "id": "ee3130b2.515378",
+    "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": 4026,
+    "y": 1104,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "7994d48a.ca38a4",
+        "46376621.e31dd8",
+        "662f2070.bc1d4"
+      ]
+    ]
+  },
+  {
+    "id": "7994d48a.ca38a4",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4221.5001220703125,
+    "y": 1056,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "28f98c5.d17c774"
+      ]
+    ]
+  },
+  {
+    "id": "46376621.e31dd8",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4213.5001220703125,
+    "y": 1111,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "b6666e55.258c4"
+      ]
+    ]
+  },
+  {
+    "id": "28f98c5.d17c774",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 4365.8824462890625,
+    "y": 1055.6556701660156,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "abee57b5.2a2df"
+      ]
+    ]
+  },
+  {
+    "id": "abee57b5.2a2df",
+    "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": 4550,
+    "y": 1054,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "4e7ce11e.d4486"
+      ]
+    ]
+  },
+  {
+    "id": "4e7ce11e.d4486",
+    "type": "switchNode",
+    "name": "switch related-to",
+    "xml": "<switch test='`$tmp.aai.domainG-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4745,
+    "y": 1054,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "cd73aa8e.57927"
+      ]
+    ]
+  },
+  {
+    "id": "662f2070.bc1d4",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4218.5001220703125,
+    "y": 1168,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "65647ec7.0c6e5"
+      ]
+    ]
+  },
+  {
+    "id": "65647ec7.0c6e5",
+    "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": 4370.5001220703125,
+    "y": 1169,
+    "z": "b60623c5.e2d9e8",
+    "wires": []
+  },
+  {
+    "id": "b6666e55.258c4",
+    "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": 4381.5001220703125,
+    "y": 1112,
+    "z": "b60623c5.e2d9e8",
+    "wires": []
+  },
+  {
+    "id": "6a4fd43b.29d0a4",
+    "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": 4057,
+    "y": 879,
+    "z": "b60623c5.e2d9e8",
+    "wires": []
+  },
+  {
+    "id": "cd73aa8e.57927",
+    "type": "outcome",
+    "name": "esr-thirdparty-sdnc",
+    "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4948,
+    "y": 1058,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "d2b1d416.053a58"
+      ]
+    ]
+  },
+  {
+    "id": "66918eb9.ab92e8",
+    "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": 5333,
+    "y": 1071,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "f8b9a196.010a1",
+        "fd17d420.f985",
+        "40d42743.f42fd8"
+      ]
+    ]
+  },
+  {
+    "id": "d2b1d416.053a58",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 5127,
+    "y": 1058,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "c71b3067.5066e8",
+        "66918eb9.ab92e8"
+      ]
+    ]
+  },
+  {
+    "id": "c71b3067.5066e8",
+    "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": 5363,
+    "y": 1019,
+    "z": "b60623c5.e2d9e8",
+    "wires": []
+  },
+  {
+    "id": "f8b9a196.010a1",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5543,
+    "y": 1062,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "27038b3e.3bcfc4"
+      ]
+    ]
+  },
+  {
+    "id": "fd17d420.f985",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5535,
+    "y": 1117,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "967c6c86.0bbb78"
+      ]
+    ]
+  },
+  {
+    "id": "40d42743.f42fd8",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5540,
+    "y": 1174,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "35455e8c.6afe9a"
+      ]
+    ]
+  },
+  {
+    "id": "35455e8c.6afe9a",
+    "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": 5692,
+    "y": 1175,
+    "z": "b60623c5.e2d9e8",
+    "wires": []
+  },
+  {
+    "id": "967c6c86.0bbb78",
+    "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": 5703,
+    "y": 1120,
+    "z": "b60623c5.e2d9e8",
+    "wires": []
+  },
+  {
+    "id": "27038b3e.3bcfc4",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 5687.38232421875,
+    "y": 1059.6556701660156,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "501ec52c.0a5be4"
+      ]
+    ]
+  },
+  {
+    "id": "501ec52c.0a5be4",
+    "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": 5902,
+    "y": 1056,
+    "z": "b60623c5.e2d9e8",
+    "wires": []
+  },
+  {
+    "id": "ce5771d5.1db118",
+    "type": "comment",
+    "name": "both src and dst exist",
+    "info": "",
+    "comments": "",
+    "x": 3676,
+    "y": 997,
+    "z": "b60623c5.e2d9e8",
+    "wires": []
+  },
+  {
+    "id": "2ade390a.34dac6",
+    "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": 2238,
+    "y": 724,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "faa20144.28683",
+        "a3241eaf.e05748"
+      ]
+    ]
+  },
+  {
+    "id": "a3241eaf.e05748",
+    "type": "outcomeFalse",
+    "name": "false",
+    "xml": "<outcome value='false'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2645,
+    "y": 742,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "73c18a9e.ba438c"
+      ]
+    ]
+  },
+  {
+    "id": "faa20144.28683",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2645,
+    "y": 687,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "d5f3133.6f4a0f"
+      ]
+    ]
+  },
+  {
+    "id": "d5f3133.6f4a0f",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 2801,
+    "y": 685,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "35b5f42.3d7048c",
+        "1dc25027.0c33f8"
+      ]
+    ]
+  },
+  {
+    "id": "73c18a9e.ba438c",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 2778,
+    "y": 743,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "fda13949.60eb78",
+    "type": "set",
+    "name": "unset tmp.aai.all-vpn-bindings",
+    "xml": "<set>\n<parameter name='tmp.aai.all-vpn-bindings.' value=\"\" />\n",
+    "comments": "",
+    "x": 955,
+    "y": 159,
+    "z": "b60623c5.e2d9e8",
+    "wires": []
+  },
+  {
+    "id": "38085312.8a965c",
+    "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": 4072,
+    "y": 577,
+    "z": "b60623c5.e2d9e8",
+    "wires": []
+  },
+  {
+    "id": "1721d523.151643",
+    "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": 4132,
+    "y": 616,
+    "z": "b60623c5.e2d9e8",
+    "wires": []
+  },
+  {
+    "id": "47d2cfff.4a0e4",
+    "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": 948,
+    "y": 67,
+    "z": "b60623c5.e2d9e8",
+    "wires": []
+  },
+  {
+    "id": "be7a05aa.4b83b",
+    "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": 3484,
+    "y": 2093,
+    "z": "b60623c5.e2d9e8",
+    "wires": []
+  },
+  {
+    "id": "7c2a5c1b.45951c",
+    "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": 3540,
+    "y": 2142,
+    "z": "b60623c5.e2d9e8",
+    "wires": []
+  },
+  {
+    "id": "f179b432.4e819",
+    "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": 948,
+    "y": 106,
+    "z": "b60623c5.e2d9e8",
+    "wires": []
+  },
+  {
+    "id": "8845442c.1d5de8",
+    "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": 979,
+    "y": 207,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "72564454.b964f4",
+    "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": 189,
+    "y": 682,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "130c8849.c68768",
+        "9607da93.a7cfb8",
+        "675a11bf.37e84"
+      ]
+    ]
+  },
+  {
+    "id": "130c8849.c68768",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 408,
+    "y": 620,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "19b84d16.53d643"
+      ]
+    ]
+  },
+  {
+    "id": "9607da93.a7cfb8",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 417.490966796875,
+    "y": 662.5740356445312,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "675a11bf.37e84",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 406,
+    "y": 709,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "13e02ffd.705ef8"
+      ]
+    ]
+  },
+  {
+    "id": "19b84d16.53d643",
+    "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": 605,
+    "y": 616,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "95aa58da.ce0078"
+      ]
+    ]
+  },
+  {
+    "id": "13e02ffd.705ef8",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+    "comments": "",
+    "x": 575,
+    "y": 710,
+    "z": "b60623c5.e2d9e8",
+    "wires": []
+  },
+  {
+    "id": "95aa58da.ce0078",
+    "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": 828.33349609375,
+    "y": 615.9999389648438,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "82937c17.5a3278"
+      ]
+    ]
+  },
+  {
+    "id": "82937c17.5a3278",
+    "type": "outcome",
+    "name": "connectivity",
+    "xml": "<outcome value='connectivity'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1029.0001335144043,
+    "y": 617.000020980835,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "7d4de732.7e236"
+      ]
+    ]
+  },
+  {
+    "id": "7d4de732.7e236",
+    "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": 159,
+    "y": 879,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "f6447d51.51534",
+        "d2723085.ef21f",
+        "14bf719a.197f76"
+      ]
+    ]
+  },
+  {
+    "id": "f6447d51.51534",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 367,
+    "y": 843,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "93da3cfa.70c248"
+      ]
+    ]
+  },
+  {
+    "id": "d2723085.ef21f",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 367.490966796875,
+    "y": 888.5740356445312,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "14bf719a.197f76",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 365,
+    "y": 932,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "836041f9.6829f8"
+      ]
+    ]
+  },
+  {
+    "id": "836041f9.6829f8",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+    "comments": "",
+    "x": 534,
+    "y": 933,
+    "z": "b60623c5.e2d9e8",
+    "wires": []
+  },
+  {
+    "id": "a94aa53a.b107d8",
+    "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": 506,
+    "y": 1427,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "21c47827.df1568"
+      ]
+    ]
+  },
+  {
+    "id": "21c47827.df1568",
+    "type": "switchNode",
+    "name": "switch related-to",
+    "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 709,
+    "y": 1439,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "18be783b.f07278"
+      ]
+    ]
+  },
+  {
+    "id": "18be783b.f07278",
+    "type": "outcome",
+    "name": "UNI",
+    "xml": "<outcome value='uni'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 875,
+    "y": 1436,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "11fb7f76.b02469"
+      ]
+    ]
+  },
+  {
+    "id": "11fb7f76.b02469",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 1036,
+    "y": 1433,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "47d6d37a.9fb43c",
+        "1c027792.461348",
+        "ea05bf35.5069",
+        "9d31ed5b.d2c91",
+        "23eb7cf4.f6cfdc",
+        "99b18acf.7ec528"
+      ]
+    ]
+  },
+  {
+    "id": "1c027792.461348",
+    "type": "set",
+    "name": "unset tmp.aai.uni",
+    "xml": "<set>\n<parameter name='tmp.aai.uni.' value='' />\n",
+    "comments": "",
+    "x": 1242,
+    "y": 1032.9999389648438,
+    "z": "b60623c5.e2d9e8",
+    "wires": []
+  },
+  {
+    "id": "47d6d37a.9fb43c",
+    "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": 1239,
+    "y": 1077.9999389648438,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "2a120b9c.2b340c",
+        "41aafa7d.002584",
+        "b80f04fd.7f4018"
+      ]
+    ]
+  },
+  {
+    "id": "41aafa7d.002584",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1434.490966796875,
+    "y": 1051.5739135742188,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "b752ad58.1bdf1"
+      ]
+    ]
+  },
+  {
+    "id": "b80f04fd.7f4018",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1430,
+    "y": 1095.9998779296875,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "81604b65.13211"
+      ]
+    ]
+  },
+  {
+    "id": "b752ad58.1bdf1",
+    "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": 1597.0625,
+    "y": 1050.859619140625,
+    "z": "b60623c5.e2d9e8",
+    "wires": []
+  },
+  {
+    "id": "81604b65.13211",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+    "comments": "",
+    "x": 1598,
+    "y": 1095.9998779296875,
+    "z": "b60623c5.e2d9e8",
+    "wires": []
+  },
+  {
+    "id": "1b5d0889.20238f",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 1600,
+    "y": 1142.9998779296875,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "2a120b9c.2b340c",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1431,
+    "y": 1142.9998779296875,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "1b5d0889.20238f"
+      ]
+    ]
+  },
+  {
+    "id": "450a13df.b4e0a4",
+    "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": 1213,
+    "y": 1664,
+    "z": "b60623c5.e2d9e8",
+    "wires": []
+  },
+  {
+    "id": "ea05bf35.5069",
+    "type": "set",
+    "name": "set ethernet-srv-end-points-list array",
+    "xml": "<set>\n<!--<parameter name='`ethernet-srv-end-points-list[$epidx].ethernet-end-point-name`' value='`$tmp.aai.connectivity.connectivity-id`' />-->\n<parameter name='`ethernet-srv-end-points-list[$epidx].ethernet-end-point-name`' value='`$tmp.aai.uni.id`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].index-number`' value='0' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].eth-node-id`' value='`$tmp.uni-node-id-short`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].eth-node-tp-id`' value='`$tmp.aai.uni.tp-id`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].leafOrRootAccess`' value='`$leafOrRootAccess`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].cvlan`' value='`$tmp.aai.connectivity.cvlan`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].CIR`' value='`$tmp.aai.uni.data-source * 1000000`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].EIR`' value='`$tmp.aai.uni.data-source * 1000000`' />\n\n<parameter name='`ethernet-srv-end-points-list_length`' value='`$epidx + 1`' />\n",
+    "comments": "",
+    "x": 1304,
+    "y": 1718,
+    "z": "b60623c5.e2d9e8",
+    "wires": []
+  },
+  {
+    "id": "93a880c5.cd0b3",
+    "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": 1980.5,
+    "y": 1131,
+    "z": "b60623c5.e2d9e8",
+    "wires": []
+  },
+  {
+    "id": "481f95ef.87ef1c",
+    "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": 1985.5,
+    "y": 1233,
+    "z": "b60623c5.e2d9e8",
+    "wires": []
+  },
+  {
+    "id": "c1ad05eb.c84b48",
+    "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": 469,
+    "y": 1683,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "7f234491.70b134"
+      ]
+    ]
+  },
+  {
+    "id": "7f234491.70b134",
+    "type": "switchNode",
+    "name": "switch related-to",
+    "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 701,
+    "y": 1682,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "c6ba5a66.793238"
+      ]
+    ]
+  },
+  {
+    "id": "c6ba5a66.793238",
+    "type": "outcome",
+    "name": "vpn-binding",
+    "xml": "<outcome value='vpn-binding'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 913,
+    "y": 1683,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "6ed8d899.fdc1a"
+      ]
+    ]
+  },
+  {
+    "id": "6ed8d899.fdc1a",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 169,
+    "y": 1839,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "d9421c0f.7a0898",
+        "953702c4.2d79b"
+      ]
+    ]
+  },
+  {
+    "id": "953702c4.2d79b",
+    "type": "set",
+    "name": "unset tmp.aai.vpn-binding",
+    "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value='' />\n",
+    "comments": "",
+    "x": 404,
+    "y": 1826,
+    "z": "b60623c5.e2d9e8",
+    "wires": []
+  },
+  {
+    "id": "d9421c0f.7a0898",
+    "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": 394,
+    "y": 1887,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "329ab1cc.22fb9e",
+        "864547d3.a6077",
+        "b2aa6219.f09508"
+      ]
+    ]
+  },
+  {
+    "id": "864547d3.a6077",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 607.490966796875,
+    "y": 1871.5740356445312,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "6b83b223.ee9d94"
+      ]
+    ]
+  },
+  {
+    "id": "b2aa6219.f09508",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 603,
+    "y": 1916,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "4ac70bf0.89675c"
+      ]
+    ]
+  },
+  {
+    "id": "329ab1cc.22fb9e",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 605,
+    "y": 1976,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "f02a177d.26c7"
+      ]
+    ]
+  },
+  {
+    "id": "6b83b223.ee9d94",
+    "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": 770.0625,
+    "y": 1870.8597412109375,
+    "z": "b60623c5.e2d9e8",
+    "wires": []
+  },
+  {
+    "id": "4ac70bf0.89675c",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+    "comments": "",
+    "x": 771,
+    "y": 1916,
+    "z": "b60623c5.e2d9e8",
+    "wires": []
+  },
+  {
+    "id": "f02a177d.26c7",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 774,
+    "y": 1975,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "fc6eb753.cc314",
+        "6f8a0144.f9e8e8"
+      ]
+    ]
+  },
+  {
+    "id": "ace8d395.16f8f8",
+    "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",
+    "comments": "",
+    "x": 173,
+    "y": 2474,
+    "z": "b60623c5.e2d9e8",
+    "wires": []
+  },
+  {
+    "id": "fa159141.96876",
+    "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": 316,
+    "y": 2534,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "192fb1d6.9d578e",
+        "7d0ee5a8.eae4dc"
+      ]
+    ]
+  },
+  {
+    "id": "192fb1d6.9d578e",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 628.5,
+    "y": 2511,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "7d0ee5a8.eae4dc",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 632.5,
+    "y": 2551,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "31d10b34.3ac65c"
+      ]
+    ]
+  },
+  {
+    "id": "7a578c61.6716c4",
+    "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": 808.5,
+    "y": 2515,
+    "z": "b60623c5.e2d9e8",
+    "wires": []
+  },
+  {
+    "id": "31d10b34.3ac65c",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 824,
+    "y": 2569,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "34d0fee.5345782"
+      ]
+    ]
+  },
+  {
+    "id": "e5aa9a1b.90043",
+    "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": 1119.5,
+    "y": 2538,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "dceb8020.64dda",
+    "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": 2586.5,
+    "y": 1889,
+    "z": "b60623c5.e2d9e8",
+    "wires": []
+  },
+  {
+    "id": "34d0fee.5345782",
+    "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": 1081.5,
+    "y": 2580,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "1840e683.b61c39",
+    "type": "set",
+    "name": "set leafOrRootAccess",
+    "xml": "<set>\n<parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:leaf-access' />\n",
+    "comments": "",
+    "x": 1946.5,
+    "y": 1169,
+    "z": "b60623c5.e2d9e8",
+    "wires": []
+  },
+  {
+    "id": "ebd04ab8.6f009",
+    "type": "set",
+    "name": "set leafOrRootAccess",
+    "xml": "<set>\n<parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:root-primary' />\n",
+    "comments": "",
+    "x": 1947.5,
+    "y": 1273,
+    "z": "b60623c5.e2d9e8",
+    "wires": []
+  },
+  {
+    "id": "9094f518.043e98",
+    "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": 4241,
+    "y": 530,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "13fd978.b0ce7e9",
+    "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": 4144,
+    "y": 1349,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "db1559a9.21dcb8",
+    "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": 3638,
+    "y": 2021,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "93da3cfa.70c248",
+    "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": 739,
+    "y": 829,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "2c44355c.6d9982",
+        "16b41754.18b639"
+      ]
+    ]
+  },
+  {
+    "id": "2c44355c.6d9982",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1102,
+    "y": 852,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "58ecddbb.063a6c"
+      ]
+    ]
+  },
+  {
+    "id": "16b41754.18b639",
+    "type": "outcomeFalse",
+    "name": "false",
+    "xml": "<outcome value='false'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1102,
+    "y": 801,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "255e639c.d2ebb4"
+      ]
+    ]
+  },
+  {
+    "id": "58ecddbb.063a6c",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 1258,
+    "y": 850,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "9a61b358.c738d8"
+      ]
+    ]
+  },
+  {
+    "id": "255e639c.d2ebb4",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 1235,
+    "y": 802,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "c0e6872b.6bc578",
+    "type": "set",
+    "name": "unset tmp.aai.vpn-binding",
+    "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value=\"\" />\n",
+    "comments": "",
+    "x": 1995,
+    "y": 200,
+    "z": "b60623c5.e2d9e8",
+    "wires": []
+  },
+  {
+    "id": "64935ddb.b635b4",
+    "type": "set",
+    "name": "set root-otn-tunnels-list array",
+    "xml": "<set>\n<parameter name='`roottunsidx`' value='`$roottunsidx + 1`' />\n",
+    "comments": "",
+    "x": 3537,
+    "y": 2181,
+    "z": "b60623c5.e2d9e8",
+    "wires": []
+  },
+  {
+    "id": "f54721e.ec69de",
+    "type": "set",
+    "name": "set leaf-otn-tunnels-list array",
+    "xml": "<set>\n<parameter name='`leaftunsidx`' value='`$leaftunsidx + 1`' />\n",
+    "comments": "",
+    "x": 4127,
+    "y": 654,
+    "z": "b60623c5.e2d9e8",
+    "wires": []
+  },
+  {
+    "id": "9d31ed5b.d2c91",
+    "type": "set",
+    "name": "set ethernet-srv-end-points-list array",
+    "xml": "<set>\n<parameter name='`epidx`' value='`$epidx + 1`' />\n",
+    "comments": "",
+    "x": 1301,
+    "y": 1760,
+    "z": "b60623c5.e2d9e8",
+    "wires": []
+  },
+  {
+    "id": "7af36070.5c1af",
+    "type": "set",
+    "name": "set filename",
+    "xml": "<set>\n<parameter name='filenameclleths' value=\"`$leafOrRootAccess + $tmp.aai.connectivity.access-node-id`\" />",
+    "comments": "",
+    "x": 480,
+    "y": 1494,
+    "z": "b60623c5.e2d9e8",
+    "wires": []
+  },
+  {
+    "id": "2d8e3cc1.bb010c",
+    "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": 511,
+    "y": 1534,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "fc6eb753.cc314",
+    "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": 1059,
+    "y": 1942,
+    "z": "b60623c5.e2d9e8",
+    "wires": []
+  },
+  {
+    "id": "6f8a0144.f9e8e8",
+    "type": "set",
+    "name": "set otn-tunnels-name-list array",
+    "xml": "<set>\n<parameter name='`otntunsidx`' value='`$otntunsidx + 1`' />\n",
+    "comments": "",
+    "x": 1062,
+    "y": 1984,
+    "z": "b60623c5.e2d9e8",
+    "wires": []
+  },
+  {
+    "id": "1e5bd700.d21b81",
+    "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": 505,
+    "y": 1624,
+    "z": "b60623c5.e2d9e8",
+    "wires": []
+  },
+  {
+    "id": "144b407f.200e78",
+    "type": "set",
+    "name": "set filename",
+    "xml": "<set>\n<parameter name='filenamecllotns' value=\"`leafrootOTNtunnelnames`\" />",
+    "comments": "",
+    "x": 260,
+    "y": 2003,
+    "z": "b60623c5.e2d9e8",
+    "wires": []
+  },
+  {
+    "id": "76785af4.e022ac",
+    "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": 268,
+    "y": 2060,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "23eb7cf4.f6cfdc",
+    "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": 1279,
+    "y": 1609,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "779a259e.64832c",
+        "277a0a61.75069e"
+      ]
+    ]
+  },
+  {
+    "id": "277a0a61.75069e",
+    "type": "failure",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1502,
+    "y": 1564,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "21f0cc68.0dd77c"
+      ]
+    ]
+  },
+  {
+    "id": "779a259e.64832c",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1504,
+    "y": 1628,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "db13af98.99768"
+      ]
+    ]
+  },
+  {
+    "id": "21f0cc68.0dd77c",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 1667,
+    "y": 1561,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "ec997076.0ceb28"
+      ]
+    ]
+  },
+  {
+    "id": "db13af98.99768",
+    "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": 1666,
+    "y": 1624,
+    "z": "b60623c5.e2d9e8",
+    "wires": []
+  },
+  {
+    "id": "ec997076.0ceb28",
+    "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": 1887,
+    "y": 1575,
+    "z": "b60623c5.e2d9e8",
+    "wires": []
+  },
+  {
+    "id": "2341ba90.ed99d6",
+    "type": "outcome",
+    "name": "esr-thirdparty-sdnc",
+    "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1432,
+    "y": 2300,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "35e4a68.098365a"
+      ]
+    ]
+  },
+  {
+    "id": "701770f6.4dd0f8",
+    "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": 1817,
+    "y": 2313,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "d75e7467.a58a4",
+        "74ab773b.95bd78",
+        "df0b8ca4.cd7bb8"
+      ]
+    ]
+  },
+  {
+    "id": "35e4a68.098365a",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 1611,
+    "y": 2300,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "fa1aec8.0f5319",
+        "701770f6.4dd0f8"
+      ]
+    ]
+  },
+  {
+    "id": "fa1aec8.0f5319",
+    "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": 1847,
+    "y": 2261,
+    "z": "b60623c5.e2d9e8",
+    "wires": []
+  },
+  {
+    "id": "d75e7467.a58a4",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2027,
+    "y": 2304,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "1ccfad18.1b3fa3"
+      ]
+    ]
+  },
+  {
+    "id": "74ab773b.95bd78",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2019,
+    "y": 2359,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "2692af0.8253f52"
+      ]
+    ]
+  },
+  {
+    "id": "df0b8ca4.cd7bb8",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2024,
+    "y": 2416,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "f048da7.b1469a8"
+      ]
+    ]
+  },
+  {
+    "id": "f048da7.b1469a8",
+    "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": 2176,
+    "y": 2417,
+    "z": "b60623c5.e2d9e8",
+    "wires": []
+  },
+  {
+    "id": "2692af0.8253f52",
+    "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": 2187,
+    "y": 2362,
+    "z": "b60623c5.e2d9e8",
+    "wires": []
+  },
+  {
+    "id": "1ccfad18.1b3fa3",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 2171.38232421875,
+    "y": 2301.6556701660156,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "64610343.e61854"
+      ]
+    ]
+  },
+  {
+    "id": "64610343.e61854",
+    "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": 2386,
+    "y": 2298,
+    "z": "b60623c5.e2d9e8",
+    "wires": []
+  },
+  {
+    "id": "d3c52589.f54e9",
+    "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": 510,
+    "y": 2346,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "f189c3f1.d69a28",
+        "4452e7a9.eaf9c8",
+        "77af657c.107d34"
+      ]
+    ]
+  },
+  {
+    "id": "f189c3f1.d69a28",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 705.5001220703125,
+    "y": 2298,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "47b3661c.a1e7d8"
+      ]
+    ]
+  },
+  {
+    "id": "4452e7a9.eaf9c8",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 697.5001220703125,
+    "y": 2353,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "34198ba3.49ea3c"
+      ]
+    ]
+  },
+  {
+    "id": "47b3661c.a1e7d8",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 849.8824462890625,
+    "y": 2297.6556701660156,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "cd5c4879.eeeaf"
+      ]
+    ]
+  },
+  {
+    "id": "cd5c4879.eeeaf",
+    "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": 1034,
+    "y": 2296,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "7bf74b1f.d5837c"
+      ]
+    ]
+  },
+  {
+    "id": "7bf74b1f.d5837c",
+    "type": "switchNode",
+    "name": "switch related-to",
+    "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1229,
+    "y": 2296,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "2341ba90.ed99d6"
+      ]
+    ]
+  },
+  {
+    "id": "77af657c.107d34",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 702.5001220703125,
+    "y": 2410,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "6c7ae4ee.17c334"
+      ]
+    ]
+  },
+  {
+    "id": "6c7ae4ee.17c334",
+    "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": 854.5001220703125,
+    "y": 2411,
+    "z": "b60623c5.e2d9e8",
+    "wires": []
+  },
+  {
+    "id": "34198ba3.49ea3c",
+    "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": 865.5001220703125,
+    "y": 2354,
+    "z": "b60623c5.e2d9e8",
+    "wires": []
+  },
+  {
+    "id": "303a4e11.243e7a",
+    "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": 500,
+    "y": 2258,
+    "z": "b60623c5.e2d9e8",
+    "wires": []
+  },
+  {
+    "id": "c718737.8cca71",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 245,
+    "y": 2389,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "303a4e11.243e7a",
+        "d3c52589.f54e9"
+      ]
+    ]
+  },
+  {
+    "id": "72622933.417d18",
+    "type": "comment",
+    "name": "Temporary skipping this check - to support multiple instances in one slice",
+    "info": "",
+    "comments": "",
+    "x": 1459.9666748046875,
+    "y": 206.88333129882812,
+    "z": "b60623c5.e2d9e8",
+    "wires": []
+  },
+  {
+    "id": "c3fd03f5.ced1a",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+    "comments": "",
+    "x": 662,
+    "y": 429,
+    "z": "b60623c5.e2d9e8",
+    "wires": []
+  },
+  {
+    "id": "c72dabdd.dd1b58",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 221.5,
+    "y": 1398,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "a94aa53a.b107d8",
+        "c1ad05eb.c84b48",
+        "7af36070.5c1af",
+        "2d8e3cc1.bb010c",
+        "ace8d395.16f8f8",
+        "fa159141.96876",
+        "1e5bd700.d21b81",
+        "144b407f.200e78",
+        "76785af4.e022ac",
+        "c718737.8cca71",
+        "eca312ef.b3f488"
+      ]
+    ]
+  },
+  {
+    "id": "99b18acf.7ec528",
+    "type": "switchNode",
+    "name": "switch uni type",
+    "xml": "<switch test=\"`$tmp.aai.uni.type`\">\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1252,
+    "y": 1236,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "bfa56f6a.14e168",
+        "3c1ef869.c0abd8",
+        "3b2dd259.d313d6",
+        "42d627cc.4d9d98"
+      ]
+    ]
+  },
+  {
+    "id": "bfa56f6a.14e168",
+    "type": "outcome",
+    "name": "leaf",
+    "xml": "<outcome value='leaf'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1417,
+    "y": 1218,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "327e25a1.149b82"
+      ]
+    ]
+  },
+  {
+    "id": "3c1ef869.c0abd8",
+    "type": "outcome",
+    "name": "root",
+    "xml": "<outcome value='root'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1420,
+    "y": 1257,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "bb94632d.8744e"
+      ]
+    ]
+  },
+  {
+    "id": "42d627cc.4d9d98",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1414,
+    "y": 1335,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "aa99ff1e.001ee"
+      ]
+    ]
+  },
+  {
+    "id": "3b2dd259.d313d6",
+    "type": "outcome",
+    "name": "secondary-root",
+    "xml": "<outcome value='secondary-root'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1437,
+    "y": 1298,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "3c1ff952.ce0566"
+      ]
+    ]
+  },
+  {
+    "id": "8b34828e.2e2fe8",
+    "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": 1983,
+    "y": 1331,
+    "z": "b60623c5.e2d9e8",
+    "wires": []
+  },
+  {
+    "id": "7c827d8b.b5207c",
+    "type": "set",
+    "name": "set leafOrRootAccess",
+    "xml": "<set>\n<parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:root-backup' />\n",
+    "comments": "",
+    "x": 1945,
+    "y": 1371,
+    "z": "b60623c5.e2d9e8",
+    "wires": []
+  },
+  {
+    "id": "aa99ff1e.001ee",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 1582,
+    "y": 1335,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "327e25a1.149b82",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 1578,
+    "y": 1214,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "1840e683.b61c39"
+      ]
+    ]
+  },
+  {
+    "id": "bb94632d.8744e",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 1585,
+    "y": 1259,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "ebd04ab8.6f009"
+      ]
+    ]
+  },
+  {
+    "id": "3c1ff952.ce0566",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 1584,
+    "y": 1299,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "7c827d8b.b5207c"
+      ]
+    ]
+  },
+  {
+    "id": "9a61b358.c738d8",
+    "type": "switchNode",
+    "name": "switch conn type != mdsc",
+    "xml": "<switch test=\"`$tmp.aai.connectivity.vpn-type != 'mdsc' `\">\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 218.56666564941406,
+    "y": 1158.933349609375,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "4c9cf74b.527528"
+      ]
+    ]
+  },
+  {
+    "id": "4c9cf74b.527528",
+    "type": "outcome",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 400.566650390625,
+    "y": 1159.933349609375,
+    "z": "b60623c5.e2d9e8",
+    "wires": [
+      [
+        "c72dabdd.dd1b58"
+      ]
+    ]
+  },
+  {
+    "id": "eca312ef.b3f488",
+    "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": 536.566650390625,
+    "y": 1336.9666748046875,
+    "z": "b60623c5.e2d9e8",
+    "wires": []
+  }
+]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-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 1828f879..d58ad7bf 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": "4a53e986.e1345",
+        "id": "d35e2da9.70a7e",
         "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": 401.8833312988281,
-        "y": 341,
-        "z": "db287b1f.2984a8",
+        "x": 372,
+        "y": 306,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "bee28b81.87faf8",
-                "2e0d3206.b3958e",
-                "2caa6605.779652"
+                "88d19ab1.10b18",
+                "8fd12759.af6e18",
+                "50405d21.7eae84"
             ]
         ]
     },
     {
-        "id": "bee28b81.87faf8",
+        "id": "88d19ab1.10b18",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 589.8833312988281,
-        "y": 354,
-        "z": "db287b1f.2984a8",
+        "x": 560,
+        "y": 319,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "db2a2eb9.c4729"
+                "d472199a.beff9"
             ]
         ]
     },
     {
-        "id": "2e0d3206.b3958e",
+        "id": "8fd12759.af6e18",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 597.374267578125,
-        "y": 396.57403564453125,
-        "z": "db287b1f.2984a8",
+        "x": 567.4909362792969,
+        "y": 361.57403564453125,
+        "z": "5a4cb919.dfff38",
         "wires": [
             []
         ]
     },
     {
-        "id": "2caa6605.779652",
+        "id": "50405d21.7eae84",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 587.8833312988281,
-        "y": 443,
-        "z": "db287b1f.2984a8",
+        "x": 558,
+        "y": 408,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "9a0e1ef7.428b9"
+                "6b1a691d.f6617"
             ]
         ]
     },
     {
-        "id": "db2a2eb9.c4729",
+        "id": "d472199a.beff9",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 762.8833312988281,
-        "y": 352,
-        "z": "db287b1f.2984a8",
+        "x": 733,
+        "y": 317,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "b1233538.ceab4"
+                "f306805a.38d6f8"
             ]
         ]
     },
     {
-        "id": "b1233538.ceab4",
+        "id": "f306805a.38d6f8",
         "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": 991.8833312988281,
-        "y": 353,
-        "z": "db287b1f.2984a8",
+        "x": 962,
+        "y": 318,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "f68da0c8.dc2638"
+                "4a920666.d84d68"
             ]
         ]
     },
     {
-        "id": "f68da0c8.dc2638",
+        "id": "4a920666.d84d68",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1206.8833312988281,
-        "y": 354,
-        "z": "db287b1f.2984a8",
+        "x": 1177,
+        "y": 319,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "947d4965.a799f8"
+                "fc848cba.fc33d8"
             ]
         ]
     },
     {
-        "id": "ab775a4c.a509d",
+        "id": "841ae1dd.49d178",
         "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": 1460.8833312988281,
-        "y": 276,
-        "z": "db287b1f.2984a8",
+        "x": 1431,
+        "y": 241,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "1ae0d7f3.280b18",
-                "b7c135fb.7fc808"
+                "98ef6cc.4725e9",
+                "ab42fe03.c49e3"
             ]
         ]
     },
     {
-        "id": "1ae0d7f3.280b18",
+        "id": "98ef6cc.4725e9",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1677.8833312988281,
-        "y": 255,
-        "z": "db287b1f.2984a8",
+        "x": 1648,
+        "y": 220,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "947d4965.a799f8"
+                "fc848cba.fc33d8"
             ]
         ]
     },
     {
-        "id": "b7c135fb.7fc808",
+        "id": "ab42fe03.c49e3",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1677.8833312988281,
-        "y": 304,
-        "z": "db287b1f.2984a8",
+        "x": 1648,
+        "y": 269,
+        "z": "5a4cb919.dfff38",
         "wires": [
             []
         ]
     },
     {
-        "id": "947d4965.a799f8",
+        "id": "fc848cba.fc33d8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1861.8833312988281,
-        "y": 341,
-        "z": "db287b1f.2984a8",
+        "x": 1832,
+        "y": 306,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "7307d136.f98668",
-                "d6d93ab.df041c8",
-                "ed4d0298.cdb578"
+                "53692e4a.48cde",
+                "957d0d12.f7d338",
+                "1f9b767f.d670b2"
             ]
         ]
     },
     {
-        "id": "d12da893.5808e",
+        "id": "524dbe59.8ef8f",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 220.88333129882812,
-        "y": 82,
-        "z": "db287b1f.2984a8",
+        "x": 191,
+        "y": 47,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "ba22940.68974f"
+                "320667fa.12a2c"
             ]
         ]
     },
     {
-        "id": "ba22940.68974f",
+        "id": "320667fa.12a2c",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -201,3545 +201,3558 @@
         "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": 505.1690216064453,
-        "y": 143.23810863494873,
-        "z": "db287b1f.2984a8",
+        "x": 475.2856903076172,
+        "y": 108.23810863494873,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "f0aeb23e.8f1f7"
+                "aa006c98.f12b58"
             ]
         ]
     },
     {
-        "id": "f0aeb23e.8f1f7",
+        "id": "aa006c98.f12b58",
         "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": 511.3119354248047,
-        "y": 228.00003051757812,
-        "z": "db287b1f.2984a8",
+        "x": 481.42860412597656,
+        "y": 193.00003051757812,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "849eab75.e48858"
+                "72fe4a66.39584c"
             ]
         ]
     },
     {
-        "id": "849eab75.e48858",
+        "id": "72fe4a66.39584c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 821.1213684082031,
-        "y": 219.66668701171875,
-        "z": "db287b1f.2984a8",
+        "x": 791.238037109375,
+        "y": 184.66668701171875,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "4a53e986.e1345",
-                "9dad0003.283738",
-                "47e937a3.3ee608",
-                "fa83bc41.1d8b08",
-                "39b1b2.d055464e"
+                "d35e2da9.70a7e",
+                "cce8745e.b515b8",
+                "706cb78c.da92b",
+                "88772a4.9b58658",
+                "4ace150.4554dec"
             ]
         ]
     },
     {
-        "id": "7307d136.f98668",
+        "id": "53692e4a.48cde",
         "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": 2078.883331298828,
-        "y": 279,
-        "z": "db287b1f.2984a8",
+        "x": 2049,
+        "y": 244,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "5be24b21.11ebc4",
+        "id": "123fcc82.b79ae3",
         "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": 4247.883331298828,
-        "y": 165,
-        "z": "db287b1f.2984a8",
+        "x": 4218,
+        "y": 130,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "66c2f1fa.df4e",
+        "id": "e308a3a2.af826",
         "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": 4328.883331298828,
-        "y": 480,
-        "z": "db287b1f.2984a8",
+        "x": 4299,
+        "y": 445,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "78ae8a16.bcde6c",
-                "163e60b5.f624ef"
+                "fedd6b9.d7f3318",
+                "39581c20.edb614"
             ]
         ]
     },
     {
-        "id": "78ae8a16.bcde6c",
+        "id": "fedd6b9.d7f3318",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4638.383331298828,
-        "y": 449,
-        "z": "db287b1f.2984a8",
+        "x": 4608.5,
+        "y": 414,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "a86780cc.869ba"
+                "c49081cf.377c78"
             ]
         ]
     },
     {
-        "id": "163e60b5.f624ef",
+        "id": "39581c20.edb614",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4643.383331298828,
-        "y": 514,
-        "z": "db287b1f.2984a8",
+        "x": 4613.5,
+        "y": 479,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "496a02d9.361154"
+                "9c0572a4.3a997"
             ]
         ]
     },
     {
-        "id": "a86780cc.869ba",
+        "id": "c49081cf.377c78",
         "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": 4814.383331298828,
-        "y": 449,
-        "z": "db287b1f.2984a8",
+        "x": 4784.5,
+        "y": 414,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "496a02d9.361154",
+        "id": "9c0572a4.3a997",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4809.883331298828,
-        "y": 514,
-        "z": "db287b1f.2984a8",
+        "x": 4780,
+        "y": 479,
+        "z": "5a4cb919.dfff38",
         "wires": [
             []
         ]
     },
     {
-        "id": "4c8b1659.abc1b",
+        "id": "2d297001.689a7",
         "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": 4193.383331298828,
-        "y": 734,
-        "z": "db287b1f.2984a8",
+        "x": 4163.5,
+        "y": 699,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "902cb9fb.0d496",
+        "id": "54d9bbcc.0d0bac",
         "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": 4347.383331298828,
-        "y": 782,
-        "z": "db287b1f.2984a8",
+        "x": 4317.5,
+        "y": 747,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "f961065e.0e576",
-                "6ca1f611.56dee"
+                "2ade786d.c09b28",
+                "f17ad5b3.0ef818"
             ]
         ]
     },
     {
-        "id": "f961065e.0e576",
+        "id": "2ade786d.c09b28",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4692.883331298828,
-        "y": 763,
-        "z": "db287b1f.2984a8",
+        "x": 4663,
+        "y": 728,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "6296fab8.967dac"
+                "72718fb4.e15e78"
             ]
         ]
     },
     {
-        "id": "6ca1f611.56dee",
+        "id": "f17ad5b3.0ef818",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4696.883331298828,
-        "y": 803,
-        "z": "db287b1f.2984a8",
+        "x": 4667,
+        "y": 768,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "ef7067c4.7ea328"
+                "98b1fdb0.a42648"
             ]
         ]
     },
     {
-        "id": "6296fab8.967dac",
+        "id": "72718fb4.e15e78",
         "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": 4850.883331298828,
-        "y": 763,
-        "z": "db287b1f.2984a8",
+        "x": 4821,
+        "y": 728,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "ef7067c4.7ea328",
+        "id": "98b1fdb0.a42648",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4854.383331298828,
-        "y": 803,
-        "z": "db287b1f.2984a8",
+        "x": 4824.5,
+        "y": 768,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "ee477ca2.a65568",
-                "5e527e99.1f4728"
+                "fe12ce9.6a53ab",
+                "4eba4c2.fda54b4"
             ]
         ]
     },
     {
-        "id": "ee477ca2.a65568",
+        "id": "fe12ce9.6a53ab",
         "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": 5184.883331298828,
-        "y": 768,
-        "z": "db287b1f.2984a8",
+        "x": 5155,
+        "y": 733,
+        "z": "5a4cb919.dfff38",
         "wires": [
             []
         ]
     },
     {
-        "id": "f9d5afb7.0291b",
+        "id": "9e233ee4.5c90e",
         "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": 5048.883331298828,
-        "y": 727,
-        "z": "db287b1f.2984a8",
+        "x": 5019,
+        "y": 692,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "5e527e99.1f4728",
+        "id": "4eba4c2.fda54b4",
         "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": 5111.883331298828,
-        "y": 814,
-        "z": "db287b1f.2984a8",
+        "x": 5082,
+        "y": 779,
+        "z": "5a4cb919.dfff38",
         "wires": [
             []
         ]
     },
     {
-        "id": "48c30a65.f0f584",
+        "id": "fbd17573.b91cd8",
         "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": 4185.883331298828,
-        "y": 213,
-        "z": "db287b1f.2984a8",
+        "x": 4156,
+        "y": 178,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "bc523ecb.f956a8",
+        "id": "985dbb20.1c3b78",
         "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": 4211.883331298828,
-        "y": 330,
-        "z": "db287b1f.2984a8",
+        "x": 4182,
+        "y": 295,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "a72840b5.dc70e",
-                "54e4a8de.9445f8",
-                "4012660e.b55b2"
+                "544c4f89.eba52",
+                "eb873b5e.d10b8",
+                "d8377d86.76164"
             ]
         ]
     },
     {
-        "id": "a72840b5.dc70e",
+        "id": "544c4f89.eba52",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4407.383453369141,
-        "y": 282,
-        "z": "db287b1f.2984a8",
+        "x": 4377.5001220703125,
+        "y": 247,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "9d071aa.9c29c68"
+                "cd232c91.ed7d5"
             ]
         ]
     },
     {
-        "id": "54e4a8de.9445f8",
+        "id": "eb873b5e.d10b8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4399.383453369141,
-        "y": 337,
-        "z": "db287b1f.2984a8",
+        "x": 4369.5001220703125,
+        "y": 302,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "3662c50c.d754d2"
+                "7e7e18a4.ea2a98"
             ]
         ]
     },
     {
-        "id": "9d071aa.9c29c68",
+        "id": "cd232c91.ed7d5",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4551.765777587891,
-        "y": 281.6556701660156,
-        "z": "db287b1f.2984a8",
+        "x": 4521.8824462890625,
+        "y": 246.65567016601562,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "c1155c42.4dc2e8"
+                "d5d46c3b.524dc8"
             ]
         ]
     },
     {
-        "id": "a3b68f87.0c3248",
+        "id": "4c85ec99.26bac4",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5133.883331298828,
-        "y": 284,
-        "z": "db287b1f.2984a8",
+        "x": 5104,
+        "y": 249,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "e6d1f56a.1147f8"
+                "490c8cc0.c71134"
             ]
         ]
     },
     {
-        "id": "c1155c42.4dc2e8",
+        "id": "d5d46c3b.524dc8",
         "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": 4735.883331298828,
-        "y": 280,
-        "z": "db287b1f.2984a8",
+        "x": 4706,
+        "y": 245,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "e3565ab9.0a825"
+                "cc43f2ea.19847"
             ]
         ]
     },
     {
-        "id": "e3565ab9.0a825",
+        "id": "cc43f2ea.19847",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4930.883331298828,
-        "y": 280,
-        "z": "db287b1f.2984a8",
+        "x": 4901,
+        "y": 245,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "a3b68f87.0c3248"
+                "4c85ec99.26bac4"
             ]
         ]
     },
     {
-        "id": "4012660e.b55b2",
+        "id": "d8377d86.76164",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4404.383453369141,
-        "y": 394,
-        "z": "db287b1f.2984a8",
+        "x": 4374.5001220703125,
+        "y": 359,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "7e9c03d8.c41c7c"
+                "9cf617d3.aee3a8"
             ]
         ]
     },
     {
-        "id": "7e9c03d8.c41c7c",
+        "id": "9cf617d3.aee3a8",
         "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": 4556.383453369141,
-        "y": 395,
-        "z": "db287b1f.2984a8",
+        "x": 4526.5001220703125,
+        "y": 360,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "3662c50c.d754d2",
+        "id": "7e7e18a4.ea2a98",
         "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": 4567.383453369141,
-        "y": 338,
-        "z": "db287b1f.2984a8",
+        "x": 4537.5001220703125,
+        "y": 303,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "99fa8e6f.e803d8",
+        "id": "f42e9c90.ae58f",
         "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": 5518.883331298828,
-        "y": 297,
-        "z": "db287b1f.2984a8",
+        "x": 5489,
+        "y": 262,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "a38e0436.5aedc",
-                "80f6747e.265c78",
-                "c370b7ba.84a26"
+                "f404a9ca.fbce2",
+                "3fd1ebaf.c62a54",
+                "66a3972e.71bfa8"
             ]
         ]
     },
     {
-        "id": "e6d1f56a.1147f8",
+        "id": "490c8cc0.c71134",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5312.883331298828,
-        "y": 284,
-        "z": "db287b1f.2984a8",
+        "x": 5283,
+        "y": 249,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "4599703a.c42f3",
-                "99fa8e6f.e803d8"
+                "9ce5b4b0.4bb188",
+                "f42e9c90.ae58f"
             ]
         ]
     },
     {
-        "id": "4599703a.c42f3",
+        "id": "9ce5b4b0.4bb188",
         "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": 5548.883331298828,
-        "y": 245,
-        "z": "db287b1f.2984a8",
+        "x": 5519,
+        "y": 210,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "a38e0436.5aedc",
+        "id": "f404a9ca.fbce2",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5728.883331298828,
-        "y": 288,
-        "z": "db287b1f.2984a8",
+        "x": 5699,
+        "y": 253,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "8c88cbf0.e09b1"
+                "3597c274.50637e"
             ]
         ]
     },
     {
-        "id": "80f6747e.265c78",
+        "id": "3fd1ebaf.c62a54",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5720.883331298828,
-        "y": 343,
-        "z": "db287b1f.2984a8",
+        "x": 5691,
+        "y": 308,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "e2be9acb.77d62"
+                "ff90e84e.43d4b8"
             ]
         ]
     },
     {
-        "id": "c370b7ba.84a26",
+        "id": "66a3972e.71bfa8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5725.883331298828,
-        "y": 400,
-        "z": "db287b1f.2984a8",
+        "x": 5696,
+        "y": 365,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "856ee89c.2898"
+                "ff823793.36814"
             ]
         ]
     },
     {
-        "id": "856ee89c.2898",
+        "id": "ff823793.36814",
         "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": 5877.883331298828,
-        "y": 401,
-        "z": "db287b1f.2984a8",
+        "x": 5848,
+        "y": 366,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "e2be9acb.77d62",
+        "id": "ff90e84e.43d4b8",
         "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": 5888.883331298828,
-        "y": 346,
-        "z": "db287b1f.2984a8",
+        "x": 5859,
+        "y": 311,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "8c88cbf0.e09b1",
+        "id": "3597c274.50637e",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5873.265655517578,
-        "y": 285.6556701660156,
-        "z": "db287b1f.2984a8",
+        "x": 5843.38232421875,
+        "y": 250.65567016601562,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "a4a57efc.888ff8"
+                "d39e28b5.1aec5"
             ]
         ]
     },
     {
-        "id": "a4a57efc.888ff8",
+        "id": "d39e28b5.1aec5",
         "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": 6087.883331298828,
-        "y": 282,
-        "z": "db287b1f.2984a8",
+        "x": 6058,
+        "y": 247,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "172d91c5.a78676",
+        "id": "139f2f1e.8fa159",
         "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": 3654.883331298828,
-        "y": 1622,
-        "z": "db287b1f.2984a8",
+        "x": 3625,
+        "y": 1587,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "f13d198f.d5c79",
+        "id": "18d2c2bc.05fd85",
         "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": 3717.883331298828,
-        "y": 1951,
-        "z": "db287b1f.2984a8",
+        "x": 3688,
+        "y": 1916,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "3640aede.8913a2",
-                "f1b1c8d.9945bb8"
+                "8895fa29.bf8e3",
+                "23c7c635.fd4722"
             ]
         ]
     },
     {
-        "id": "3640aede.8913a2",
+        "id": "8895fa29.bf8e3",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4013.383331298828,
-        "y": 1918,
-        "z": "db287b1f.2984a8",
+        "x": 3983.5,
+        "y": 1883,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "4b0d0deb.6577e4"
+                "500b5538.e88684"
             ]
         ]
     },
     {
-        "id": "f1b1c8d.9945bb8",
+        "id": "23c7c635.fd4722",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4018.383331298828,
-        "y": 1983,
-        "z": "db287b1f.2984a8",
+        "x": 3988.5,
+        "y": 1948,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "5da14040.cb50b8"
+                "909dfd67.2300d8"
             ]
         ]
     },
     {
-        "id": "4b0d0deb.6577e4",
+        "id": "500b5538.e88684",
         "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": 4181.383331298828,
-        "y": 1918,
-        "z": "db287b1f.2984a8",
+        "x": 4151.5,
+        "y": 1883,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "5da14040.cb50b8",
+        "id": "909dfd67.2300d8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4191.883331298828,
-        "y": 1983,
-        "z": "db287b1f.2984a8",
+        "x": 4162,
+        "y": 1948,
+        "z": "5a4cb919.dfff38",
         "wires": [
             []
         ]
     },
     {
-        "id": "1e50105a.a8b96",
+        "id": "a49aeabe.b5ff8",
         "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": 3593.883331298828,
-        "y": 1679,
-        "z": "db287b1f.2984a8",
+        "x": 3564,
+        "y": 1644,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "dfe45c65.d48f6",
+        "id": "642d00da.b53c68",
         "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": 3613.883331298828,
-        "y": 1776,
-        "z": "db287b1f.2984a8",
+        "x": 3584,
+        "y": 1741,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "56d2f84a.b524e8",
-                "43f5b436.ace8b4",
-                "a9c884c3.3b2c18"
+                "1e5d6803.78b7d8",
+                "84307ec5.09a8d",
+                "b468d4fc.bc9c8"
             ]
         ]
     },
     {
-        "id": "56d2f84a.b524e8",
+        "id": "1e5d6803.78b7d8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3816.3834533691406,
-        "y": 1729,
-        "z": "db287b1f.2984a8",
+        "x": 3786.5001220703125,
+        "y": 1694,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "10cf7345.17615d"
+                "683b34d0.c1df64"
             ]
         ]
     },
     {
-        "id": "43f5b436.ace8b4",
+        "id": "84307ec5.09a8d",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3808.3834533691406,
-        "y": 1784,
-        "z": "db287b1f.2984a8",
+        "x": 3778.5001220703125,
+        "y": 1749,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "40e41e98.b2ab3"
+                "72cad52e.cb1d74"
             ]
         ]
     },
     {
-        "id": "10cf7345.17615d",
+        "id": "683b34d0.c1df64",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3960.7657775878906,
-        "y": 1726.6556701660156,
-        "z": "db287b1f.2984a8",
+        "x": 3930.8824462890625,
+        "y": 1691.6556701660156,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "69889215.886b4c"
+                "8511cae6.cbf588"
             ]
         ]
     },
     {
-        "id": "69889215.886b4c",
+        "id": "8511cae6.cbf588",
         "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": 4144.883331298828,
-        "y": 1741,
-        "z": "db287b1f.2984a8",
+        "x": 4115,
+        "y": 1706,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "3c1ff953.79a23e"
+                "82496ff9.234ee"
             ]
         ]
     },
     {
-        "id": "a9c884c3.3b2c18",
+        "id": "b468d4fc.bc9c8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3813.3834533691406,
-        "y": 1841,
-        "z": "db287b1f.2984a8",
+        "x": 3783.5001220703125,
+        "y": 1806,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "8ab7ecfb.f03ee"
+                "a6137ce1.b3b5c"
             ]
         ]
     },
     {
-        "id": "8ab7ecfb.f03ee",
+        "id": "a6137ce1.b3b5c",
         "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": 3965.3834533691406,
-        "y": 1842,
-        "z": "db287b1f.2984a8",
+        "x": 3935.5001220703125,
+        "y": 1807,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "40e41e98.b2ab3",
+        "id": "72cad52e.cb1d74",
         "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": 3976.3834533691406,
-        "y": 1787,
-        "z": "db287b1f.2984a8",
+        "x": 3946.5001220703125,
+        "y": 1752,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "37ef2104.1e9d5e",
+        "id": "7b4a137a.364fcc",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4542.883331298828,
-        "y": 1745,
-        "z": "db287b1f.2984a8",
+        "x": 4513,
+        "y": 1710,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "901dac81.52118"
+                "37fe69a9.07064e"
             ]
         ]
     },
     {
-        "id": "3c1ff953.79a23e",
+        "id": "82496ff9.234ee",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4339.883331298828,
-        "y": 1741,
-        "z": "db287b1f.2984a8",
+        "x": 4310,
+        "y": 1706,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "37ef2104.1e9d5e"
+                "7b4a137a.364fcc"
             ]
         ]
     },
     {
-        "id": "86b8c4cb.c3747",
+        "id": "4bdd9e57.a5e13",
         "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": 4927.883331298828,
-        "y": 1744,
-        "z": "db287b1f.2984a8",
+        "x": 4898,
+        "y": 1709,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "b5f45931.a1805",
-                "34bcb3b6.e69b1c",
-                "d4cc1381.862c48"
+                "8afff046.26af98",
+                "5118b1e.53f805",
+                "5a800db8.063d6c"
             ]
         ]
     },
     {
-        "id": "901dac81.52118",
+        "id": "37fe69a9.07064e",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4719.883331298828,
-        "y": 1737,
-        "z": "db287b1f.2984a8",
+        "x": 4690,
+        "y": 1702,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "81cd4229.29ba8",
-                "86b8c4cb.c3747"
+                "d299743b.8f6b68",
+                "4bdd9e57.a5e13"
             ]
         ]
     },
     {
-        "id": "81cd4229.29ba8",
+        "id": "d299743b.8f6b68",
         "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": 4957.883331298828,
-        "y": 1692,
-        "z": "db287b1f.2984a8",
+        "x": 4928,
+        "y": 1657,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "a6f965e8.0bb248",
+        "id": "2523ddf0.8e1c8a",
         "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": 5286.883331298828,
-        "y": 1848,
-        "z": "db287b1f.2984a8",
+        "x": 5257,
+        "y": 1813,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "3b503e2a.8c5dd2",
+        "id": "6f850c0f.e212ac",
         "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": 5297.883331298828,
-        "y": 1793,
-        "z": "db287b1f.2984a8",
+        "x": 5268,
+        "y": 1758,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "a84f2510.1ebf08",
+        "id": "546ca846.269108",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5282.265655517578,
-        "y": 1732.6556701660156,
-        "z": "db287b1f.2984a8",
+        "x": 5252.38232421875,
+        "y": 1697.6556701660156,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "f83738f1.e5e14"
+                "fac7ab27.77dda8"
             ]
         ]
     },
     {
-        "id": "f83738f1.e5e14",
+        "id": "fac7ab27.77dda8",
         "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": 5496.883331298828,
-        "y": 1729,
-        "z": "db287b1f.2984a8",
+        "x": 5467,
+        "y": 1694,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "b5f45931.a1805",
+        "id": "8afff046.26af98",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5137.883331298828,
-        "y": 1735,
-        "z": "db287b1f.2984a8",
+        "x": 5108,
+        "y": 1700,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "a84f2510.1ebf08"
+                "546ca846.269108"
             ]
         ]
     },
     {
-        "id": "34bcb3b6.e69b1c",
+        "id": "5118b1e.53f805",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5129.883331298828,
-        "y": 1790,
-        "z": "db287b1f.2984a8",
+        "x": 5100,
+        "y": 1755,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "3b503e2a.8c5dd2"
+                "6f850c0f.e212ac"
             ]
         ]
     },
     {
-        "id": "d4cc1381.862c48",
+        "id": "5a800db8.063d6c",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5134.883331298828,
-        "y": 1847,
-        "z": "db287b1f.2984a8",
+        "x": 5105,
+        "y": 1812,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "a6f965e8.0bb248"
+                "2523ddf0.8e1c8a"
             ]
         ]
     },
     {
-        "id": "4a95df1.67c3fa",
+        "id": "a1edca3.1a62bb8",
         "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": 3168.883331298828,
-        "y": 693,
-        "z": "db287b1f.2984a8",
+        "x": 3139,
+        "y": 658,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "60b8b463.e4925c",
-                "5e23be29.1eb6a"
+                "d4bdeded.3ef248",
+                "eead64c.0115918"
             ]
         ]
     },
     {
-        "id": "60b8b463.e4925c",
+        "id": "d4bdeded.3ef248",
         "type": "outcome",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3382.883331298828,
-        "y": 730,
-        "z": "db287b1f.2984a8",
+        "x": 3353,
+        "y": 695,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "4d4203c4.4fd81c"
+                "614a0644.b0e3e"
             ]
         ]
     },
     {
-        "id": "5e23be29.1eb6a",
+        "id": "eead64c.0115918",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3384.883331298828,
-        "y": 668,
-        "z": "db287b1f.2984a8",
+        "x": 3355,
+        "y": 633,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "402d5674.bb5698"
+                "295e16ce.878c6a"
             ]
         ]
     },
     {
-        "id": "4d4203c4.4fd81c",
+        "id": "614a0644.b0e3e",
         "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": 2962.883331298828,
-        "y": 1973,
-        "z": "db287b1f.2984a8",
+        "x": 2933,
+        "y": 1938,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "4155de88.54a1f",
-                "11e38b5d.85c715"
+                "75bfd38b.356f64",
+                "f4c4b096.a3ce2"
             ]
         ]
     },
     {
-        "id": "4155de88.54a1f",
+        "id": "75bfd38b.356f64",
         "type": "outcome",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3215.883331298828,
-        "y": 2007,
-        "z": "db287b1f.2984a8",
+        "x": 3186,
+        "y": 1972,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "97b4f973.8f85a8"
+                "b0597a28.514d3"
             ]
         ]
     },
     {
-        "id": "11e38b5d.85c715",
+        "id": "f4c4b096.a3ce2",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3215.883331298828,
-        "y": 1951,
-        "z": "db287b1f.2984a8",
+        "x": 3186,
+        "y": 1916,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "4bdf7725.9cef3"
+                "64045150.224658"
             ]
         ]
     },
     {
-        "id": "97b4f973.8f85a8",
+        "id": "b0597a28.514d3",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3366.883331298828,
-        "y": 2007,
-        "z": "db287b1f.2984a8",
+        "x": 3337,
+        "y": 1972,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "15e2350c.3f989b",
+        "id": "cf5b963d.2b5a08",
         "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": 4242.883331298828,
-        "y": 105,
-        "z": "db287b1f.2984a8",
+        "x": 4213,
+        "y": 70,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "22f55219.d9af6e",
+        "id": "4badfb31.b82c1c",
         "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": 3650.883331298828,
-        "y": 1564,
-        "z": "db287b1f.2984a8",
+        "x": 3621,
+        "y": 1529,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "9157e39e.50973",
+        "id": "552020c2.f01db",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 3933.883331298828,
-        "y": 362,
-        "z": "db287b1f.2984a8",
+        "x": 3904,
+        "y": 327,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "15e2350c.3f989b",
-                "5be24b21.11ebc4",
-                "48c30a65.f0f584",
-                "bc523ecb.f956a8",
-                "66c2f1fa.df4e",
-                "738a4fa7.5a68d",
-                "9521e4ca.a61af",
-                "224f4283.917d26"
+                "cf5b963d.2b5a08",
+                "123fcc82.b79ae3",
+                "fbd17573.b91cd8",
+                "985dbb20.1c3b78",
+                "e308a3a2.af826",
+                "ec3b4a19.7f5ee",
+                "881b2d7a.c4e888",
+                "1a392cd7.238923"
             ]
         ]
     },
     {
-        "id": "4bdf7725.9cef3",
+        "id": "64045150.224658",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3366.883331298828,
-        "y": 1950,
-        "z": "db287b1f.2984a8",
+        "x": 3337,
+        "y": 1915,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "22f55219.d9af6e",
-                "172d91c5.a78676",
-                "1e50105a.a8b96",
-                "dfe45c65.d48f6",
-                "f13d198f.d5c79",
-                "78f084cb.41e754",
-                "e35a6c95.6b3d6",
-                "1ced8517.ce35e3"
+                "4badfb31.b82c1c",
+                "139f2f1e.8fa159",
+                "a49aeabe.b5ff8",
+                "642d00da.b53c68",
+                "18d2c2bc.05fd85",
+                "724930a5.f44628",
+                "98331ea2.d141f",
+                "f84de17e.e8ea08"
             ]
         ]
     },
     {
-        "id": "e7e7eca7.931088",
+        "id": "ed40d4d6.135678",
         "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": 3604.883331298828,
-        "y": 2249,
-        "z": "db287b1f.2984a8",
+        "x": 3575,
+        "y": 2214,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "5544b67f.df3238",
+        "id": "b71c97.3dad8368",
         "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": 3758.883331298828,
-        "y": 2297,
-        "z": "db287b1f.2984a8",
+        "x": 3729,
+        "y": 2262,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "b36c5e4.a4b982",
-                "75e03418.7b0a3c"
+                "aa1d9a65.d56ee",
+                "ce785491.f82258"
             ]
         ]
     },
     {
-        "id": "b36c5e4.a4b982",
+        "id": "aa1d9a65.d56ee",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4104.383331298828,
-        "y": 2278,
-        "z": "db287b1f.2984a8",
+        "x": 4074.5,
+        "y": 2243,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "996a2de3.86ff68"
+                "d8df230a.b47018"
             ]
         ]
     },
     {
-        "id": "75e03418.7b0a3c",
+        "id": "ce785491.f82258",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4108.383331298828,
-        "y": 2318,
-        "z": "db287b1f.2984a8",
+        "x": 4078.5,
+        "y": 2283,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "1787d971.8d0d67"
+                "d2d57048.de12f"
             ]
         ]
     },
     {
-        "id": "996a2de3.86ff68",
+        "id": "d8df230a.b47018",
         "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": 4262.383331298828,
-        "y": 2278,
-        "z": "db287b1f.2984a8",
+        "x": 4232.5,
+        "y": 2243,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "1787d971.8d0d67",
+        "id": "d2d57048.de12f",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4265.883331298828,
-        "y": 2318,
-        "z": "db287b1f.2984a8",
+        "x": 4236,
+        "y": 2283,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "79bbcc28.d4fd3c",
-                "137b8fb9.4aaa78"
+                "703675c3.1d187c",
+                "6a8e2764.0748e8"
             ]
         ]
     },
     {
-        "id": "79bbcc28.d4fd3c",
+        "id": "703675c3.1d187c",
         "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": 4605.883331298828,
-        "y": 2317,
-        "z": "db287b1f.2984a8",
+        "x": 4576,
+        "y": 2282,
+        "z": "5a4cb919.dfff38",
         "wires": [
             []
         ]
     },
     {
-        "id": "9aab71de.3f671",
+        "id": "b9adfc7b.f1d908",
         "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": 4463.883331298828,
-        "y": 2275,
-        "z": "db287b1f.2984a8",
+        "x": 4434,
+        "y": 2240,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "137b8fb9.4aaa78",
+        "id": "6a8e2764.0748e8",
         "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": 4534.883331298828,
-        "y": 2366,
-        "z": "db287b1f.2984a8",
+        "x": 4505,
+        "y": 2331,
+        "z": "5a4cb919.dfff38",
         "wires": [
             []
         ]
     },
     {
-        "id": "e7a16254.b52678",
+        "id": "641093d5.a73774",
         "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": 3159.883331298828,
-        "y": 633,
-        "z": "db287b1f.2984a8",
+        "x": 3130,
+        "y": 598,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "b98d7c04.aadb6",
+        "id": "29b91b19.d2edf4",
         "type": "comment",
         "name": "only dst ttp exists. No src",
         "info": "",
         "comments": "",
-        "x": 3754.883331298828,
-        "y": 319,
-        "z": "db287b1f.2984a8",
+        "x": 3725,
+        "y": 284,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "f9466402.70d608",
+        "id": "df88a98e.3b797",
         "type": "comment",
         "name": "only src ttp exists. No dst",
         "info": "",
         "comments": "",
-        "x": 3311.883331298828,
-        "y": 1897,
-        "z": "db287b1f.2984a8",
+        "x": 3282,
+        "y": 1862,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "402d5674.bb5698",
+        "id": "295e16ce.878c6a",
         "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": 3490.883331298828,
-        "y": 481,
-        "z": "db287b1f.2984a8",
+        "x": 3461,
+        "y": 446,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "40174504.12275c",
-                "483f6800.997ef8"
+                "fdfbdf68.ace01",
+                "8f7ef737.3d4208"
             ]
         ]
     },
     {
-        "id": "483f6800.997ef8",
+        "id": "8f7ef737.3d4208",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3732.883331298828,
-        "y": 1070,
-        "z": "db287b1f.2984a8",
+        "x": 3703,
+        "y": 1035,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "f91cd9b2.b4ebc8"
+                "d545d977.39f008"
             ]
         ]
     },
     {
-        "id": "40174504.12275c",
+        "id": "fdfbdf68.ace01",
         "type": "outcome",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3726.883331298828,
-        "y": 361,
-        "z": "db287b1f.2984a8",
+        "x": 3697,
+        "y": 326,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "9157e39e.50973"
+                "552020c2.f01db"
             ]
         ]
     },
     {
-        "id": "f91cd9b2.b4ebc8",
+        "id": "d545d977.39f008",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3890.883331298828,
-        "y": 1069,
-        "z": "db287b1f.2984a8",
+        "x": 3861,
+        "y": 1034,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "e0a89dfb.b97bd8",
-                "356efc92.1be0c4",
-                "b98c51bd.b1df7",
-                "c9386596.fb5188",
-                "99a335d9.47dc9",
-                "1d1e23b2.17cb04"
+                "127c7c35.f5600c",
+                "aa22b9fb.8c00d",
+                "7a8bb8ff.a3807",
+                "b6e4b7cd.3aab58",
+                "9befe6d.bfbfb18",
+                "61ff745d.2cf8b4"
             ]
         ]
     },
     {
-        "id": "356efc92.1be0c4",
+        "id": "aa22b9fb.8c00d",
         "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": 4154.883331298828,
-        "y": 952,
-        "z": "db287b1f.2984a8",
+        "x": 4125,
+        "y": 917,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "99a335d9.47dc9",
+        "id": "9befe6d.bfbfb18",
         "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": 4235.883331298828,
-        "y": 1267,
-        "z": "db287b1f.2984a8",
+        "x": 4206,
+        "y": 1232,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "2ae3d84f.15cb3",
-                "a0cd8374.ae65d8"
+                "602f32f4.cac7b4",
+                "1d093526.32224b"
             ]
         ]
     },
     {
-        "id": "2ae3d84f.15cb3",
+        "id": "602f32f4.cac7b4",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4545.383331298828,
-        "y": 1236,
-        "z": "db287b1f.2984a8",
+        "x": 4515.5,
+        "y": 1201,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "d03fdf1c.3b45d"
+                "4513cd6b.369634"
             ]
         ]
     },
     {
-        "id": "a0cd8374.ae65d8",
+        "id": "1d093526.32224b",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4550.383331298828,
-        "y": 1301,
-        "z": "db287b1f.2984a8",
+        "x": 4520.5,
+        "y": 1266,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "f8c3fa12.5c834"
+                "7640c8ac.188fc8"
             ]
         ]
     },
     {
-        "id": "d03fdf1c.3b45d",
+        "id": "4513cd6b.369634",
         "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": 4721.383331298828,
-        "y": 1236,
-        "z": "db287b1f.2984a8",
+        "x": 4691.5,
+        "y": 1201,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "f8c3fa12.5c834",
+        "id": "7640c8ac.188fc8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4716.883331298828,
-        "y": 1301,
-        "z": "db287b1f.2984a8",
+        "x": 4687,
+        "y": 1266,
+        "z": "5a4cb919.dfff38",
         "wires": [
             []
         ]
     },
     {
-        "id": "b98c51bd.b1df7",
+        "id": "7a8bb8ff.a3807",
         "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": 4092.883331298828,
-        "y": 1000,
-        "z": "db287b1f.2984a8",
+        "x": 4063,
+        "y": 965,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "c9386596.fb5188",
+        "id": "b6e4b7cd.3aab58",
         "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": 4118.883331298828,
-        "y": 1117,
-        "z": "db287b1f.2984a8",
+        "x": 4089,
+        "y": 1082,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "312e9154.f9dbd6",
-                "38e6d39b.3fc964",
-                "d52b1c1f.8a6ca8"
+                "bc604696.f19bf",
+                "6b2ab2eb.e94cac",
+                "158e3d74.81687b"
             ]
         ]
     },
     {
-        "id": "312e9154.f9dbd6",
+        "id": "bc604696.f19bf",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4314.383453369141,
-        "y": 1069,
-        "z": "db287b1f.2984a8",
+        "x": 4284.5001220703125,
+        "y": 1034,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "6d3eafaf.02fb48"
+                "fbbae41a.6bb8"
             ]
         ]
     },
     {
-        "id": "38e6d39b.3fc964",
+        "id": "6b2ab2eb.e94cac",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4306.383453369141,
-        "y": 1124,
-        "z": "db287b1f.2984a8",
+        "x": 4276.5001220703125,
+        "y": 1089,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "3519bfd5.fa4b3"
+                "5e10560f.7f2a6"
             ]
         ]
     },
     {
-        "id": "6d3eafaf.02fb48",
+        "id": "fbbae41a.6bb8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4458.765777587891,
-        "y": 1068.6556701660156,
-        "z": "db287b1f.2984a8",
+        "x": 4428.8824462890625,
+        "y": 1033.6556701660156,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "6a66b1f9.955598"
+                "4ab90ec7.0f8a1"
             ]
         ]
     },
     {
-        "id": "6a66b1f9.955598",
+        "id": "4ab90ec7.0f8a1",
         "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": 4642.883331298828,
-        "y": 1067,
-        "z": "db287b1f.2984a8",
+        "x": 4613,
+        "y": 1032,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "43b05855.517cf"
+                "3bb025b6.92298a"
             ]
         ]
     },
     {
-        "id": "43b05855.517cf",
+        "id": "3bb025b6.92298a",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.domainG-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4837.883331298828,
-        "y": 1067,
-        "z": "db287b1f.2984a8",
+        "x": 4808,
+        "y": 1032,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "c21a24cd.dd2528"
+                "ce204654.d589e8"
             ]
         ]
     },
     {
-        "id": "d52b1c1f.8a6ca8",
+        "id": "158e3d74.81687b",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4311.383453369141,
-        "y": 1181,
-        "z": "db287b1f.2984a8",
+        "x": 4281.5001220703125,
+        "y": 1146,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "db81dd24.8006b"
+                "cfe04507.17faa"
             ]
         ]
     },
     {
-        "id": "db81dd24.8006b",
+        "id": "cfe04507.17faa",
         "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": 4463.383453369141,
-        "y": 1182,
-        "z": "db287b1f.2984a8",
+        "x": 4433.5001220703125,
+        "y": 1147,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "3519bfd5.fa4b3",
+        "id": "5e10560f.7f2a6",
         "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": 4474.383453369141,
-        "y": 1125,
-        "z": "db287b1f.2984a8",
+        "x": 4444.5001220703125,
+        "y": 1090,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "e0a89dfb.b97bd8",
+        "id": "127c7c35.f5600c",
         "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": 4149.883331298828,
-        "y": 892,
-        "z": "db287b1f.2984a8",
+        "x": 4120,
+        "y": 857,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "c21a24cd.dd2528",
+        "id": "ce204654.d589e8",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5040.883331298828,
-        "y": 1071,
-        "z": "db287b1f.2984a8",
+        "x": 5011,
+        "y": 1036,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "f7c609f5.0c2d28"
+                "fea8f5c8.b664d8"
             ]
         ]
     },
     {
-        "id": "dff3e5ec.9273",
+        "id": "17936311.45c0f5",
         "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": 5425.883331298828,
-        "y": 1084,
-        "z": "db287b1f.2984a8",
+        "x": 5396,
+        "y": 1049,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "2769bc77.6b9fa4",
-                "7925966f.3df658",
-                "161a4207.178c96"
+                "bda3b861.07af08",
+                "8ce8739f.28fc08",
+                "8098fa71.4cbf3"
             ]
         ]
     },
     {
-        "id": "f7c609f5.0c2d28",
+        "id": "fea8f5c8.b664d8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5219.883331298828,
-        "y": 1071,
-        "z": "db287b1f.2984a8",
+        "x": 5190,
+        "y": 1036,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "3634d6f2.f94292",
-                "dff3e5ec.9273"
+                "619520a0.18d9e",
+                "17936311.45c0f5"
             ]
         ]
     },
     {
-        "id": "3634d6f2.f94292",
+        "id": "619520a0.18d9e",
         "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": 5455.883331298828,
-        "y": 1032,
-        "z": "db287b1f.2984a8",
+        "x": 5426,
+        "y": 997,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "2769bc77.6b9fa4",
+        "id": "bda3b861.07af08",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5635.883331298828,
-        "y": 1075,
-        "z": "db287b1f.2984a8",
+        "x": 5606,
+        "y": 1040,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "8b0e2b2b.7a21d"
+                "3c9ad3f5.e5e4a4"
             ]
         ]
     },
     {
-        "id": "7925966f.3df658",
+        "id": "8ce8739f.28fc08",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5627.883331298828,
-        "y": 1130,
-        "z": "db287b1f.2984a8",
+        "x": 5598,
+        "y": 1095,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "b9107d6e.7c0358"
+                "ec86cd9f.a15968"
             ]
         ]
     },
     {
-        "id": "161a4207.178c96",
+        "id": "8098fa71.4cbf3",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5632.883331298828,
-        "y": 1187,
-        "z": "db287b1f.2984a8",
+        "x": 5603,
+        "y": 1152,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "d5598bab.3dfb58"
+                "244270ad.8dfe1"
             ]
         ]
     },
     {
-        "id": "d5598bab.3dfb58",
+        "id": "244270ad.8dfe1",
         "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": 5784.883331298828,
-        "y": 1188,
-        "z": "db287b1f.2984a8",
+        "x": 5755,
+        "y": 1153,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "b9107d6e.7c0358",
+        "id": "ec86cd9f.a15968",
         "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": 5795.883331298828,
-        "y": 1133,
-        "z": "db287b1f.2984a8",
+        "x": 5766,
+        "y": 1098,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "8b0e2b2b.7a21d",
+        "id": "3c9ad3f5.e5e4a4",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5780.265655517578,
-        "y": 1072.6556701660156,
-        "z": "db287b1f.2984a8",
+        "x": 5750.38232421875,
+        "y": 1037.6556701660156,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "f80d31a9.31f3d"
+                "2068f2a1.5ec866"
             ]
         ]
     },
     {
-        "id": "f80d31a9.31f3d",
+        "id": "2068f2a1.5ec866",
         "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": 5994.883331298828,
-        "y": 1069,
-        "z": "db287b1f.2984a8",
+        "x": 5965,
+        "y": 1034,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "d718b282.287ca",
+        "id": "e69cbe2a.82be58",
         "type": "comment",
         "name": "both src and dst exist",
         "info": "",
         "comments": "",
-        "x": 3768.883331298828,
-        "y": 1010,
-        "z": "db287b1f.2984a8",
+        "x": 3739,
+        "y": 975,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "d6d93ab.df041c8",
+        "id": "957d0d12.f7d338",
         "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": 2330.883331298828,
-        "y": 737,
-        "z": "db287b1f.2984a8",
+        "x": 2301,
+        "y": 702,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "7d753f63.af1d7",
-                "7719dbd9.957fc4"
+                "7969493f.6a54d",
+                "9a6050c4.300548"
             ]
         ]
     },
     {
-        "id": "7719dbd9.957fc4",
+        "id": "9a6050c4.300548",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2737.883331298828,
-        "y": 755,
-        "z": "db287b1f.2984a8",
+        "x": 2708,
+        "y": 720,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "2b5dce30.392f92"
+                "66cd0943.de62f"
             ]
         ]
     },
     {
-        "id": "7d753f63.af1d7",
+        "id": "7969493f.6a54d",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2737.883331298828,
-        "y": 700,
-        "z": "db287b1f.2984a8",
+        "x": 2708,
+        "y": 665,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "155f7f13.57fce1"
+                "7c5fc999.6b62c"
             ]
         ]
     },
     {
-        "id": "155f7f13.57fce1",
+        "id": "7c5fc999.6b62c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2893.883331298828,
-        "y": 698,
-        "z": "db287b1f.2984a8",
+        "x": 2864,
+        "y": 663,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "e7a16254.b52678",
-                "4a95df1.67c3fa"
+                "641093d5.a73774",
+                "a1edca3.1a62bb8"
             ]
         ]
     },
     {
-        "id": "2b5dce30.392f92",
+        "id": "66cd0943.de62f",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2870.883331298828,
-        "y": 756,
-        "z": "db287b1f.2984a8",
+        "x": 2841,
+        "y": 721,
+        "z": "5a4cb919.dfff38",
         "wires": [
             []
         ]
     },
     {
-        "id": "9dad0003.283738",
+        "id": "cce8745e.b515b8",
         "type": "set",
         "name": "unset tmp.aai.all-vpn-bindings",
         "xml": "<set>\n<parameter name='tmp.aai.all-vpn-bindings.' value=\"\" />\n",
         "comments": "",
-        "x": 1047.8833312988281,
-        "y": 172,
-        "z": "db287b1f.2984a8",
+        "x": 1018,
+        "y": 137,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "a6d3cb9.27687b8",
+        "id": "48ad099a.c16688",
         "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": 4164.883331298828,
-        "y": 590,
-        "z": "db287b1f.2984a8",
+        "x": 4135,
+        "y": 555,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "738a4fa7.5a68d",
+        "id": "ec3b4a19.7f5ee",
         "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": 4224.883331298828,
-        "y": 629,
-        "z": "db287b1f.2984a8",
+        "x": 4195,
+        "y": 594,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "47e937a3.3ee608",
+        "id": "706cb78c.da92b",
         "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": 1040.8833312988281,
-        "y": 80,
-        "z": "db287b1f.2984a8",
+        "x": 1011,
+        "y": 45,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "6f67cdff.5c5554",
+        "id": "9a38eb9e.71f4d8",
         "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": 3576.883331298828,
-        "y": 2106,
-        "z": "db287b1f.2984a8",
+        "x": 3547,
+        "y": 2071,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "78f084cb.41e754",
+        "id": "724930a5.f44628",
         "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": 3632.883331298828,
-        "y": 2155,
-        "z": "db287b1f.2984a8",
+        "x": 3603,
+        "y": 2120,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "912dde6.9b60fa",
+        "id": "2a414bdc.2311dc",
         "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": 1040.8833312988281,
-        "y": 119,
-        "z": "db287b1f.2984a8",
+        "x": 1011,
+        "y": 84,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "fa83bc41.1d8b08",
+        "id": "88772a4.9b58658",
         "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": 1071.8833312988281,
-        "y": 220,
-        "z": "db287b1f.2984a8",
+        "x": 1042,
+        "y": 185,
+        "z": "5a4cb919.dfff38",
         "wires": [
             []
         ]
     },
     {
-        "id": "39b1b2.d055464e",
+        "id": "4ace150.4554dec",
         "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": 281.8833312988281,
-        "y": 695,
-        "z": "db287b1f.2984a8",
+        "x": 252,
+        "y": 660,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "e70c3582.89ad08",
-                "3aeaa08a.574a",
-                "1322af3c.bc6319"
+                "ce4ab0d3.b836a",
+                "9dbee6c6.1a60a",
+                "290803ec.65c94c"
             ]
         ]
     },
     {
-        "id": "e70c3582.89ad08",
+        "id": "ce4ab0d3.b836a",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 500.8833312988281,
-        "y": 633,
-        "z": "db287b1f.2984a8",
+        "x": 471,
+        "y": 598,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "9c476365.2b909"
+                "280015e3.c315e2"
             ]
         ]
     },
     {
-        "id": "3aeaa08a.574a",
+        "id": "9dbee6c6.1a60a",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 510.3742980957031,
-        "y": 675.5740356445312,
-        "z": "db287b1f.2984a8",
+        "x": 480.490966796875,
+        "y": 640.5740356445312,
+        "z": "5a4cb919.dfff38",
         "wires": [
             []
         ]
     },
     {
-        "id": "1322af3c.bc6319",
+        "id": "290803ec.65c94c",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 498.8833312988281,
-        "y": 722,
-        "z": "db287b1f.2984a8",
+        "x": 469,
+        "y": 687,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "23db95da.1941e2"
+                "f842cdf9.29a79"
             ]
         ]
     },
     {
-        "id": "9c476365.2b909",
+        "id": "280015e3.c315e2",
         "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": 697.8833312988281,
-        "y": 629,
-        "z": "db287b1f.2984a8",
+        "x": 668,
+        "y": 594,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "1a5a20de.60b4cf"
+                "cd508bdd.302a88"
             ]
         ]
     },
     {
-        "id": "23db95da.1941e2",
+        "id": "f842cdf9.29a79",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 667.8833312988281,
-        "y": 723,
-        "z": "db287b1f.2984a8",
+        "x": 638,
+        "y": 688,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "1a5a20de.60b4cf",
+        "id": "cd508bdd.302a88",
         "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": 921.2168273925781,
-        "y": 628.9999389648438,
-        "z": "db287b1f.2984a8",
+        "x": 891.33349609375,
+        "y": 593.9999389648438,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "59a859e2.c48ca8"
+                "d4df8e14.56fc08"
             ]
         ]
     },
     {
-        "id": "59a859e2.c48ca8",
+        "id": "d4df8e14.56fc08",
         "type": "outcome",
         "name": "connectivity",
         "xml": "<outcome value='connectivity'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1121.8834648132324,
-        "y": 630.000020980835,
-        "z": "db287b1f.2984a8",
+        "x": 1092.0001335144043,
+        "y": 595.000020980835,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "ae28be96.a81b18"
+                "b67eb6e5.58b31"
             ]
         ]
     },
     {
-        "id": "ae28be96.a81b18",
+        "id": "b67eb6e5.58b31",
         "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": 251.88333129882812,
-        "y": 892,
-        "z": "db287b1f.2984a8",
+        "x": 222,
+        "y": 857,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "4595d435.587aa4",
-                "60a8c3ff.237aec",
-                "18e77ed.3460901"
+                "eb910f68.8a5408",
+                "a6536ba8.c4e148",
+                "6d1288a7.3722b8"
             ]
         ]
     },
     {
-        "id": "4595d435.587aa4",
+        "id": "eb910f68.8a5408",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 459.8833312988281,
-        "y": 856,
-        "z": "db287b1f.2984a8",
+        "x": 430,
+        "y": 821,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "9c5806bb.83c05"
+                "6687da8.fb06ca4"
             ]
         ]
     },
     {
-        "id": "60a8c3ff.237aec",
+        "id": "a6536ba8.c4e148",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 460.3742980957031,
-        "y": 901.5740356445312,
-        "z": "db287b1f.2984a8",
+        "x": 430.490966796875,
+        "y": 866.5740356445312,
+        "z": "5a4cb919.dfff38",
         "wires": [
             []
         ]
     },
     {
-        "id": "18e77ed.3460901",
+        "id": "6d1288a7.3722b8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 457.8833312988281,
-        "y": 945,
-        "z": "db287b1f.2984a8",
+        "x": 428,
+        "y": 910,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "a170b783.101ed"
+                "a3e6b31.4b2495"
             ]
         ]
     },
     {
-        "id": "a170b783.101ed",
+        "id": "a3e6b31.4b2495",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 626.8833312988281,
-        "y": 946,
-        "z": "db287b1f.2984a8",
+        "x": 597,
+        "y": 911,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "aaf101ae.84a298",
+        "id": "64de189c.ea0ca",
         "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": 598.8833312988281,
-        "y": 1440,
-        "z": "db287b1f.2984a8",
+        "x": 569,
+        "y": 1405,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "48f75925.f13078"
+                "f09d5f3a.90b09"
             ]
         ]
     },
     {
-        "id": "48f75925.f13078",
+        "id": "f09d5f3a.90b09",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 801.8833312988281,
-        "y": 1452,
-        "z": "db287b1f.2984a8",
+        "x": 772,
+        "y": 1417,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "dc596581.8a224"
+                "be069a3d.2f258"
             ]
         ]
     },
     {
-        "id": "dc596581.8a224",
+        "id": "be069a3d.2f258",
         "type": "outcome",
         "name": "UNI",
         "xml": "<outcome value='uni'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 967.8833312988281,
-        "y": 1449,
-        "z": "db287b1f.2984a8",
+        "x": 938,
+        "y": 1414,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "63611a55.44e3fc"
+                "b33327bf.cf44b8"
             ]
         ]
     },
     {
-        "id": "63611a55.44e3fc",
+        "id": "b33327bf.cf44b8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1128.8833312988281,
-        "y": 1446,
-        "z": "db287b1f.2984a8",
+        "x": 1099,
+        "y": 1411,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "155181d9.def56e",
-                "450c0202.9562fc",
-                "e522d7e8.f0b6d",
-                "b85bac18.623698",
-                "d97c4e37.51bad8"
+                "9b6250ff.75cf18",
+                "6e8e9c3e.00f634",
+                "db16830a.f6a5",
+                "611e4d54.277574",
+                "c0f4e533.035be8",
+                "ee82569c.a25768"
             ]
         ]
     },
     {
-        "id": "450c0202.9562fc",
+        "id": "6e8e9c3e.00f634",
         "type": "set",
         "name": "unset tmp.aai.uni",
         "xml": "<set>\n<parameter name='tmp.aai.uni.' value='' />\n",
         "comments": "",
-        "x": 1332.8833312988281,
-        "y": 1404,
-        "z": "db287b1f.2984a8",
+        "x": 1305,
+        "y": 1010.9999389648438,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "155181d9.def56e",
+        "id": "9b6250ff.75cf18",
         "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": 1329.8833312988281,
-        "y": 1449,
-        "z": "db287b1f.2984a8",
+        "x": 1302,
+        "y": 1055.9999389648438,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "c73d859f.d40f2",
-                "cdecbb41.644898",
-                "ca040aae.e9fa08"
+                "1b290eb5.e974c9",
+                "b84573d.a8be19",
+                "ef2334eb.3c1b68"
             ]
         ]
     },
     {
-        "id": "cdecbb41.644898",
+        "id": "b84573d.a8be19",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1525.3742980957031,
-        "y": 1422.573974609375,
-        "z": "db287b1f.2984a8",
+        "x": 1497.490966796875,
+        "y": 1029.5739135742188,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "dcd0fdd9.1c84f"
+                "45bb14a8.1a7924"
             ]
         ]
     },
     {
-        "id": "ca040aae.e9fa08",
+        "id": "ef2334eb.3c1b68",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1520.8833312988281,
-        "y": 1466.9999389648438,
-        "z": "db287b1f.2984a8",
+        "x": 1493,
+        "y": 1073.9998779296875,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "7c23dd25.00653c"
+                "cd1f6950.fef1f"
             ]
         ]
     },
     {
-        "id": "dcd0fdd9.1c84f",
+        "id": "45bb14a8.1a7924",
         "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": 1687.9458312988281,
-        "y": 1421.8596801757812,
-        "z": "db287b1f.2984a8",
+        "x": 1660.0625,
+        "y": 1028.859619140625,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "7c23dd25.00653c",
+        "id": "cd1f6950.fef1f",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 1688.8833312988281,
-        "y": 1466.9999389648438,
-        "z": "db287b1f.2984a8",
+        "x": 1661,
+        "y": 1073.9998779296875,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "c84187cf.6e6008",
+        "id": "cd4af41f.be1a78",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1690.8833312988281,
-        "y": 1513.9999389648438,
-        "z": "db287b1f.2984a8",
+        "x": 1663,
+        "y": 1120.9998779296875,
+        "z": "5a4cb919.dfff38",
         "wires": [
             []
         ]
     },
     {
-        "id": "c73d859f.d40f2",
+        "id": "1b290eb5.e974c9",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1521.8833312988281,
-        "y": 1513.9999389648438,
-        "z": "db287b1f.2984a8",
-        "wires": [
-            [
-                "c84187cf.6e6008"
-            ]
-        ]
-    },
-    {
-        "id": "a7f36b9f.f75b88",
-        "type": "switchNode",
-        "name": "switch conn type",
-        "xml": "<switch test=\"`$tmp.aai.connectivity.vpn-type`\">\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 211.38333129882812,
-        "y": 1111,
-        "z": "db287b1f.2984a8",
-        "wires": [
-            [
-                "b58d5b5e.9a197",
-                "5c723a86.22c16c",
-                "fb40210e.8c5be8"
-            ]
-        ]
-    },
-    {
-        "id": "ce504b34.d68ac8",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 322.3833312988281,
-        "y": 1467,
-        "z": "db287b1f.2984a8",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "b58d5b5e.9a197",
-        "type": "outcome",
-        "name": "leaf",
-        "xml": "<outcome value='leaf'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 197.38333129882812,
-        "y": 1357,
-        "z": "db287b1f.2984a8",
-        "wires": [
-            [
-                "67ff853e.386644"
-            ]
-        ]
-    },
-    {
-        "id": "5c723a86.22c16c",
-        "type": "outcome",
-        "name": "root",
-        "xml": "<outcome value='root'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 198.38333129882812,
-        "y": 1415,
-        "z": "db287b1f.2984a8",
-        "wires": [
-            [
-                "402699af.4c591"
-            ]
-        ]
-    },
-    {
-        "id": "fb40210e.8c5be8",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 200.38333129882812,
-        "y": 1469,
-        "z": "db287b1f.2984a8",
+        "x": 1494,
+        "y": 1120.9998779296875,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "ce504b34.d68ac8"
+                "cd4af41f.be1a78"
             ]
         ]
     },
     {
-        "id": "5d006f15.710a08",
+        "id": "60f7024f.a382fc",
         "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": 1305.8833312988281,
-        "y": 1677,
-        "z": "db287b1f.2984a8",
+        "x": 1276,
+        "y": 1642,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "e522d7e8.f0b6d",
+        "id": "db16830a.f6a5",
         "type": "set",
         "name": "set ethernet-srv-end-points-list array",
         "xml": "<set>\n<!--<parameter name='`ethernet-srv-end-points-list[$epidx].ethernet-end-point-name`' value='`$tmp.aai.connectivity.connectivity-id`' />-->\n<parameter name='`ethernet-srv-end-points-list[$epidx].ethernet-end-point-name`' value='`$tmp.aai.uni.id`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].index-number`' value='0' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].eth-node-id`' value='`$tmp.uni-node-id-short`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].eth-node-tp-id`' value='`$tmp.aai.uni.tp-id`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].leafOrRootAccess`' value='`$leafOrRootAccess`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].cvlan`' value='`$tmp.aai.connectivity.cvlan`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].CIR`' value='`$tmp.aai.uni.data-source * 1000000`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].EIR`' value='`$tmp.aai.uni.data-source * 1000000`' />\n\n<parameter name='`ethernet-srv-end-points-list_length`' value='`$epidx + 1`' />\n",
         "comments": "",
-        "x": 1396.8833312988281,
-        "y": 1731,
-        "z": "db287b1f.2984a8",
+        "x": 1367,
+        "y": 1696,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "402699af.4c591",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 314.3833312988281,
-        "y": 1411,
-        "z": "db287b1f.2984a8",
-        "wires": [
-            [
-                "784b1e5c.92c77",
-                "aaf101ae.84a298",
-                "dfffb0d0.b2d2d",
-                "3502903c.982ab",
-                "5524ecac.5cf47c",
-                "a12bd239.f8368",
-                "f8f2651c.3a035",
-                "f84d6f72.692148",
-                "5d1396ed.19b6f8",
-                "1b4871a6.1cd8a6",
-                "48083140.e99758",
-                "d94511cd.5d63f"
-            ]
-        ]
-    },
-    {
-        "id": "67ff853e.386644",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 326.3833312988281,
-        "y": 1348,
-        "z": "db287b1f.2984a8",
-        "wires": [
-            [
-                "aaf101ae.84a298",
-                "80e8f9a6.45b808",
-                "70ed09af.22122",
-                "3502903c.982ab",
-                "5524ecac.5cf47c",
-                "a12bd239.f8368",
-                "f8f2651c.3a035",
-                "f84d6f72.692148",
-                "5d1396ed.19b6f8",
-                "1b4871a6.1cd8a6",
-                "48083140.e99758",
-                "d94511cd.5d63f"
-            ]
-        ]
-    },
-    {
-        "id": "80e8f9a6.45b808",
+        "id": "1989ebd9.8b76bc",
         "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": 618.3833312988281,
-        "y": 1233,
-        "z": "db287b1f.2984a8",
+        "x": 2043.5,
+        "y": 1109,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "784b1e5c.92c77",
+        "id": "9da50ff.0241af",
         "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": 635.3833312988281,
-        "y": 1327,
-        "z": "db287b1f.2984a8",
+        "x": 2048.5,
+        "y": 1211,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "3502903c.982ab",
+        "id": "eda2f0f7.d8fb38",
         "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": 561.8833312988281,
-        "y": 1696,
-        "z": "db287b1f.2984a8",
+        "x": 532,
+        "y": 1661,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "2dc7d020.0f01c8"
+                "62852429.1f30ac"
             ]
         ]
     },
     {
-        "id": "2dc7d020.0f01c8",
+        "id": "62852429.1f30ac",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 793.8833312988281,
-        "y": 1695,
-        "z": "db287b1f.2984a8",
+        "x": 764,
+        "y": 1660,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "9a9b2fc1.cfc378"
+                "ede4a749.9f1af8"
             ]
         ]
     },
     {
-        "id": "9a9b2fc1.cfc378",
+        "id": "ede4a749.9f1af8",
         "type": "outcome",
         "name": "vpn-binding",
         "xml": "<outcome value='vpn-binding'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1005.8833312988281,
-        "y": 1696,
-        "z": "db287b1f.2984a8",
+        "x": 976,
+        "y": 1661,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "3ee84e3e.71c9c2"
+                "b699a292.eb6f88"
             ]
         ]
     },
     {
-        "id": "3ee84e3e.71c9c2",
+        "id": "b699a292.eb6f88",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 261.8833312988281,
-        "y": 1852,
-        "z": "db287b1f.2984a8",
+        "x": 232,
+        "y": 1817,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "a6f3ac42.8fbf28",
-                "c5253df7.0ed11"
+                "13d7e483.3188fb",
+                "74bc3a8f.9628d4"
             ]
         ]
     },
     {
-        "id": "c5253df7.0ed11",
+        "id": "74bc3a8f.9628d4",
         "type": "set",
         "name": "unset tmp.aai.vpn-binding",
         "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value='' />\n",
         "comments": "",
-        "x": 496.8833312988281,
-        "y": 1839,
-        "z": "db287b1f.2984a8",
+        "x": 467,
+        "y": 1804,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "a6f3ac42.8fbf28",
+        "id": "13d7e483.3188fb",
         "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": 486.8833312988281,
-        "y": 1900,
-        "z": "db287b1f.2984a8",
+        "x": 457,
+        "y": 1865,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "b27c66fe.f461f8",
-                "d86a808d.b5d38",
-                "51be47ba.06369"
+                "bcef8cd9.e20998",
+                "764e27eb.b5496",
+                "21958602.3fa0ea"
             ]
         ]
     },
     {
-        "id": "d86a808d.b5d38",
+        "id": "764e27eb.b5496",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 700.3742980957031,
-        "y": 1884.5740356445312,
-        "z": "db287b1f.2984a8",
+        "x": 670.490966796875,
+        "y": 1849.5740356445312,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "40ccd27e.7bf8ec"
+                "9c812de2.87639"
             ]
         ]
     },
     {
-        "id": "51be47ba.06369",
+        "id": "21958602.3fa0ea",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 695.8833312988281,
-        "y": 1929,
-        "z": "db287b1f.2984a8",
+        "x": 666,
+        "y": 1894,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "10ad75eb.cd3092"
+                "2915d3a6.63730c"
             ]
         ]
     },
     {
-        "id": "b27c66fe.f461f8",
+        "id": "bcef8cd9.e20998",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 697.8833312988281,
-        "y": 1989,
-        "z": "db287b1f.2984a8",
+        "x": 668,
+        "y": 1954,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "f72f31f7.42e17"
+                "bb26f0d0.bc6288"
             ]
         ]
     },
     {
-        "id": "40ccd27e.7bf8ec",
+        "id": "9c812de2.87639",
         "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": 862.9458312988281,
-        "y": 1883.8597412109375,
-        "z": "db287b1f.2984a8",
+        "x": 833.0625,
+        "y": 1848.8597412109375,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "10ad75eb.cd3092",
+        "id": "2915d3a6.63730c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 863.8833312988281,
-        "y": 1929,
-        "z": "db287b1f.2984a8",
+        "x": 834,
+        "y": 1894,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "f72f31f7.42e17",
+        "id": "bb26f0d0.bc6288",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 866.8833312988281,
-        "y": 1988,
-        "z": "db287b1f.2984a8",
+        "x": 837,
+        "y": 1953,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "c01095c8.c5a848",
-                "1e0b480.37d7ab8"
+                "e8fb0469.22a408",
+                "b503b0ba.b1ff6"
             ]
         ]
     },
     {
-        "id": "f8f2651c.3a035",
+        "id": "445d8bb1.6c470c",
         "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",
         "comments": "",
-        "x": 265.8833312988281,
-        "y": 2487,
-        "z": "db287b1f.2984a8",
+        "x": 236,
+        "y": 2452,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "f84d6f72.692148",
+        "id": "925823e9.1c4a4",
         "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": 408.8833312988281,
-        "y": 2547,
-        "z": "db287b1f.2984a8",
+        "x": 379,
+        "y": 2512,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "7174c4fb.4236d4",
-                "3df090d7.e28cf"
+                "345842a4.88ef2e",
+                "a4dc32a8.6620d8"
             ]
         ]
     },
     {
-        "id": "7174c4fb.4236d4",
+        "id": "345842a4.88ef2e",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 721.3833312988281,
-        "y": 2524,
-        "z": "db287b1f.2984a8",
+        "x": 691.5,
+        "y": 2489,
+        "z": "5a4cb919.dfff38",
         "wires": [
             []
         ]
     },
     {
-        "id": "3df090d7.e28cf",
+        "id": "a4dc32a8.6620d8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 725.3833312988281,
-        "y": 2564,
-        "z": "db287b1f.2984a8",
+        "x": 695.5,
+        "y": 2529,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "bbef1ecc.7916"
+                "d1fda3bb.92b0e"
             ]
         ]
     },
     {
-        "id": "4d6cfe8e.59e2a",
+        "id": "cde1b667.7c4d6",
         "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": 901.3833312988281,
-        "y": 2528,
-        "z": "db287b1f.2984a8",
+        "x": 871.5,
+        "y": 2493,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "bbef1ecc.7916",
+        "id": "d1fda3bb.92b0e",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 916.8833312988281,
-        "y": 2582,
-        "z": "db287b1f.2984a8",
+        "x": 887,
+        "y": 2547,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "b94bbfec.158258"
+                "a9ee92c3.93f6e8"
             ]
         ]
     },
     {
-        "id": "b2dda6de.cb3b28",
+        "id": "459839ba.ae33c",
         "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": 1212.3833312988281,
-        "y": 2551,
-        "z": "db287b1f.2984a8",
+        "x": 1182.5,
+        "y": 2516,
+        "z": "5a4cb919.dfff38",
         "wires": [
             []
         ]
     },
     {
-        "id": "1cb10652.ba5e0a",
+        "id": "120147ed.79206",
         "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": 2679.383331298828,
-        "y": 1902,
-        "z": "db287b1f.2984a8",
+        "x": 2649.5,
+        "y": 1867,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "b94bbfec.158258",
+        "id": "a9ee92c3.93f6e8",
         "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": 1174.3833312988281,
-        "y": 2593,
-        "z": "db287b1f.2984a8",
+        "x": 1144.5,
+        "y": 2558,
+        "z": "5a4cb919.dfff38",
         "wires": [
             []
         ]
     },
     {
-        "id": "70ed09af.22122",
+        "id": "9d25e547.75567",
         "type": "set",
         "name": "set leafOrRootAccess",
         "xml": "<set>\n<parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:leaf-access' />\n",
         "comments": "",
-        "x": 584.3833312988281,
-        "y": 1271,
-        "z": "db287b1f.2984a8",
+        "x": 2009.5,
+        "y": 1147,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "dfffb0d0.b2d2d",
+        "id": "52a255e0.e77dec",
         "type": "set",
         "name": "set leafOrRootAccess",
         "xml": "<set>\n<parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:root-primary' />\n",
         "comments": "",
-        "x": 597.3833312988281,
-        "y": 1367,
-        "z": "db287b1f.2984a8",
+        "x": 2010.5,
+        "y": 1251,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "9521e4ca.a61af",
+        "id": "881b2d7a.c4e888",
         "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": 4333.883331298828,
-        "y": 543,
-        "z": "db287b1f.2984a8",
+        "x": 4304,
+        "y": 508,
+        "z": "5a4cb919.dfff38",
         "wires": [
             []
         ]
     },
     {
-        "id": "1d1e23b2.17cb04",
+        "id": "61ff745d.2cf8b4",
         "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": 4236.883331298828,
-        "y": 1362,
-        "z": "db287b1f.2984a8",
+        "x": 4207,
+        "y": 1327,
+        "z": "5a4cb919.dfff38",
         "wires": [
             []
         ]
     },
     {
-        "id": "e35a6c95.6b3d6",
+        "id": "98331ea2.d141f",
         "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": 3730.883331298828,
-        "y": 2034,
-        "z": "db287b1f.2984a8",
+        "x": 3701,
+        "y": 1999,
+        "z": "5a4cb919.dfff38",
         "wires": [
             []
         ]
     },
     {
-        "id": "9c5806bb.83c05",
+        "id": "6687da8.fb06ca4",
         "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": 831.8833312988281,
-        "y": 842,
-        "z": "db287b1f.2984a8",
+        "x": 802,
+        "y": 807,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "24382f34.66808",
-                "ea56d949.8ce4b"
+                "11a4a5f5.385f32",
+                "192499d2.667f1e"
             ]
         ]
     },
     {
-        "id": "24382f34.66808",
+        "id": "11a4a5f5.385f32",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1194.8833312988281,
-        "y": 865,
-        "z": "db287b1f.2984a8",
+        "x": 1165,
+        "y": 830,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "d7ed30c6.74c9b"
+                "1fc9c5be.8fac2a"
             ]
         ]
     },
     {
-        "id": "ea56d949.8ce4b",
+        "id": "192499d2.667f1e",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1194.8833312988281,
-        "y": 814,
-        "z": "db287b1f.2984a8",
+        "x": 1165,
+        "y": 779,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "3707e8cf.65827"
+                "5fe8520c.50e664"
             ]
         ]
     },
     {
-        "id": "d7ed30c6.74c9b",
+        "id": "1fc9c5be.8fac2a",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1350.8833312988281,
-        "y": 863,
-        "z": "db287b1f.2984a8",
+        "x": 1321,
+        "y": 828,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "a7f36b9f.f75b88"
+                "a46faf22.6dbda8"
             ]
         ]
     },
     {
-        "id": "3707e8cf.65827",
+        "id": "5fe8520c.50e664",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1327.8833312988281,
-        "y": 815,
-        "z": "db287b1f.2984a8",
+        "x": 1298,
+        "y": 780,
+        "z": "5a4cb919.dfff38",
         "wires": [
             []
         ]
     },
     {
-        "id": "ed4d0298.cdb578",
+        "id": "1f9b767f.d670b2",
         "type": "set",
         "name": "unset tmp.aai.vpn-binding",
         "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value=\"\" />\n",
         "comments": "",
-        "x": 2087.883331298828,
-        "y": 213,
-        "z": "db287b1f.2984a8",
+        "x": 2058,
+        "y": 178,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "1ced8517.ce35e3",
+        "id": "f84de17e.e8ea08",
         "type": "set",
         "name": "set root-otn-tunnels-list array",
         "xml": "<set>\n<parameter name='`roottunsidx`' value='`$roottunsidx + 1`' />\n",
         "comments": "",
-        "x": 3629.883331298828,
-        "y": 2194,
-        "z": "db287b1f.2984a8",
+        "x": 3600,
+        "y": 2159,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "224f4283.917d26",
+        "id": "1a392cd7.238923",
         "type": "set",
         "name": "set leaf-otn-tunnels-list array",
         "xml": "<set>\n<parameter name='`leaftunsidx`' value='`$leaftunsidx + 1`' />\n",
         "comments": "",
-        "x": 4219.883331298828,
-        "y": 667,
-        "z": "db287b1f.2984a8",
+        "x": 4190,
+        "y": 632,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "b85bac18.623698",
+        "id": "611e4d54.277574",
         "type": "set",
         "name": "set ethernet-srv-end-points-list array",
         "xml": "<set>\n<parameter name='`epidx`' value='`$epidx + 1`' />\n",
         "comments": "",
-        "x": 1393.8833312988281,
-        "y": 1773,
-        "z": "db287b1f.2984a8",
+        "x": 1364,
+        "y": 1738,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "5524ecac.5cf47c",
+        "id": "dc7d7df9.afb81",
         "type": "set",
         "name": "set filename",
         "xml": "<set>\n<parameter name='filenameclleths' value=\"`$leafOrRootAccess + $tmp.aai.connectivity.access-node-id`\" />",
         "comments": "",
-        "x": 572.8833312988281,
-        "y": 1507,
-        "z": "db287b1f.2984a8",
+        "x": 543,
+        "y": 1472,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "a12bd239.f8368",
+        "id": "c70f6326.e297a",
         "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": 603.8833312988281,
-        "y": 1547,
-        "z": "db287b1f.2984a8",
+        "x": 574,
+        "y": 1512,
+        "z": "5a4cb919.dfff38",
         "wires": [
             []
         ]
     },
     {
-        "id": "c01095c8.c5a848",
+        "id": "e8fb0469.22a408",
         "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": 1151.8833312988281,
-        "y": 1955,
-        "z": "db287b1f.2984a8",
+        "x": 1122,
+        "y": 1920,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "1e0b480.37d7ab8",
+        "id": "b503b0ba.b1ff6",
         "type": "set",
         "name": "set otn-tunnels-name-list array",
         "xml": "<set>\n<parameter name='`otntunsidx`' value='`$otntunsidx + 1`' />\n",
         "comments": "",
-        "x": 1154.8833312988281,
-        "y": 1997,
-        "z": "db287b1f.2984a8",
+        "x": 1125,
+        "y": 1962,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "5d1396ed.19b6f8",
+        "id": "f7d70d92.8a17d",
         "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": 597.8833312988281,
-        "y": 1637,
-        "z": "db287b1f.2984a8",
+        "x": 568,
+        "y": 1602,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "1b4871a6.1cd8a6",
+        "id": "93ecab9f.5bb27",
         "type": "set",
         "name": "set filename",
         "xml": "<set>\n<parameter name='filenamecllotns' value=\"`leafrootOTNtunnelnames`\" />",
         "comments": "",
-        "x": 352.8833312988281,
-        "y": 2016,
-        "z": "db287b1f.2984a8",
+        "x": 323,
+        "y": 1981,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "48083140.e99758",
+        "id": "e1bf516d.80132",
         "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": 360.8833312988281,
-        "y": 2073,
-        "z": "db287b1f.2984a8",
+        "x": 331,
+        "y": 2038,
+        "z": "5a4cb919.dfff38",
         "wires": [
             []
         ]
     },
     {
-        "id": "d97c4e37.51bad8",
+        "id": "c0f4e533.035be8",
         "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": 1371.8833312988281,
-        "y": 1622,
-        "z": "db287b1f.2984a8",
+        "x": 1342,
+        "y": 1587,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "3df77641.8d727a",
-                "f024d61d.5a31c"
+                "ff9a5641.69fda",
+                "a44c9ce4.5d2008"
             ]
         ]
     },
     {
-        "id": "f024d61d.5a31c",
+        "id": "a44c9ce4.5d2008",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1594.8833312988281,
-        "y": 1577,
-        "z": "db287b1f.2984a8",
+        "x": 1565,
+        "y": 1542,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "3c67000e.e921c"
+                "eaca171f.944a48"
             ]
         ]
     },
     {
-        "id": "3df77641.8d727a",
+        "id": "ff9a5641.69fda",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1596.8833312988281,
-        "y": 1641,
-        "z": "db287b1f.2984a8",
+        "x": 1567,
+        "y": 1606,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "de64177a.8916f"
+                "93d69fa.52d496"
             ]
         ]
     },
     {
-        "id": "3c67000e.e921c",
+        "id": "eaca171f.944a48",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1759.8833312988281,
-        "y": 1574,
-        "z": "db287b1f.2984a8",
+        "x": 1730,
+        "y": 1539,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "9bea7c66.5f62c8"
+                "b0447236.92d3b"
             ]
         ]
     },
     {
-        "id": "de64177a.8916f",
+        "id": "93d69fa.52d496",
         "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": 1758.8833312988281,
-        "y": 1637,
-        "z": "db287b1f.2984a8",
+        "x": 1729,
+        "y": 1602,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "9bea7c66.5f62c8",
+        "id": "b0447236.92d3b",
         "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": 1979.8833312988281,
-        "y": 1588,
-        "z": "db287b1f.2984a8",
+        "x": 1950,
+        "y": 1553,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "7a38583b.020a88",
+        "id": "ab15b7a9.bc6bc8",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1524.8833312988281,
-        "y": 2313,
-        "z": "db287b1f.2984a8",
+        "x": 1495,
+        "y": 2278,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "c388a6bf.f87f3"
+                "be2440af.c20c98"
             ]
         ]
     },
     {
-        "id": "a2f5b878.ad169",
+        "id": "1405448e.40f263",
         "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": 1909.8833312988281,
-        "y": 2326,
-        "z": "db287b1f.2984a8",
+        "x": 1880,
+        "y": 2291,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "7866488b.2039a8",
-                "bdc692ef.1c0858",
-                "823a852f.40d29"
+                "facba133.b01618",
+                "36457cd.f85a104",
+                "a0c24437.cf174"
             ]
         ]
     },
     {
-        "id": "c388a6bf.f87f3",
+        "id": "be2440af.c20c98",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1703.8833312988281,
-        "y": 2313,
-        "z": "db287b1f.2984a8",
+        "x": 1674,
+        "y": 2278,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "5c79d6d8.a6a8e",
-                "a2f5b878.ad169"
+                "eec40e11.9fdab",
+                "1405448e.40f263"
             ]
         ]
     },
     {
-        "id": "5c79d6d8.a6a8e",
+        "id": "eec40e11.9fdab",
         "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": 1939.8833312988281,
-        "y": 2274,
-        "z": "db287b1f.2984a8",
+        "x": 1910,
+        "y": 2239,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "7866488b.2039a8",
+        "id": "facba133.b01618",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2119.883331298828,
-        "y": 2317,
-        "z": "db287b1f.2984a8",
+        "x": 2090,
+        "y": 2282,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "4da79570.cd80cc"
+                "926a046d.eed228"
             ]
         ]
     },
     {
-        "id": "bdc692ef.1c0858",
+        "id": "36457cd.f85a104",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2111.883331298828,
-        "y": 2372,
-        "z": "db287b1f.2984a8",
+        "x": 2082,
+        "y": 2337,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "5ef7fec5.5efb98"
+                "6ca22053.c9fba8"
             ]
         ]
     },
     {
-        "id": "823a852f.40d29",
+        "id": "a0c24437.cf174",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2116.883331298828,
-        "y": 2429,
-        "z": "db287b1f.2984a8",
+        "x": 2087,
+        "y": 2394,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "57488074.1d65e"
+                "f91dd017.676d7"
             ]
         ]
     },
     {
-        "id": "57488074.1d65e",
+        "id": "f91dd017.676d7",
         "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": 2268.883331298828,
-        "y": 2430,
-        "z": "db287b1f.2984a8",
+        "x": 2239,
+        "y": 2395,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "5ef7fec5.5efb98",
+        "id": "6ca22053.c9fba8",
         "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": 2279.883331298828,
-        "y": 2375,
-        "z": "db287b1f.2984a8",
+        "x": 2250,
+        "y": 2340,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "4da79570.cd80cc",
+        "id": "926a046d.eed228",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2264.265655517578,
-        "y": 2314.6556701660156,
-        "z": "db287b1f.2984a8",
+        "x": 2234.38232421875,
+        "y": 2279.6556701660156,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "69f8caaf.bba51c"
+                "1e25e04f.ee7df"
             ]
         ]
     },
     {
-        "id": "69f8caaf.bba51c",
+        "id": "1e25e04f.ee7df",
         "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": 2478.883331298828,
-        "y": 2311,
-        "z": "db287b1f.2984a8",
+        "x": 2449,
+        "y": 2276,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "53cc84ce.e1faf4",
+        "id": "46842cb8.91c5bc",
         "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": 602.8833312988281,
-        "y": 2359,
-        "z": "db287b1f.2984a8",
+        "x": 573,
+        "y": 2324,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "bb343bdc.881868",
-                "8bc84f5e.0473d8",
-                "78444b47.33ec34"
+                "80e94eed.70f82",
+                "e1101309.b00428",
+                "6cefa506.12a2dc"
             ]
         ]
     },
     {
-        "id": "bb343bdc.881868",
+        "id": "80e94eed.70f82",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 798.3834533691406,
-        "y": 2311,
-        "z": "db287b1f.2984a8",
+        "x": 768.5001220703125,
+        "y": 2276,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "bf3ecbb9.4dd008"
+                "a961cabf.5d77d8"
             ]
         ]
     },
     {
-        "id": "8bc84f5e.0473d8",
+        "id": "e1101309.b00428",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 790.3834533691406,
-        "y": 2366,
-        "z": "db287b1f.2984a8",
+        "x": 760.5001220703125,
+        "y": 2331,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "ef40b092.bc09e"
+                "cfce6a08.8d1818"
             ]
         ]
     },
     {
-        "id": "bf3ecbb9.4dd008",
+        "id": "a961cabf.5d77d8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 942.7657775878906,
-        "y": 2310.6556701660156,
-        "z": "db287b1f.2984a8",
+        "x": 912.8824462890625,
+        "y": 2275.6556701660156,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "1285266.d4ce8da"
+                "41f5578e.096c08"
             ]
         ]
     },
     {
-        "id": "1285266.d4ce8da",
+        "id": "41f5578e.096c08",
         "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": 1126.8833312988281,
-        "y": 2309,
-        "z": "db287b1f.2984a8",
+        "x": 1097,
+        "y": 2274,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "640d04c1.8428dc"
+                "78702bad.3695f4"
             ]
         ]
     },
     {
-        "id": "640d04c1.8428dc",
+        "id": "78702bad.3695f4",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1321.8833312988281,
-        "y": 2309,
-        "z": "db287b1f.2984a8",
+        "x": 1292,
+        "y": 2274,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "7a38583b.020a88"
+                "ab15b7a9.bc6bc8"
             ]
         ]
     },
     {
-        "id": "78444b47.33ec34",
+        "id": "6cefa506.12a2dc",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 795.3834533691406,
-        "y": 2423,
-        "z": "db287b1f.2984a8",
+        "x": 765.5001220703125,
+        "y": 2388,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "b417de17.8b3a6"
+                "bbb236e9.1d475"
             ]
         ]
     },
     {
-        "id": "b417de17.8b3a6",
+        "id": "bbb236e9.1d475",
         "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": 947.3834533691406,
-        "y": 2424,
-        "z": "db287b1f.2984a8",
+        "x": 917.5001220703125,
+        "y": 2389,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "ef40b092.bc09e",
+        "id": "cfce6a08.8d1818",
         "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": 958.3834533691406,
-        "y": 2367,
-        "z": "db287b1f.2984a8",
+        "x": 928.5001220703125,
+        "y": 2332,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "fc4eafc.4810e5",
+        "id": "fd11a034.71ffe8",
         "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": 592.8833312988281,
-        "y": 2271,
-        "z": "db287b1f.2984a8",
+        "x": 563,
+        "y": 2236,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "d94511cd.5d63f",
+        "id": "2ab715a0.ab46a2",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 337.8833312988281,
-        "y": 2402,
-        "z": "db287b1f.2984a8",
+        "x": 308,
+        "y": 2367,
+        "z": "5a4cb919.dfff38",
         "wires": [
             [
-                "fc4eafc.4810e5",
-                "53cc84ce.e1faf4"
+                "fd11a034.71ffe8",
+                "46842cb8.91c5bc"
             ]
         ]
     },
     {
-        "id": "1a955b8d.047dd4",
+        "id": "c68339b5.636678",
         "type": "comment",
         "name": "Temporary skipping this check - to support multiple instances in one slice",
         "info": "",
         "comments": "",
-        "x": 1552.8500061035156,
-        "y": 219.88333129882812,
-        "z": "db287b1f.2984a8",
+        "x": 1522.9666748046875,
+        "y": 184.88333129882812,
+        "z": "5a4cb919.dfff38",
         "wires": []
     },
     {
-        "id": "9a0e1ef7.428b9",
+        "id": "6b1a691d.f6617",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 754.8833312988281,
-        "y": 442,
-        "z": "db287b1f.2984a8",
+        "x": 725,
+        "y": 407,
+        "z": "5a4cb919.dfff38",
         "wires": []
+    },
+    {
+        "id": "a46faf22.6dbda8",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 284.5,
+        "y": 1376,
+        "z": "5a4cb919.dfff38",
+        "wires": [
+            [
+                "64de189c.ea0ca",
+                "eda2f0f7.d8fb38",
+                "dc7d7df9.afb81",
+                "c70f6326.e297a",
+                "445d8bb1.6c470c",
+                "925823e9.1c4a4",
+                "f7d70d92.8a17d",
+                "93ecab9f.5bb27",
+                "e1bf516d.80132",
+                "2ab715a0.ab46a2"
+            ]
+        ]
+    },
+    {
+        "id": "ee82569c.a25768",
+        "type": "switchNode",
+        "name": "switch uni type",
+        "xml": "<switch test=\"`$tmp.aai.uni.type`\">\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1315,
+        "y": 1214,
+        "z": "5a4cb919.dfff38",
+        "wires": [
+            [
+                "ef11d348.e67b18",
+                "db4eac49.9ee78",
+                "ccd7386e.438c4",
+                "8a1e26c1.925918"
+            ]
+        ]
+    },
+    {
+        "id": "ef11d348.e67b18",
+        "type": "outcome",
+        "name": "leaf",
+        "xml": "<outcome value='leaf'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1480,
+        "y": 1196,
+        "z": "5a4cb919.dfff38",
+        "wires": [
+            [
+                "1989ebd9.8b76bc",
+                "9d25e547.75567"
+            ]
+        ]
+    },
+    {
+        "id": "db4eac49.9ee78",
+        "type": "outcome",
+        "name": "root",
+        "xml": "<outcome value='root'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1483,
+        "y": 1235,
+        "z": "5a4cb919.dfff38",
+        "wires": [
+            [
+                "9da50ff.0241af",
+                "52a255e0.e77dec"
+            ]
+        ]
+    },
+    {
+        "id": "8a1e26c1.925918",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1477,
+        "y": 1313,
+        "z": "5a4cb919.dfff38",
+        "wires": [
+            [
+                "af3eb285.34bda8"
+            ]
+        ]
+    },
+    {
+        "id": "ccd7386e.438c4",
+        "type": "outcome",
+        "name": "root-secondary",
+        "xml": "<outcome value='root-secondary'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1500,
+        "y": 1276,
+        "z": "5a4cb919.dfff38",
+        "wires": [
+            [
+                "8dd3ee03.704618",
+                "3acf3b0f.3b0184"
+            ]
+        ]
+    },
+    {
+        "id": "8dd3ee03.704618",
+        "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": 2046,
+        "y": 1309,
+        "z": "5a4cb919.dfff38",
+        "wires": []
+    },
+    {
+        "id": "3acf3b0f.3b0184",
+        "type": "set",
+        "name": "set leafOrRootAccess",
+        "xml": "<set>\n<parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:root-secondary' />\n",
+        "comments": "",
+        "x": 2008,
+        "y": 1349,
+        "z": "5a4cb919.dfff38",
+        "wires": []
+    },
+    {
+        "id": "af3eb285.34bda8",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1629,
+        "y": 1334,
+        "z": "5a4cb919.dfff38",
+        "wires": [
+            []
+        ]
     }
 ]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1.json b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1.json
index 891b0ab1..459577cb 100644
--- a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1.json
+++ b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "66573054.d6959",
+        "id": "2b7da8b.17ed9d8",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 230,
-        "y": 62,
-        "z": "4fb14ce0.40eb24",
+        "x": 248,
+        "y": 45,
+        "z": "ab59e982.86c81",
         "wires": [
             [
-                "88fd1149.f833f"
+                "970691bb.ddc15"
             ]
         ]
     },
     {
-        "id": "88fd1149.f833f",
+        "id": "970691bb.ddc15",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,1569 +22,3074 @@
         "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": 514.2856903076172,
-        "y": 123.23810863494873,
-        "z": "4fb14ce0.40eb24",
+        "x": 532.2856903076172,
+        "y": 106.23810863494873,
+        "z": "ab59e982.86c81",
         "wires": [
             [
-                "4c164ab.c48bfb4"
+                "60aef583.9235ac"
             ]
         ]
     },
     {
-        "id": "4c164ab.c48bfb4",
+        "id": "60aef583.9235ac",
         "type": "method",
         "name": "method cll-vnf-topology-operation-cll-F1",
         "xml": "<method rpc='cll-vnf-topology-operation-cll-F1' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 430.4285888671875,
-        "y": 201.00003051757812,
-        "z": "4fb14ce0.40eb24",
+        "x": 448.4285888671875,
+        "y": 184.00003051757812,
+        "z": "ab59e982.86c81",
         "wires": [
             [
-                "e2c1e393.f72a2"
+                "aea204d6.6a791"
             ]
         ]
     },
     {
-        "id": "e2c1e393.f72a2",
+        "id": "aea204d6.6a791",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 164.238037109375,
-        "y": 704.6666870117188,
-        "z": "4fb14ce0.40eb24",
+        "x": 182.238037109375,
+        "y": 687.6666870117188,
+        "z": "ab59e982.86c81",
         "wires": [
             [
-                "35872244.0dadfe",
-                "76353aba.1a1834",
-                "1a3db60a.42601a",
-                "cde65043.1c4f8",
-                "5f4f339e.018654",
-                "6f21b0a4.c1ba8",
-                "19956ea.f245091"
+                "8d663f65.8f74e8",
+                "8c3bad0a.2ae1e",
+                "7334fea3.c843f",
+                "322c901e.38e458",
+                "363053e.3c7802c",
+                "6a3e2f90.eef6e",
+                "65e8fb60.0959f4",
+                "af2be5de.84caa8"
             ]
         ]
     },
     {
-        "id": "35872244.0dadfe",
+        "id": "8d663f65.8f74e8",
         "type": "set",
         "name": "set query_param",
         "xml": "<set>\n<parameter name='prop.ethsrvType' value='`$network-route-A`' />\n\n",
         "comments": "",
-        "x": 437,
-        "y": 659,
-        "z": "4fb14ce0.40eb24",
+        "x": 455,
+        "y": 642,
+        "z": "ab59e982.86c81",
         "wires": []
     },
     {
-        "id": "76353aba.1a1834",
+        "id": "8c3bad0a.2ae1e",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof' mode='sync' >\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 658,
-        "y": 727,
-        "z": "4fb14ce0.40eb24",
+        "x": 676,
+        "y": 710,
+        "z": "ab59e982.86c81",
         "wires": [
             []
         ]
     },
     {
-        "id": "1a3db60a.42601a",
+        "id": "7334fea3.c843f",
         "type": "execute",
         "name": "execute printContext",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n    <parameter name=\"filename\" value=\"`$filenamemm`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 448,
-        "y": 773,
-        "z": "4fb14ce0.40eb24",
+        "x": 466,
+        "y": 756,
+        "z": "ab59e982.86c81",
         "wires": [
             []
         ]
     },
     {
-        "id": "19956ea.f245091",
+        "id": "6a3e2f90.eef6e",
         "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": 641,
-        "y": 837,
-        "z": "4fb14ce0.40eb24",
+        "x": 659,
+        "y": 820,
+        "z": "ab59e982.86c81",
         "wires": [
             []
         ]
     },
     {
-        "id": "cde65043.1c4f8",
+        "id": "65e8fb60.0959f4",
         "type": "for",
         "name": "for vidx..tmp.otninfo_length[]",
         "xml": "<for index='otnidx' start='0' end='`$tmp.otninfo_length`' >",
         "comments": "",
         "outputs": 1,
-        "x": 468,
-        "y": 993,
-        "z": "4fb14ce0.40eb24",
+        "x": 751,
+        "y": 1199,
+        "z": "ab59e982.86c81",
         "wires": [
             [
-                "53111f1b.5dbab"
+                "c2ebc420.8ee88"
             ]
         ]
     },
     {
-        "id": "53111f1b.5dbab",
+        "id": "c2ebc420.8ee88",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 737,
-        "y": 993,
-        "z": "4fb14ce0.40eb24",
+        "x": 972.9999694824219,
+        "y": 1211,
+        "z": "ab59e982.86c81",
         "wires": [
             [
-                "78857b79.cfe234",
-                "b3432980.49ee6",
-                "233e999f.144d9e",
-                "7a85fbed.abf844",
-                "715b7a53.d039d4",
-                "13d7f319.f10ffd",
-                "fe43d4e7.2e266",
-                "9673bbc9.e232d8",
-                "8c1ff0ec.d0238",
-                "84f3d24d.36c17"
+                "2cc97555.3fad02",
+                "78caef7b.ab95f8",
+                "9c05f571.1eb168",
+                "eda8e4ad.92ee8",
+                "a27c8181.cf517",
+                "e500131.d3db37",
+                "b4245913.ae7bb",
+                "ac5e1496.5bc93",
+                "6299b58a.3a41b4",
+                "6cd61101.45105"
             ]
         ]
     },
     {
-        "id": "78857b79.cfe234",
+        "id": "2cc97555.3fad02",
         "type": "execute",
         "name": "execute UUID generator for vpn-binding $otnidx",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.vpn-binding-otnidx-uuid\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1630,
-        "y": 807,
-        "z": "4fb14ce0.40eb24",
+        "x": 1648,
+        "y": 790,
+        "z": "ab59e982.86c81",
         "wires": [
             []
         ]
     },
     {
-        "id": "b3432980.49ee6",
+        "id": "78caef7b.ab95f8",
         "type": "switchNode",
         "name": "switch dstPort == NULL",
         "xml": "<switch test=\"`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id == ''`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1344,
-        "y": 897,
-        "z": "4fb14ce0.40eb24",
+        "x": 1362,
+        "y": 880,
+        "z": "ab59e982.86c81",
         "wires": [
             [
-                "fb6a4667.5dee4",
-                "8968ad13.112c48"
+                "b4cf3f6b.7b5288",
+                "f7c5eac6.57b338"
             ]
         ]
     },
     {
-        "id": "fb6a4667.5dee4",
+        "id": "b4cf3f6b.7b5288",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1710,
-        "y": 858,
-        "z": "4fb14ce0.40eb24",
+        "x": 1728,
+        "y": 841,
+        "z": "ab59e982.86c81",
         "wires": [
             [
-                "38cd80d0.a81b08"
+                "7ef1427a.0fd4ac"
             ]
         ]
     },
     {
-        "id": "8968ad13.112c48",
+        "id": "f7c5eac6.57b338",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1711,
-        "y": 904,
-        "z": "4fb14ce0.40eb24",
+        "x": 1729,
+        "y": 887,
+        "z": "ab59e982.86c81",
         "wires": [
             [
-                "12ac055c.676cf3"
+                "26ca350f.1d9a8a"
             ]
         ]
     },
     {
-        "id": "38cd80d0.a81b08",
+        "id": "7ef1427a.0fd4ac",
         "type": "set",
         "name": "set access-provider-id and client-id",
         "xml": "<set>\n<parameter name='tmp.access-provider-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-provider-id`' />\n<parameter name='tmp.access-client-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-client-id`' />\n<parameter name='tmp.access-topology-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-topology-id`' />\n<parameter name='tmp.srcdstpnf-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />\n",
         "comments": "",
-        "x": 1924,
-        "y": 857,
-        "z": "4fb14ce0.40eb24",
+        "x": 1942,
+        "y": 840,
+        "z": "ab59e982.86c81",
         "wires": []
     },
     {
-        "id": "12ac055c.676cf3",
+        "id": "26ca350f.1d9a8a",
         "type": "set",
         "name": "set access-provider-id and client-id",
         "xml": "<set>\n<parameter name='tmp.access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />\n<parameter name='tmp.access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />\n<parameter name='tmp.access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />\n<parameter name='tmp.srcdstpnf-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />\n",
         "comments": "",
-        "x": 1922,
-        "y": 902,
-        "z": "4fb14ce0.40eb24",
+        "x": 1940,
+        "y": 885,
+        "z": "ab59e982.86c81",
         "wires": []
     },
     {
-        "id": "233e999f.144d9e",
+        "id": "9c05f571.1eb168",
         "type": "set",
         "name": "set srcdstpnf-name",
         "xml": "<set>\n<parameter name='tmp.srcdstpnf-name' value=\"`'networkId-providerId-' + \n                                             $tmp.access-provider-id + '-clientId-' +\n                                             $tmp.access-client-id + '-topologyId-' + \n                                             $tmp.access-topology-id + '-nodeId-' + \n                                             $tmp.srcdstpnf-id`\" />\n\n",
         "comments": "",
-        "x": 1520,
-        "y": 971,
-        "z": "4fb14ce0.40eb24",
+        "x": 1538,
+        "y": 954,
+        "z": "ab59e982.86c81",
         "wires": []
     },
     {
-        "id": "7a85fbed.abf844",
+        "id": "eda8e4ad.92ee8",
         "type": "get-resource",
         "name": "get-resource tmp.srcdstpnf-name",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.srcdstpnf-name\"\n        pfx='tmp.aai.srcdst-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 1564,
-        "y": 1019,
-        "z": "4fb14ce0.40eb24",
+        "x": 1582,
+        "y": 1002,
+        "z": "ab59e982.86c81",
         "wires": [
             [
-                "85cf2b2f.efe2d8",
-                "40c18c0.1c43574",
-                "e3b12e57.7afb78"
+                "79ecfb4e.255ea4",
+                "441f51df.f58208",
+                "204f27c3.a07c18"
             ]
         ]
     },
     {
-        "id": "85cf2b2f.efe2d8",
+        "id": "79ecfb4e.255ea4",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1776.5,
-        "y": 966,
-        "z": "4fb14ce0.40eb24",
+        "x": 1794.5,
+        "y": 949,
+        "z": "ab59e982.86c81",
         "wires": [
             [
-                "7b23fddb.009994"
+                "eac32b1e.ec64f"
             ]
         ]
     },
     {
-        "id": "40c18c0.1c43574",
+        "id": "441f51df.f58208",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1788.5,
-        "y": 1016,
-        "z": "4fb14ce0.40eb24",
+        "x": 1806.5,
+        "y": 999,
+        "z": "ab59e982.86c81",
         "wires": [
             [
-                "317c3552.8ea652"
+                "4a1b3b6f.aa547c"
             ]
         ]
     },
     {
-        "id": "e3b12e57.7afb78",
+        "id": "204f27c3.a07c18",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1779.5,
-        "y": 1071,
-        "z": "4fb14ce0.40eb24",
+        "x": 1797.5,
+        "y": 1054,
+        "z": "ab59e982.86c81",
         "wires": [
             [
-                "c0e357e5.8168d8"
+                "afa61155.e3e4f"
             ]
         ]
     },
     {
-        "id": "c0e357e5.8168d8",
+        "id": "afa61155.e3e4f",
         "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": 1924.5,
-        "y": 1070,
-        "z": "4fb14ce0.40eb24",
+        "x": 1942.5,
+        "y": 1053,
+        "z": "ab59e982.86c81",
         "wires": []
     },
     {
-        "id": "317c3552.8ea652",
+        "id": "4a1b3b6f.aa547c",
         "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": 1935.5,
-        "y": 1013,
-        "z": "4fb14ce0.40eb24",
+        "x": 1953.5,
+        "y": 996,
+        "z": "ab59e982.86c81",
         "wires": []
     },
     {
-        "id": "7b23fddb.009994",
+        "id": "eac32b1e.ec64f",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1901.8824462890625,
-        "y": 959.6556701660156,
-        "z": "4fb14ce0.40eb24",
+        "x": 1919.8824462890625,
+        "y": 942.6556701660156,
+        "z": "ab59e982.86c81",
         "wires": [
             [
-                "f3d54fb4.5c0a1"
+                "3c0a3138.bdd26e"
             ]
         ]
     },
     {
-        "id": "f3d54fb4.5c0a1",
+        "id": "3c0a3138.bdd26e",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.srcdst-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2063,
-        "y": 974,
-        "z": "4fb14ce0.40eb24",
+        "x": 2081,
+        "y": 957,
+        "z": "ab59e982.86c81",
         "wires": [
             [
-                "763118b6.61e2b8"
+                "e187685d.0e36b8"
             ]
         ]
     },
     {
-        "id": "763118b6.61e2b8",
+        "id": "e187685d.0e36b8",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.srcdst-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2258,
-        "y": 974,
-        "z": "4fb14ce0.40eb24",
+        "x": 2276,
+        "y": 957,
+        "z": "ab59e982.86c81",
         "wires": [
             [
-                "45a9ec7c.a92c4c"
+                "124aeba.98fab14"
             ]
         ]
     },
     {
-        "id": "6fd0244b.f38ce4",
+        "id": "48b536ea.5f9248",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2638,
-        "y": 970,
-        "z": "4fb14ce0.40eb24",
+        "x": 2656,
+        "y": 953,
+        "z": "ab59e982.86c81",
         "wires": [
             [
-                "e527c2f.df2fcc",
-                "56d60802.89ee28"
+                "c8495fb1.c63f38",
+                "9a0b489a.f82b3"
             ]
         ]
     },
     {
-        "id": "56d60802.89ee28",
+        "id": "9a0b489a.f82b3",
         "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": 2846,
-        "y": 977,
-        "z": "4fb14ce0.40eb24",
+        "x": 2864,
+        "y": 960,
+        "z": "ab59e982.86c81",
         "wires": [
             [
-                "b854345d.faf84",
-                "437ea2b.b00f35c",
-                "fed3318a.a11e3"
+                "ff325fba.81a3f",
+                "5e11cb23.ea8384",
+                "435ef02b.e0a51"
             ]
         ]
     },
     {
-        "id": "e527c2f.df2fcc",
+        "id": "c8495fb1.c63f38",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domainG id",
         "xml": "<set>\n<parameter name='tmp.domainG.esr-thirdparty-id' value=\"`$tmp.aai.srcdst-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 2876,
-        "y": 925,
-        "z": "4fb14ce0.40eb24",
+        "x": 2894,
+        "y": 908,
+        "z": "ab59e982.86c81",
         "wires": []
     },
     {
-        "id": "b854345d.faf84",
+        "id": "ff325fba.81a3f",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3056,
-        "y": 968,
-        "z": "4fb14ce0.40eb24",
+        "x": 3074,
+        "y": 951,
+        "z": "ab59e982.86c81",
         "wires": [
             [
-                "918d39ea.cf7f2"
+                "3437139a.bfdd9c"
             ]
         ]
     },
     {
-        "id": "437ea2b.b00f35c",
+        "id": "5e11cb23.ea8384",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3048,
-        "y": 1023,
-        "z": "4fb14ce0.40eb24",
+        "x": 3066,
+        "y": 1006,
+        "z": "ab59e982.86c81",
         "wires": [
             [
-                "1afabba1.4179cc"
+                "db1340d4.287d2"
             ]
         ]
     },
     {
-        "id": "fed3318a.a11e3",
+        "id": "435ef02b.e0a51",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3053,
-        "y": 1080,
-        "z": "4fb14ce0.40eb24",
+        "x": 3071,
+        "y": 1063,
+        "z": "ab59e982.86c81",
         "wires": [
             [
-                "e095e0e5.375ba"
+                "c8c2b440.36c658"
             ]
         ]
     },
     {
-        "id": "e095e0e5.375ba",
+        "id": "c8c2b440.36c658",
         "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": 3205,
-        "y": 1081,
-        "z": "4fb14ce0.40eb24",
+        "x": 3223,
+        "y": 1064,
+        "z": "ab59e982.86c81",
         "wires": []
     },
     {
-        "id": "1afabba1.4179cc",
+        "id": "db1340d4.287d2",
         "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": 3216,
-        "y": 1026,
-        "z": "4fb14ce0.40eb24",
+        "x": 3234,
+        "y": 1009,
+        "z": "ab59e982.86c81",
         "wires": []
     },
     {
-        "id": "918d39ea.cf7f2",
+        "id": "3437139a.bfdd9c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3200.38232421875,
-        "y": 965.6556701660156,
-        "z": "4fb14ce0.40eb24",
+        "x": 3218.38232421875,
+        "y": 948.6556701660156,
+        "z": "ab59e982.86c81",
         "wires": [
             [
-                "47a021ef.066c88"
+                "e7684b.19d5f7b8"
             ]
         ]
     },
     {
-        "id": "45a9ec7c.a92c4c",
+        "id": "124aeba.98fab14",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2461,
-        "y": 978,
-        "z": "4fb14ce0.40eb24",
+        "x": 2479,
+        "y": 961,
+        "z": "ab59e982.86c81",
         "wires": [
             [
-                "6fd0244b.f38ce4"
+                "48b536ea.5f9248"
             ]
         ]
     },
     {
-        "id": "47a021ef.066c88",
+        "id": "e7684b.19d5f7b8",
         "type": "set",
         "name": "set controller domainA data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.url' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.user' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.password' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
         "comments": "",
-        "x": 3415,
-        "y": 962,
-        "z": "4fb14ce0.40eb24",
+        "x": 3433,
+        "y": 945,
+        "z": "ab59e982.86c81",
         "wires": []
     },
     {
-        "id": "715b7a53.d039d4",
+        "id": "a27c8181.cf517",
         "type": "switchNode",
         "name": "switch dmnsidx == 0 (domainA)",
         "xml": "<switch test='`$otnidx == 0`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1534,
-        "y": 1188,
-        "z": "4fb14ce0.40eb24",
+        "x": 1552,
+        "y": 1171,
+        "z": "ab59e982.86c81",
         "wires": [
             [
-                "f53c2621.eb9438",
-                "1c719c21.ec9b04"
+                "55f451b.c21bcb",
+                "148790b5.591b8f"
             ]
         ]
     },
     {
-        "id": "f53c2621.eb9438",
+        "id": "55f451b.c21bcb",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1735,
-        "y": 1186,
-        "z": "4fb14ce0.40eb24",
+        "x": 1753,
+        "y": 1169,
+        "z": "ab59e982.86c81",
         "wires": [
             [
-                "39a7b2e1.a50fbe"
+                "190bbee0.fdc3a1"
             ]
         ]
     },
     {
-        "id": "b0d2a923.51103",
+        "id": "a4ef5898.fcc6d8",
         "type": "set",
         "name": "set pce-src-node",
         "xml": "<set>\n<parameter name='tmp.pce-src-node' value='`$tmp.srcdstpnf-name`' />",
         "comments": "",
-        "x": 2016,
-        "y": 1136,
-        "z": "4fb14ce0.40eb24",
+        "x": 2034,
+        "y": 1119,
+        "z": "ab59e982.86c81",
         "wires": []
     },
     {
-        "id": "c9652673.c83de8",
+        "id": "82a35f7.532ff2",
         "type": "switchNode",
         "name": "switch dmnsidx == last (domainB)",
         "xml": "<switch test='`$otnidx == $tmp.otninfo_length - 1`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1952,
-        "y": 1237,
-        "z": "4fb14ce0.40eb24",
+        "x": 1970,
+        "y": 1220,
+        "z": "ab59e982.86c81",
         "wires": [
             [
-                "ab876b76.0d0a8",
-                "2a964a93.a3cb96"
+                "151d6bac.6b36ac",
+                "e7ce23ad.f63438"
             ]
         ]
     },
     {
-        "id": "ab876b76.0d0a8",
+        "id": "151d6bac.6b36ac",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2182,
-        "y": 1233,
-        "z": "4fb14ce0.40eb24",
+        "x": 2200,
+        "y": 1216,
+        "z": "ab59e982.86c81",
         "wires": [
             [
-                "62dd94dd.71b75c"
+                "1bd30175.73854f"
             ]
         ]
     },
     {
-        "id": "1c719c21.ec9b04",
+        "id": "148790b5.591b8f",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1735,
-        "y": 1235,
-        "z": "4fb14ce0.40eb24",
+        "x": 1753,
+        "y": 1218,
+        "z": "ab59e982.86c81",
         "wires": [
             [
-                "c9652673.c83de8"
+                "82a35f7.532ff2"
             ]
         ]
     },
     {
-        "id": "2a964a93.a3cb96",
+        "id": "e7ce23ad.f63438",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2183,
-        "y": 1279,
-        "z": "4fb14ce0.40eb24",
+        "x": 2201,
+        "y": 1262,
+        "z": "ab59e982.86c81",
         "wires": [
             [
-                "1f38645a.fd2454"
+                "3d6b9433.a347bc"
             ]
         ]
     },
     {
-        "id": "1f38645a.fd2454",
+        "id": "3d6b9433.a347bc",
         "type": "set",
         "name": "set attachment_param domain G",
         "xml": "<set>\n<parameter name='tmp.domainG-src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />\n<parameter name='tmp.domainG-dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />",
         "comments": "",
-        "x": 2397,
-        "y": 1279,
-        "z": "4fb14ce0.40eb24",
+        "x": 2415,
+        "y": 1262,
+        "z": "ab59e982.86c81",
         "wires": []
     },
     {
-        "id": "ada84f30.11bba8",
+        "id": "308a9211.a77236",
         "type": "set",
         "name": "set attachment_param domain A",
         "xml": "<set>\n<parameter name='tmp.domainG-src-access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='tmp.domainG-dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />",
         "comments": "",
-        "x": 2071,
-        "y": 1183,
-        "z": "4fb14ce0.40eb24",
+        "x": 2089,
+        "y": 1166,
+        "z": "ab59e982.86c81",
         "wires": []
     },
     {
-        "id": "39a7b2e1.a50fbe",
+        "id": "190bbee0.fdc3a1",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1859,
-        "y": 1177,
-        "z": "4fb14ce0.40eb24",
+        "x": 1877,
+        "y": 1160,
+        "z": "ab59e982.86c81",
         "wires": [
             [
-                "ada84f30.11bba8"
+                "308a9211.a77236"
             ]
         ]
     },
     {
-        "id": "62dd94dd.71b75c",
+        "id": "1bd30175.73854f",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2315,
-        "y": 1209,
-        "z": "4fb14ce0.40eb24",
+        "x": 2333,
+        "y": 1192,
+        "z": "ab59e982.86c81",
         "wires": [
             [
-                "c86a8489.80e7c"
+                "9e7d0c9c.28922"
             ]
         ]
     },
     {
-        "id": "dce0c80a.efad",
+        "id": "9261980e.04515",
         "type": "set",
         "name": "set pce-src-node",
         "xml": "<set>\n<parameter name='tmp.pce-dst-node' value='`$tmp.srcdstpnf-name`' />",
         "comments": "",
-        "x": 2471,
-        "y": 1225,
-        "z": "4fb14ce0.40eb24",
+        "x": 2489,
+        "y": 1208,
+        "z": "ab59e982.86c81",
         "wires": []
     },
     {
-        "id": "c86a8489.80e7c",
+        "id": "9e7d0c9c.28922",
         "type": "set",
         "name": "set attachment_param domain B",
         "xml": "<set>\n<parameter name='tmp.domainG-src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />\n<parameter name='tmp.domainG-dst-access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />",
         "comments": "",
-        "x": 2519,
-        "y": 1177,
-        "z": "4fb14ce0.40eb24",
+        "x": 2537,
+        "y": 1160,
+        "z": "ab59e982.86c81",
         "wires": []
     },
     {
-        "id": "6f21b0a4.c1ba8",
+        "id": "363053e.3c7802c",
         "type": "set",
         "name": "unset parameters",
         "xml": "<set>\n<parameter name='domain-A.tunnel-tp-id' value='' />\n<parameter name='domain-A.node-id' value='' />\n<parameter name='domain-A.network-id' value=\"\" />\n<parameter name='domain-A.provider-id' value=\"\" />\n<parameter name='domain-A.client-id' value=\"\" />\n<parameter name='domain-A.te-topo-id' value=\"\" />\n<parameter name='domain-A.network-type' value=\"\" />\n<parameter name='domain-A.ltpId' value=\"\" />\n<parameter name='tmp.domain-A.network-id' value=\"\" />\n<parameter name='tmp.domain-A.ttp-id' value=\"\" />\n<parameter name='network-route-A' value=\"\" />\n<!--<parameter name='domain-A.' value=\"\" />-->\n\n<parameter name='request-id' value='' />\n<parameter name='otn-source-node' value='' />\n<parameter name='otn-dest-node' value='' />\n<parameter name='bw-odu' value=\"\" />\n<parameter name='src-ttp-id' value='' />\n<parameter name='dst-ttp-id' value='' />\n\n<parameter name='domain-B.tunnel-tp-id' value='' />\n<parameter name='domain-B.node-id' value='' />\n<parameter name='domain-B.network-id' value=\"\" />\n<parameter name='domain-B.provider-id' value=\"\" />\n<parameter name='domain-B.client-id' value=\"\" />\n<parameter name='domain-B.te-topo-id' value=\"\" />\n<parameter name='domain-B.network-type' value=\"\" />\n<parameter name='domain-B.ltpId' value=\"\" />\n<parameter name='tmp.domain-B.network-id' value=\"\" />\n<parameter name='tmp.domain-B.ttp-id' value=\"\" />\n<parameter name='network-route-B' value=\"\" />\n<!--<parameter name='domain-B.' value=\"\" />-->\n\n\n\n\n\n",
         "comments": "",
-        "x": 404,
-        "y": 2903,
-        "z": "4fb14ce0.40eb24",
+        "x": 423.99993896484375,
+        "y": 3813.000244140625,
+        "z": "ab59e982.86c81",
         "wires": []
     },
     {
-        "id": "5f4f339e.018654",
+        "id": "322c901e.38e458",
         "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": 445,
-        "y": 915,
-        "z": "4fb14ce0.40eb24",
+        "x": 463,
+        "y": 898,
+        "z": "ab59e982.86c81",
         "wires": []
     },
     {
-        "id": "13d7f319.f10ffd",
+        "id": "e500131.d3db37",
         "type": "set",
         "name": "set srcTtp+dstTtp pair",
         "xml": "<set>\n<parameter name='tmp.srcTtpdstTtpPair' value=\"`$tmp.otninfo[$otnidx].srcPort.src-tunnel-tp-id + ',' +\n                                               $tmp.otninfo[$otnidx].dstPort.dst-tunnel-tp-id`\" />\n\n\n",
         "comments": "",
-        "x": 1510,
-        "y": 1268,
-        "z": "4fb14ce0.40eb24",
+        "x": 1528,
+        "y": 1251,
+        "z": "ab59e982.86c81",
         "wires": []
     },
     {
-        "id": "9673bbc9.e232d8",
+        "id": "ac5e1496.5bc93",
         "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": 1703,
-        "y": 1365,
-        "z": "4fb14ce0.40eb24",
+        "x": 1719.9999694824219,
+        "y": 1349,
+        "z": "ab59e982.86c81",
         "wires": [
             []
         ]
     },
     {
-        "id": "fe43d4e7.2e266",
+        "id": "b4245913.ae7bb",
         "type": "set",
         "name": "set current-provider-id and current-cvlan-id",
         "xml": "<set>\n<parameter name='tmp.current-provider-id' value='`$tmp.access-provider-id`' />\n<parameter name='tmp.current-cvlan-id' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n\n",
         "comments": "",
-        "x": 1574,
-        "y": 1319,
-        "z": "4fb14ce0.40eb24",
+        "x": 1592,
+        "y": 1302,
+        "z": "ab59e982.86c81",
         "wires": []
     },
     {
-        "id": "8c1ff0ec.d0238",
+        "id": "6299b58a.3a41b4",
         "type": "switchNode",
         "name": "switch found-connectivity?",
         "xml": "\n<switch test=\"`$found-connectivity`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1383,
-        "y": 1520,
-        "z": "4fb14ce0.40eb24",
+        "x": 1401,
+        "y": 1503,
+        "z": "ab59e982.86c81",
         "wires": [
             [
-                "43f2090.27bb178",
-                "78a0670.cf2d998"
+                "2ae1d3e2.c44d5c",
+                "7342444f.5f3ea4"
             ]
         ]
     },
     {
-        "id": "43f2090.27bb178",
+        "id": "2ae1d3e2.c44d5c",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1669,
-        "y": 2339,
-        "z": "4fb14ce0.40eb24",
+        "x": 1687,
+        "y": 2322,
+        "z": "ab59e982.86c81",
         "wires": [
             [
-                "c80f5b2c.e8799"
+                "27e9b59e.2795c2"
             ]
         ]
     },
     {
-        "id": "340621d.c4a9c5e",
+        "id": "8ba690d8.c6505",
         "type": "comment",
         "name": "call string.contains to check if the cache has srcTtpdstTtpPair",
         "info": "if it had: then no new otn/vpn-binding is needed\n           ==> find the otn. ==>look into the relationships of this connectivity and find the one that has same srcTtp and dstTtp\n           ==> increase the bw\nif not, create a new vpn-binding, attach this vpn-binding into the founded connectivity, and attach it to the middle-man-conn as well.",
         "comments": "",
-        "x": 2095,
-        "y": 2284,
-        "z": "4fb14ce0.40eb24",
+        "x": 2113,
+        "y": 2267,
+        "z": "ab59e982.86c81",
         "wires": []
     },
     {
-        "id": "b5382f7e.2bd898",
+        "id": "6f1cf403.6bf7dc",
         "type": "comment",
-        "name": "create a new connectivity",
+        "name": "create a new connectivity - (for dummy connectivity)",
         "info": "(this should not be for LEAF side or ROOT side, otherwise error)\n\ncreate a new vpn-binding (done here)\ncreate a new connectivity (done below)\nadd srcTtpdstTtpPair into the cache in this connectivity\nattach the vpn-binding into the connectivity relationship\nattach this connectivity into the middle man\nattach this connectivity into the service-instance",
         "comments": "",
-        "x": 1906,
-        "y": 1496,
-        "z": "4fb14ce0.40eb24",
+        "x": 1979.9999694824219,
+        "y": 1465,
+        "z": "ab59e982.86c81",
         "wires": []
     },
     {
-        "id": "be6ceee2.825c9",
+        "id": "570cc158.1e1d08",
         "type": "save",
         "name": "save vpn-binding otnIdx resource (aka. OTN) in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid' >\n<parameter name='vpn-id' value='`$prop.vpn-binding-otnidx-uuid`' />\n<parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />\n<!--<parameter name='customer-vpn-id' value='`($idx + 1) * 10`' />-->\n<!--<parameter name='customer-vpn-id' value='`($maxtpn + $gfp)`' />-->\n<parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />\n<!--<parameter name='access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->\n<parameter name='access-provider-id' value='`$tmp.access-provider-id`' />\n<!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->\n<parameter name='access-client-id' value='`$tmp.access-client-id`' />\n<!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->\n<parameter name='access-topology-id' value='`$tmp.access-topology-id`' />\n<!--<parameter name='src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->\n<parameter name='src-access-node-id' value='`$tmp.domainG-src-access-node-id`' />\n<parameter name='src-access-ltp-id' value='`$tmp.otninfo[$otnidx].srcPort.src-tunnel-tp-id`' />\n<!--<parameter name='dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />-->\n<parameter name='dst-access-node-id' value='`$tmp.domainG-dst-access-node-id`' />\n<parameter name='dst-access-ltp-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-tunnel-tp-id`' />\n<parameter name='route-distinguisher' value='`$gfp`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n\n\n<parameter name='vpn-region' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.url`' />\n<parameter name='vpn-description' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.user`' />\n<parameter name='vpn-platform' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.password`' />\n\n<!-- The following line is in lieu of vpn-binding.slice-id (new attribute in latest AAI) -->\n<!--<parameter name='ops-note' value='`$tmp.aai.service-instance.service-instance-id`' />-->\n<parameter name='slice-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='ops-note' value='`$tmp.srcTtpOtnLayer`' />\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2009,
-        "y": 1532,
-        "z": "4fb14ce0.40eb24",
+        "x": 2027,
+        "y": 1515,
+        "z": "ab59e982.86c81",
         "wires": [
             [
-                "cf21392c.4841d8"
+                "e9e323ca.2e498"
             ]
         ]
     },
     {
-        "id": "cf21392c.4841d8",
+        "id": "e9e323ca.2e498",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2297,
-        "y": 1533,
-        "z": "4fb14ce0.40eb24",
+        "x": 2315,
+        "y": 1516,
+        "z": "ab59e982.86c81",
         "wires": [
             [
-                "7f292268.acccbc"
+                "f5fef51a.3d04f8"
             ]
         ]
     },
     {
-        "id": "7f292268.acccbc",
+        "id": "f5fef51a.3d04f8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2480.5,
-        "y": 1531.25390625,
-        "z": "4fb14ce0.40eb24",
+        "x": 2498.5,
+        "y": 1514.25390625,
+        "z": "ab59e982.86c81",
         "wires": [
             []
         ]
     },
     {
-        "id": "16c5a50f.2f8633",
+        "id": "12f528da.eadc7f",
         "type": "execute",
         "name": "execute string.contains srcTtpdstTtpPair",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' >\n<parameter name=\"source\" value='`$tmp.the-connectivity.coupling-flag`'/>\n<parameter name=\"target\" value=\"`$tmp.srcTtpdstTtpPair`\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2083,
-        "y": 2336,
-        "z": "4fb14ce0.40eb24",
+        "x": 2101,
+        "y": 2319,
+        "z": "ab59e982.86c81",
         "wires": [
             [
-                "452b77d1.b4f2a8",
-                "b1806606.25c148"
+                "8dd1e788.b5dd4",
+                "6a3cb15d.6fc0f8"
             ]
         ]
     },
     {
-        "id": "452b77d1.b4f2a8",
+        "id": "8dd1e788.b5dd4",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2256,
-        "y": 2184,
-        "z": "4fb14ce0.40eb24",
+        "x": 2274,
+        "y": 2167,
+        "z": "ab59e982.86c81",
         "wires": [
             []
         ]
     },
     {
-        "id": "b1806606.25c148",
+        "id": "6a3cb15d.6fc0f8",
         "type": "outcomeFalse",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2288,
-        "y": 2443,
-        "z": "4fb14ce0.40eb24",
+        "x": 2306,
+        "y": 2426,
+        "z": "ab59e982.86c81",
         "wires": [
             [
-                "28b98f8a.d66ba8"
+                "7ecab95b.cd5a18"
             ]
         ]
     },
     {
-        "id": "65dfad8a.1bcc14",
+        "id": "82bc647c.2cf778",
         "type": "save",
         "name": "save vpn-binding otnIdx resource (aka. OTN) in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid' >\n<parameter name='vpn-id' value='`$prop.vpn-binding-otnidx-uuid`' />\n<parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />\n<!--<parameter name='customer-vpn-id' value='`($idx + 1) * 10`' />-->\n<!--<parameter name='customer-vpn-id' value='`($maxtpn + $gfp)`' />-->\n<parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />\n<!--<parameter name='access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->\n<parameter name='access-provider-id' value='`$tmp.access-provider-id`' />\n<!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->\n<parameter name='access-client-id' value='`$tmp.access-client-id`' />\n<!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->\n<parameter name='access-topology-id' value='`$tmp.access-topology-id`' />\n<!--<parameter name='src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->\n<parameter name='src-access-node-id' value='`$tmp.domainG-src-access-node-id`' />\n<parameter name='src-access-ltp-id' value='`$tmp.otninfo[$otnidx].srcPort.src-tunnel-tp-id`' />\n<!--<parameter name='dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />-->\n<parameter name='dst-access-node-id' value='`$tmp.domainG-dst-access-node-id`' />\n<parameter name='dst-access-ltp-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-tunnel-tp-id`' />\n<parameter name='route-distinguisher' value='`$gfp`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n\n\n<parameter name='vpn-region' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.url`' />\n<parameter name='vpn-description' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.user`' />\n<parameter name='vpn-platform' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.password`' />\n\n<!-- The following line is in lieu of vpn-binding.slice-id (new attribute in latest AAI) -->\n<!--<parameter name='ops-note' value='`$tmp.aai.service-instance.service-instance-id`' />-->\n<parameter name='slice-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='ops-note' value='`$tmp.srcTtpOtnLayer`' />\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2695,
-        "y": 1974,
-        "z": "4fb14ce0.40eb24",
+        "x": 2713,
+        "y": 1957,
+        "z": "ab59e982.86c81",
         "wires": [
             [
-                "685af2d8.b662dc"
+                "6754cf0f.d24068"
             ]
         ]
     },
     {
-        "id": "685af2d8.b662dc",
+        "id": "6754cf0f.d24068",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2999,
-        "y": 1971,
-        "z": "4fb14ce0.40eb24",
+        "x": 3017,
+        "y": 1954,
+        "z": "ab59e982.86c81",
         "wires": [
             [
-                "edef5d31.f27bb8"
+                "a854224c.98a058"
             ]
         ]
     },
     {
-        "id": "edef5d31.f27bb8",
+        "id": "a854224c.98a058",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3149.5,
-        "y": 1978.25390625,
-        "z": "4fb14ce0.40eb24",
+        "x": 3167.5,
+        "y": 1961.25390625,
+        "z": "ab59e982.86c81",
         "wires": [
             []
         ]
     },
     {
-        "id": "fca1e078.90281",
+        "id": "87b5ce3b.8ef938",
         "type": "execute",
         "name": "execute UUID generator for connectivity domain otnidx",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"uuid.connectivity-otnidx-uuid\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1989,
-        "y": 1587,
-        "z": "4fb14ce0.40eb24",
+        "x": 2007,
+        "y": 1570,
+        "z": "ab59e982.86c81",
         "wires": [
             []
         ]
     },
     {
-        "id": "84e90fcb.be7ce",
+        "id": "6a69c0c.0beb14",
         "type": "save",
         "name": "save connectivity resource in AAI",
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-otnidx-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-otnidx-uuid`' />\n<!--<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />-->\n<parameter name='operational-status' value='Created' />\n<!--<parameter name='access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->\n<!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->\n<!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->\n<!--<parameter name='access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->\n<!--<parameter name='access-ltp-id' value='``' />-->\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n\n<parameter name='coupling-flag' value='`$srcTtpdstTtpPair`' />\n\n<!--<parameter name='bandwidth-profile-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='vpn-type' value='dummy' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<!--<parameter name='cbs' value='`$prop.sotn.cbs`' />-->\n<!--<parameter name='ebs' value='`$prop.sotn.ebs`' />-->\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-otnidx-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-otnidx-uuid`' />\n<!--<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />-->\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$tmp.access-provider-id`' />\n<!--<parameter name='access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->\n<!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->\n<!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->\n<!--<parameter name='access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->\n<!--<parameter name='access-ltp-id' value='``' />-->\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n\n<parameter name='coupling-flag' value='`$srcTtpdstTtpPair`' />\n\n<!--<parameter name='bandwidth-profile-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='vpn-type' value='dummy' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<!--<parameter name='cbs' value='`$prop.sotn.cbs`' />-->\n<!--<parameter name='ebs' value='`$prop.sotn.ebs`' />-->\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1927,
-        "y": 1637,
-        "z": "4fb14ce0.40eb24",
+        "x": 1945,
+        "y": 1620,
+        "z": "ab59e982.86c81",
         "wires": [
             []
         ]
     },
     {
-        "id": "548a399a.3a9a1",
+        "id": "a4e3ab7a.498dc8",
         "type": "save",
         "name": "save middle-man-conn relationship to connectivity-otnidx, in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-otnidx-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-otnidx-uuid`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 2028,
-        "y": 1682,
-        "z": "4fb14ce0.40eb24",
+        "x": 2046,
+        "y": 1665,
+        "z": "ab59e982.86c81",
         "wires": [
             []
         ]
     },
     {
-        "id": "ea27a84e.a57e98",
+        "id": "909dac00.1cdf4",
         "type": "save",
         "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-otnidx-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-otnidx-uuid`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
         "comments": "",
         "outputs": 1,
-        "x": 2064,
-        "y": 1736,
-        "z": "4fb14ce0.40eb24",
+        "x": 2082,
+        "y": 1719,
+        "z": "ab59e982.86c81",
         "wires": [
             []
         ]
     },
     {
-        "id": "688a1580.c26934",
+        "id": "30650806.4cf508",
         "type": "save",
         "name": "save connectivity-otnidx relationship to vpn-binding-otnidx, in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-otnidx-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-otnidx-uuid`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 2032,
-        "y": 1795,
-        "z": "4fb14ce0.40eb24",
+        "x": 2050,
+        "y": 1778,
+        "z": "ab59e982.86c81",
         "wires": [
             []
         ]
     },
     {
-        "id": "ab8e2668.029e08",
+        "id": "a06d70ba.206bf",
         "type": "comment",
         "name": "find middle-man's eth-srv-name",
         "info": "",
         "comments": "",
-        "x": 1490,
-        "y": 1411,
-        "z": "4fb14ce0.40eb24",
+        "x": 1508,
+        "y": 1394,
+        "z": "ab59e982.86c81",
         "wires": []
     },
     {
-        "id": "84f3d24d.36c17",
+        "id": "6cd61101.45105",
         "type": "set",
         "name": "set prop.ethernet-service-name",
         "xml": "<set>\n<parameter name='prop.ethernet-service-name' value='`$middle-man-conn.etht-svc-name`' />\n\n",
         "comments": "",
-        "x": 1512,
-        "y": 1455,
-        "z": "4fb14ce0.40eb24",
+        "x": 1530,
+        "y": 1438,
+        "z": "ab59e982.86c81",
         "wires": []
     },
     {
-        "id": "ae53151f.a2887",
+        "id": "78936cec.4008d4",
         "type": "save",
         "name": "save middle-man-conn relationship to tmp.the-connectivity, in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $tmp.the-connectivity.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.the-connectivity.connectivity-id`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 2719,
-        "y": 2191,
-        "z": "4fb14ce0.40eb24",
+        "x": 2737,
+        "y": 2174,
+        "z": "ab59e982.86c81",
         "wires": [
             []
         ]
     },
     {
-        "id": "4e7cd680.120818",
+        "id": "8c815ed6.372fa",
         "type": "save",
         "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-otnidx-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-otnidx-uuid`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
         "comments": "",
         "outputs": 1,
-        "x": 2750,
-        "y": 2230,
-        "z": "4fb14ce0.40eb24",
+        "x": 2768,
+        "y": 2213,
+        "z": "ab59e982.86c81",
         "wires": [
             []
         ]
     },
     {
-        "id": "ecdbcb6.a92d738",
+        "id": "add6fed7.67e35",
         "type": "save",
         "name": "save tmp.the-connectivity relationship to vpn-binding-otnidx, in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $tmp.the-connectivity.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.the-connectivity.connectivity-id`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 2721,
-        "y": 2303,
-        "z": "4fb14ce0.40eb24",
+        "x": 2739,
+        "y": 2286,
+        "z": "ab59e982.86c81",
         "wires": [
             []
         ]
     },
     {
-        "id": "82dff351.eb0b18",
+        "id": "8ad8acf7.e8e67",
         "type": "comment",
         "name": "update the founded connectivity to have a new coupling-flag",
         "info": "",
         "comments": "",
-        "x": 2691,
-        "y": 2019,
-        "z": "4fb14ce0.40eb24",
+        "x": 2709,
+        "y": 2002,
+        "z": "ab59e982.86c81",
         "wires": []
     },
     {
-        "id": "4af074ca.bd591c",
+        "id": "8ca2b693.c50608",
         "type": "set",
         "name": "set newFlag",
         "xml": "<set>\n<parameter name='tmp.newFlag' value=\"`$tmp.the-connectivity.coupling-flag + '-' +\n                                               $tmp.srcTtpdstTtpPair`\" />\n\n\n",
         "comments": "",
-        "x": 2577,
-        "y": 2058,
-        "z": "4fb14ce0.40eb24",
+        "x": 2595,
+        "y": 2041,
+        "z": "ab59e982.86c81",
         "wires": []
     },
     {
-        "id": "5e632476.eb799c",
+        "id": "9f51b095.94fd08",
         "type": "save",
         "name": "update connectivity resource in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.the-connectivity.connectivity-id`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Modified' />\n<parameter name='coupling-flag' value='`$tmp.newFlag`' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 2641,
-        "y": 2103,
-        "z": "4fb14ce0.40eb24",
+        "x": 2659,
+        "y": 2086,
+        "z": "ab59e982.86c81",
         "wires": [
             []
         ]
     },
     {
-        "id": "6b3b57c6.7c8f5",
+        "id": "58d04196.f5778",
         "type": "comment",
         "name": "the following two relationships should have already been there; if not => error",
         "info": "",
         "comments": "",
-        "x": 2733,
-        "y": 2153,
-        "z": "4fb14ce0.40eb24",
+        "x": 2751,
+        "y": 2136,
+        "z": "ab59e982.86c81",
         "wires": []
     },
     {
-        "id": "453ea410.800c04",
+        "id": "832e8c75.f85478",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1719,
-        "y": 1520,
-        "z": "4fb14ce0.40eb24",
+        "x": 1737,
+        "y": 1503,
+        "z": "ab59e982.86c81",
         "wires": [
             [
-                "be6ceee2.825c9",
-                "fca1e078.90281",
-                "84e90fcb.be7ce",
-                "548a399a.3a9a1",
-                "ea27a84e.a57e98",
-                "688a1580.c26934"
+                "570cc158.1e1d08",
+                "87b5ce3b.8ef938",
+                "6a69c0c.0beb14",
+                "a4e3ab7a.498dc8",
+                "909dac00.1cdf4",
+                "30650806.4cf508"
             ]
         ]
     },
     {
-        "id": "78a0670.cf2d998",
+        "id": "7342444f.5f3ea4",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1581,
-        "y": 1516,
-        "z": "4fb14ce0.40eb24",
+        "x": 1599,
+        "y": 1499,
+        "z": "ab59e982.86c81",
         "wires": [
             [
-                "453ea410.800c04"
+                "832e8c75.f85478"
             ]
         ]
     },
     {
-        "id": "c80f5b2c.e8799",
+        "id": "27e9b59e.2795c2",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 2379,
-        "y": 1983,
-        "z": "4fb14ce0.40eb24",
+        "x": 2397,
+        "y": 1966,
+        "z": "ab59e982.86c81",
         "wires": [
             [
-                "65dfad8a.1bcc14",
-                "4af074ca.bd591c",
-                "5e632476.eb799c",
-                "ecdbcb6.a92d738"
+                "82bc647c.2cf778",
+                "8ca2b693.c50608",
+                "9f51b095.94fd08",
+                "add6fed7.67e35"
             ]
         ]
     },
     {
-        "id": "f5aa86ab.3de758",
+        "id": "ddcfbda0.672cc",
         "type": "comment",
         "name": "loop through the relationships of this founded connectivity, then",
         "info": "then find the vpn-binding that has same src ttp and dst ttp as this one",
         "comments": "",
-        "x": 2384,
-        "y": 2408,
-        "z": "4fb14ce0.40eb24",
+        "x": 2402,
+        "y": 2391,
+        "z": "ab59e982.86c81",
         "wires": []
     },
     {
-        "id": "8608bc09.df0608",
+        "id": "86c04fbf.f3fdf8",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='tcridx' start='0' end='`$tmp.the-connectivity.relationship-list.relationship_length`' >\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2726,
-        "y": 2444,
-        "z": "4fb14ce0.40eb24",
+        "x": 2744,
+        "y": 2427,
+        "z": "ab59e982.86c81",
         "wires": [
             [
-                "5d08ac03.36d834"
+                "d9d55075.06cb88"
             ]
         ]
     },
     {
-        "id": "5d08ac03.36d834",
+        "id": "d9d55075.06cb88",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.the-connectivity.relationship-list.relationship[$tcridx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2938,
-        "y": 2442,
-        "z": "4fb14ce0.40eb24",
+        "x": 2956,
+        "y": 2425,
+        "z": "ab59e982.86c81",
         "wires": [
             [
-                "d7fbd393.802b28"
+                "b5809f3c.79c17"
             ]
         ]
     },
     {
-        "id": "d7fbd393.802b28",
+        "id": "b5809f3c.79c17",
         "type": "outcome",
         "name": "vpn-binding",
         "xml": "<outcome value='vpn-binding'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3122,
-        "y": 2440,
-        "z": "4fb14ce0.40eb24",
+        "x": 3140,
+        "y": 2423,
+        "z": "ab59e982.86c81",
         "wires": [
             [
-                "7b17a25c.8a3ecc"
+                "17f341d4.56b9ee"
             ]
         ]
     },
     {
-        "id": "7b17a25c.8a3ecc",
+        "id": "17f341d4.56b9ee",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3301,
-        "y": 2445,
-        "z": "4fb14ce0.40eb24",
+        "x": 3319,
+        "y": 2428,
+        "z": "ab59e982.86c81",
         "wires": [
             [
-                "404536aa.fd072",
-                "ebe21a38.772d1"
+                "77bff99b.403968",
+                "813820e1.d9db2"
             ]
         ]
     },
     {
-        "id": "ebe21a38.772d1",
+        "id": "813820e1.d9db2",
         "type": "set",
         "name": "unset tmp.aai.vpn-binding",
         "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value='' />\n",
         "comments": "",
-        "x": 3518,
-        "y": 2376,
-        "z": "4fb14ce0.40eb24",
+        "x": 3536,
+        "y": 2359,
+        "z": "ab59e982.86c81",
         "wires": []
     },
     {
-        "id": "404536aa.fd072",
+        "id": "77bff99b.403968",
         "type": "save",
         "name": "get vpn-binding from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-binding\"\n\t    key=\"vpn-binding.vpn-id = $tmp.the-connectivity.relationship-list.relationship[$tcridx].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.vpn-binding\" >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3511,
-        "y": 2462,
-        "z": "4fb14ce0.40eb24",
+        "x": 3529,
+        "y": 2445,
+        "z": "ab59e982.86c81",
         "wires": [
             [
-                "82eb023b.8b6878",
-                "3917c696.d9cc82",
-                "ad895865.ea3bc8"
+                "574e7a35.7acb64",
+                "72ff429d.0f84dc",
+                "d88724e6.b16bd8"
             ]
         ]
     },
     {
-        "id": "3917c696.d9cc82",
+        "id": "72ff429d.0f84dc",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3724.490966796875,
-        "y": 2446.5740356445312,
-        "z": "4fb14ce0.40eb24",
+        "x": 3742.490966796875,
+        "y": 2429.5740356445312,
+        "z": "ab59e982.86c81",
         "wires": [
             [
-                "33dd47ac.b200d"
+                "47df6bef.c00ec4"
             ]
         ]
     },
     {
-        "id": "33dd47ac.b200d",
+        "id": "47df6bef.c00ec4",
         "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": 3887.0625,
-        "y": 2445.8597412109375,
-        "z": "4fb14ce0.40eb24",
+        "x": 3905.0625,
+        "y": 2428.8597412109375,
+        "z": "ab59e982.86c81",
         "wires": []
     },
     {
-        "id": "49f1ea3b.eabc34",
+        "id": "25a6a90d.740966",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3888,
-        "y": 2491,
-        "z": "4fb14ce0.40eb24",
+        "x": 3906,
+        "y": 2474,
+        "z": "ab59e982.86c81",
         "wires": []
     },
     {
-        "id": "ad895865.ea3bc8",
+        "id": "d88724e6.b16bd8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3720,
-        "y": 2491,
-        "z": "4fb14ce0.40eb24",
+        "x": 3738,
+        "y": 2474,
+        "z": "ab59e982.86c81",
         "wires": [
             [
-                "49f1ea3b.eabc34"
+                "25a6a90d.740966"
             ]
         ]
     },
     {
-        "id": "82eb023b.8b6878",
+        "id": "574e7a35.7acb64",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3722,
-        "y": 2551,
-        "z": "4fb14ce0.40eb24",
+        "x": 3740,
+        "y": 2534,
+        "z": "ab59e982.86c81",
         "wires": [
             [
-                "cb43f8c5.5d2f9"
+                "fafaf735.33502"
             ]
         ]
     },
     {
-        "id": "cb43f8c5.5d2f9",
+        "id": "fafaf735.33502",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3891,
-        "y": 2550,
-        "z": "4fb14ce0.40eb24",
+        "x": 3909,
+        "y": 2533,
+        "z": "ab59e982.86c81",
         "wires": [
             [
-                "b8d3290b.70429"
+                "dbd3b6f8.ffc688"
             ]
         ]
     },
     {
-        "id": "28b98f8a.d66ba8",
+        "id": "7ecab95b.cd5a18",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2515,
-        "y": 2442,
-        "z": "4fb14ce0.40eb24",
+        "x": 2533,
+        "y": 2425,
+        "z": "ab59e982.86c81",
         "wires": [
             [
-                "8608bc09.df0608",
-                "57ababe0.ec3414",
-                "52276af3.2f9a4c"
+                "86c04fbf.f3fdf8",
+                "3d93e24d.201056",
+                "18210d7a.52f32b"
             ]
         ]
     },
     {
-        "id": "b8d3290b.70429",
+        "id": "dbd3b6f8.ffc688",
         "type": "switchNode",
         "name": "switch srcTtp",
         "xml": "<switch test='`$tmp.aai.vpn-binding.src-access-ltp-id == $tmp.otninfo[$otnidx].srcPort.src-tunnel-tp-id`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4090,
-        "y": 2551,
-        "z": "4fb14ce0.40eb24",
+        "x": 4108,
+        "y": 2534,
+        "z": "ab59e982.86c81",
         "wires": [
             [
-                "4ce3e8eb.f24da8"
+                "f13865e2.850a98"
             ]
         ]
     },
     {
-        "id": "4ce3e8eb.f24da8",
+        "id": "f13865e2.850a98",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4253,
-        "y": 2549,
-        "z": "4fb14ce0.40eb24",
+        "x": 4271,
+        "y": 2532,
+        "z": "ab59e982.86c81",
         "wires": [
             [
-                "18f785cc.cf347a"
+                "9cbb1279.26e6c"
             ]
         ]
     },
     {
-        "id": "18f785cc.cf347a",
+        "id": "9cbb1279.26e6c",
         "type": "switchNode",
         "name": "switch dstTtp",
         "xml": "<switch test='`$tmp.aai.vpn-binding.dst-access-ltp-id == $tmp.otninfo[$otnidx].dstPort.dst-tunnel-tp-id`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4434,
-        "y": 2549,
-        "z": "4fb14ce0.40eb24",
+        "x": 4452,
+        "y": 2532,
+        "z": "ab59e982.86c81",
         "wires": [
             [
-                "988f1cd5.aa027"
+                "9f041833.a96178"
             ]
         ]
     },
     {
-        "id": "988f1cd5.aa027",
+        "id": "9f041833.a96178",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4597,
-        "y": 2547,
-        "z": "4fb14ce0.40eb24",
+        "x": 4615,
+        "y": 2530,
+        "z": "ab59e982.86c81",
         "wires": [
             [
-                "9caa890d.344aa8"
+                "7a99f43e.47072c"
             ]
         ]
     },
     {
-        "id": "dd1b26b2.35eef",
+        "id": "3d307538.ff5302",
         "type": "set",
         "name": "set tmp.the-vpn-binding",
         "xml": "<set>\n<parameter name='tmp.the-vpn-binding.' value='`$tmp.aai.vpn-binding.`' />\n",
         "comments": "",
-        "x": 4954,
-        "y": 2554,
-        "z": "4fb14ce0.40eb24",
+        "x": 4972,
+        "y": 2537,
+        "z": "ab59e982.86c81",
         "wires": []
     },
     {
-        "id": "9caa890d.344aa8",
+        "id": "7a99f43e.47072c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4736,
-        "y": 2546,
-        "z": "4fb14ce0.40eb24",
+        "x": 4754,
+        "y": 2529,
+        "z": "ab59e982.86c81",
         "wires": [
             [
-                "dd1b26b2.35eef",
-                "69c80295.f3b48c"
+                "3d307538.ff5302",
+                "9c163e19.5e2778"
             ]
         ]
     },
     {
-        "id": "69c80295.f3b48c",
+        "id": "9c163e19.5e2778",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 4900,
-        "y": 2598,
-        "z": "4fb14ce0.40eb24",
+        "x": 4918,
+        "y": 2581,
+        "z": "ab59e982.86c81",
         "wires": []
     },
     {
-        "id": "57ababe0.ec3414",
+        "id": "3d93e24d.201056",
         "type": "set",
         "name": "unset tmp.the-vpn-binding",
         "xml": "<set>\n<parameter name='tmp.the-vpn-binding.' value='' />\n",
         "comments": "",
-        "x": 2736,
-        "y": 2405,
-        "z": "4fb14ce0.40eb24",
+        "x": 2754,
+        "y": 2388,
+        "z": "ab59e982.86c81",
         "wires": []
     },
     {
-        "id": "b81a7ea3.f58288",
+        "id": "ad919177.04496",
         "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": 2825,
-        "y": 2579,
-        "z": "4fb14ce0.40eb24",
+        "x": 2843,
+        "y": 2562,
+        "z": "ab59e982.86c81",
         "wires": []
     },
     {
-        "id": "52276af3.2f9a4c",
+        "id": "18210d7a.52f32b",
         "type": "save",
         "name": "update vpn-binding otnIdx resource (aka. OTN) in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.the-vpn-binding.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.the-vpn-binding.vpn-id`' />\n<!--<parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />-->\n<!--<parameter name='customer-vpn-id' value='`($maxtpn + $gfp)`' />-->\n<parameter name='customer-vpn-id' value='`($tmp.the-vpn-binding.customer-vpn-id + $gfp)`' />\n\n<parameter name='route-distinguisher' value='`$gfp`' />\n<parameter name='operational-status' value='Modified' />\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2795,
-        "y": 2639,
-        "z": "4fb14ce0.40eb24",
+        "x": 2813,
+        "y": 2622,
+        "z": "ab59e982.86c81",
         "wires": [
             []
         ]
+    },
+    {
+        "id": "af2be5de.84caa8",
+        "type": "switchNode",
+        "name": "switch otninfoProtect exists",
+        "xml": "<switch test=\"`$tmp.otninfoProtect_length > 0`\">\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 579.1166381835938,
+        "y": 2488,
+        "z": "ab59e982.86c81",
+        "wires": [
+            [
+                "bdb88dff.a2cfc8"
+            ]
+        ]
+    },
+    {
+        "id": "bdb88dff.a2cfc8",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 800.1166381835938,
+        "y": 2489,
+        "z": "ab59e982.86c81",
+        "wires": [
+            [
+                "62f58207.69b144"
+            ]
+        ]
+    },
+    {
+        "id": "4da32200.1a505",
+        "type": "for",
+        "name": "for vidx..tmp.otninfoProtect_length[]",
+        "xml": "<for index='otnidx' start='0' end='`$tmp.otninfoProtect_length`' >",
+        "comments": "",
+        "outputs": 1,
+        "x": 615.6666870117188,
+        "y": 3269.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": [
+            [
+                "78d123a7.ebdd04"
+            ]
+        ]
+    },
+    {
+        "id": "78d123a7.ebdd04",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 875.6666564941406,
+        "y": 3262.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": [
+            [
+                "655b0cf9.434f14",
+                "2cbd342f.008e4c",
+                "af443653.16e2a",
+                "b4328c41.7c5e68",
+                "54752c5a.7588d4",
+                "88c79ac5.392298",
+                "f442f477.1b9ac",
+                "1b1a37df.8ffb38",
+                "40d5cce.138f1b4",
+                "17ca39fd.1576de"
+            ]
+        ]
+    },
+    {
+        "id": "2cbd342f.008e4c",
+        "type": "switchNode",
+        "name": "switch dstPort == NULL",
+        "xml": "<switch test=\"`$tmp.otninfoProtect[$otnidx].dstPort.dst-access-provider-id == ''`\">\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1264.6666870117188,
+        "y": 2931.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": [
+            [
+                "390f0f63.f5713",
+                "a481fb54.252848"
+            ]
+        ]
+    },
+    {
+        "id": "a481fb54.252848",
+        "type": "outcomeFalse",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1631.6666870117188,
+        "y": 2938.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": [
+            [
+                "accd9965.551cc"
+            ]
+        ]
+    },
+    {
+        "id": "accd9965.551cc",
+        "type": "set",
+        "name": "set access-provider-id and client-id",
+        "xml": "<set>\n<parameter name='tmp.access-provider-id' value='`$tmp.otninfoProtect[$otnidx].dstPort.dst-access-provider-id`' />\n<parameter name='tmp.access-client-id' value='`$tmp.otninfoProtect[$otnidx].dstPort.dst-access-client-id`' />\n<parameter name='tmp.access-topology-id' value='`$tmp.otninfoProtect[$otnidx].dstPort.dst-access-topology-id`' />\n<parameter name='tmp.srcdstpnf-id' value='`$tmp.otninfoProtect[$otnidx].dstPort.dst-access-node-id`' />\n",
+        "comments": "",
+        "x": 1842.6666870117188,
+        "y": 2936.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": []
+    },
+    {
+        "id": "af443653.16e2a",
+        "type": "set",
+        "name": "set srcdstpnf-name",
+        "xml": "<set>\n<parameter name='tmp.srcdstpnf-name' value=\"`'networkId-providerId-' + \n                                             $tmp.access-provider-id + '-clientId-' +\n                                             $tmp.access-client-id + '-topologyId-' + \n                                             $tmp.access-topology-id + '-nodeId-' + \n                                             $tmp.srcdstpnf-id`\" />\n\n",
+        "comments": "",
+        "x": 1440.6666870117188,
+        "y": 3005.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": []
+    },
+    {
+        "id": "b4328c41.7c5e68",
+        "type": "get-resource",
+        "name": "get-resource tmp.srcdstpnf-name",
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.srcdstpnf-name\"\n        pfx='tmp.aai.srcdst-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1484.6666870117188,
+        "y": 3053.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": [
+            [
+                "2ab1cad2.cc8df6",
+                "95061116.66953",
+                "d118596c.c8a1b"
+            ]
+        ]
+    },
+    {
+        "id": "2ab1cad2.cc8df6",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1697.1666870117188,
+        "y": 3000.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": [
+            [
+                "9a46b094.250a1"
+            ]
+        ]
+    },
+    {
+        "id": "95061116.66953",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1709.1666870117188,
+        "y": 3050.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": [
+            [
+                "a8bbbf3c.490288"
+            ]
+        ]
+    },
+    {
+        "id": "d118596c.c8a1b",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1700.1666870117188,
+        "y": 3105.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": [
+            [
+                "c4cf4a50.357dd"
+            ]
+        ]
+    },
+    {
+        "id": "c4cf4a50.357dd",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
+        "comments": "",
+        "x": 1845.1666870117188,
+        "y": 3104.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": []
+    },
+    {
+        "id": "a8bbbf3c.490288",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
+        "comments": "",
+        "x": 1856.1666870117188,
+        "y": 3047.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": []
+    },
+    {
+        "id": "9a46b094.250a1",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1822.5491333007812,
+        "y": 2994.5555725097656,
+        "z": "ab59e982.86c81",
+        "wires": [
+            [
+                "8c15c7c0.68b978"
+            ]
+        ]
+    },
+    {
+        "id": "8c15c7c0.68b978",
+        "type": "for",
+        "name": "for each relationship",
+        "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.srcdst-pnf.relationship-list.relationship_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1983.6666870117188,
+        "y": 3008.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": [
+            [
+                "a8c602fe.1de83"
+            ]
+        ]
+    },
+    {
+        "id": "a8c602fe.1de83",
+        "type": "switchNode",
+        "name": "switch related-to",
+        "xml": "<switch test='`$tmp.aai.srcdst-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2178.6666870117188,
+        "y": 3008.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": [
+            [
+                "92605acf.b6eae"
+            ]
+        ]
+    },
+    {
+        "id": "3d5fc5da.8209c2",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 2558.6666870117188,
+        "y": 3004.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": [
+            [
+                "f1e62050.aa9b48",
+                "142adcaa.53768b"
+            ]
+        ]
+    },
+    {
+        "id": "142adcaa.53768b",
+        "type": "execute",
+        "name": "get esr-thirdparty-sdnc",
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainG.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainG.esr-thirdparty-sdnc' local-only='false' >",
+        "comments": "",
+        "outputs": 1,
+        "x": 2766.6666870117188,
+        "y": 3011.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": [
+            [
+                "b0f57546.a572f8",
+                "f4d8ee18.503d6",
+                "6cf185fa.032e7c"
+            ]
+        ]
+    },
+    {
+        "id": "f1e62050.aa9b48",
+        "type": "set",
+        "name": "set esr-thirdparty-sdnc domainG id",
+        "xml": "<set>\n<parameter name='tmp.domainG.esr-thirdparty-id' value=\"`$tmp.aai.srcdst-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
+        "comments": "",
+        "x": 2796.6666870117188,
+        "y": 2959.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": []
+    },
+    {
+        "id": "b0f57546.a572f8",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2976.6666870117188,
+        "y": 3002.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": [
+            [
+                "8af042ca.abce2"
+            ]
+        ]
+    },
+    {
+        "id": "f4d8ee18.503d6",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2968.6666870117188,
+        "y": 3057.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": [
+            [
+                "14e1063f.bcaa12"
+            ]
+        ]
+    },
+    {
+        "id": "6cf185fa.032e7c",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2973.6666870117188,
+        "y": 3114.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": [
+            [
+                "88d269ff.2a4e78"
+            ]
+        ]
+    },
+    {
+        "id": "88d269ff.2a4e78",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
+        "comments": "",
+        "x": 3125.6666870117188,
+        "y": 3115.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": []
+    },
+    {
+        "id": "14e1063f.bcaa12",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
+        "comments": "",
+        "x": 3136.6666870117188,
+        "y": 3060.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": []
+    },
+    {
+        "id": "8af042ca.abce2",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 3121.0490112304688,
+        "y": 3000.5555725097656,
+        "z": "ab59e982.86c81",
+        "wires": [
+            [
+                "6ee06c7f.e87634"
+            ]
+        ]
+    },
+    {
+        "id": "92605acf.b6eae",
+        "type": "outcome",
+        "name": "esr-thirdparty-sdnc",
+        "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2381.6666870117188,
+        "y": 3012.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": [
+            [
+                "3d5fc5da.8209c2"
+            ]
+        ]
+    },
+    {
+        "id": "6ee06c7f.e87634",
+        "type": "set",
+        "name": "set controller domainA data",
+        "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.url' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.user' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.password' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
+        "comments": "",
+        "x": 3335.6666870117188,
+        "y": 2996.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": []
+    },
+    {
+        "id": "54752c5a.7588d4",
+        "type": "switchNode",
+        "name": "switch dmnsidx == 0 (domainA)",
+        "xml": "<switch test='`$otnidx == 0`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1454.6666870117188,
+        "y": 3222.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": [
+            [
+                "a23826d9.6cbf8",
+                "ca79965c.c43c5"
+            ]
+        ]
+    },
+    {
+        "id": "a23826d9.6cbf8",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1655.6666870117188,
+        "y": 3220.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": [
+            [
+                "1188399c.8e417e"
+            ]
+        ]
+    },
+    {
+        "id": "5f0d00e5.7b1628",
+        "type": "set",
+        "name": "set pce-src-node",
+        "xml": "<set>\n<parameter name='tmp.pce-src-node' value='`$tmp.srcdstpnf-name`' />",
+        "comments": "",
+        "x": 1936.6666870117188,
+        "y": 3170.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": []
+    },
+    {
+        "id": "f4e7389.48dcac8",
+        "type": "switchNode",
+        "name": "switch dmnsidx == last (domainC)",
+        "xml": "<switch test='`$otnidx == $tmp.otninfoProtect_length - 1`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1872.6666870117188,
+        "y": 3271.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": [
+            [
+                "1eeda518.bbd863",
+                "25bb7e68.eed552"
+            ]
+        ]
+    },
+    {
+        "id": "1eeda518.bbd863",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2102.6666870117188,
+        "y": 3267.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": [
+            [
+                "19cc5bd6.d13bb4"
+            ]
+        ]
+    },
+    {
+        "id": "ca79965c.c43c5",
+        "type": "outcomeFalse",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1655.6666870117188,
+        "y": 3269.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": [
+            [
+                "f4e7389.48dcac8"
+            ]
+        ]
+    },
+    {
+        "id": "25bb7e68.eed552",
+        "type": "outcomeFalse",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2103.6666870117188,
+        "y": 3313.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": [
+            [
+                "ff457a93.22142"
+            ]
+        ]
+    },
+    {
+        "id": "ff457a93.22142",
+        "type": "set",
+        "name": "set attachment_param domain G",
+        "xml": "<set>\n<parameter name='tmp.domainG-src-access-node-id' value='`$tmp.otninfoProtect[$otnidx].srcPort.src-access-node-id`' />\n<parameter name='tmp.domainG-dst-access-node-id' value='`$tmp.otninfoProtect[$otnidx].dstPort.dst-access-node-id`' />",
+        "comments": "",
+        "x": 2317.6666870117188,
+        "y": 3313.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": []
+    },
+    {
+        "id": "a5bfc25b.24a798",
+        "type": "set",
+        "name": "set attachment_param domain A",
+        "xml": "<set>\n<parameter name='tmp.domainG-src-access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='tmp.domainG-dst-access-node-id' value='`$tmp.otninfoProtect[$otnidx].dstPort.dst-access-node-id`' />",
+        "comments": "",
+        "x": 1991.6666870117188,
+        "y": 3217.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": []
+    },
+    {
+        "id": "1188399c.8e417e",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1779.6666870117188,
+        "y": 3211.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": [
+            [
+                "a5bfc25b.24a798"
+            ]
+        ]
+    },
+    {
+        "id": "19cc5bd6.d13bb4",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 2235.6666870117188,
+        "y": 3243.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": [
+            [
+                "ecfd7b03.8cb46"
+            ]
+        ]
+    },
+    {
+        "id": "f9df9d2f.f6b57",
+        "type": "set",
+        "name": "set pce-src-node",
+        "xml": "<set>\n<parameter name='tmp.pce-dst-node' value='`$tmp.srcdstpnf-name`' />",
+        "comments": "",
+        "x": 2391.6666870117188,
+        "y": 3259.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": []
+    },
+    {
+        "id": "ecfd7b03.8cb46",
+        "type": "set",
+        "name": "set attachment_param domain C",
+        "xml": "<set>\n<parameter name='tmp.domainG-src-access-node-id' value='`$tmp.otninfoProtect[$otnidx].srcPort.src-access-node-id`' />\n<parameter name='tmp.domainG-dst-access-node-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -3]`' />",
+        "comments": "",
+        "x": 2439.6666870117188,
+        "y": 3211.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": []
+    },
+    {
+        "id": "88c79ac5.392298",
+        "type": "set",
+        "name": "set srcTtp+dstTtp pair",
+        "xml": "<set>\n<parameter name='tmp.srcTtpdstTtpPair' value=\"`$tmp.otninfoProtect[$otnidx].srcPort.src-tunnel-tp-id + ',' +\n                                               $tmp.otninfootninfoProtect.dstPort.dst-tunnel-tp-id`\" />\n\n\n",
+        "comments": "",
+        "x": 1430.6666870117188,
+        "y": 3302.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": []
+    },
+    {
+        "id": "1b1a37df.8ffb38",
+        "type": "call",
+        "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-connectivity",
+        "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-connectivity' mode='sync' >\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1622.6666564941406,
+        "y": 3400.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "f442f477.1b9ac",
+        "type": "set",
+        "name": "set current-provider-id and current-cvlan-id",
+        "xml": "<set>\n<parameter name='tmp.current-provider-id' value='`$tmp.access-provider-id`' />\n<parameter name='tmp.current-cvlan-id' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n\n",
+        "comments": "",
+        "x": 1494.6666870117188,
+        "y": 3353.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": []
+    },
+    {
+        "id": "40d5cce.138f1b4",
+        "type": "switchNode",
+        "name": "switch found-connectivity?",
+        "xml": "\n<switch test=\"`$found-connectivity`\">\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1303.6666870117188,
+        "y": 3554.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": [
+            [
+                "e841833f.a5b018",
+                "1d9dc789.fabfa"
+            ]
+        ]
+    },
+    {
+        "id": "e841833f.a5b018",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1589.6666870117188,
+        "y": 4373.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": [
+            [
+                "5f9745ba.8cabdc"
+            ]
+        ]
+    },
+    {
+        "id": "40e5d82c.0988c",
+        "type": "comment",
+        "name": "call string.contains to check if the cache has srcTtpdstTtpPair",
+        "info": "if it had: then no new otn/vpn-binding is needed\n           ==> find the otn. ==>look into the relationships of this connectivity and find the one that has same srcTtp and dstTtp\n           ==> increase the bw\nif not, create a new vpn-binding, attach this vpn-binding into the founded connectivity, and attach it to the middle-man-conn as well.",
+        "comments": "",
+        "x": 2015.6666870117188,
+        "y": 4318.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": []
+    },
+    {
+        "id": "37b719a7.3177d6",
+        "type": "comment",
+        "name": "create a new connectivity - (for dummy connectivity)",
+        "info": "(this should not be for LEAF side or ROOT side, otherwise error)\n\ncreate a new vpn-binding (done here)\ncreate a new connectivity (done below)\nadd srcTtpdstTtpPair into the cache in this connectivity\nattach the vpn-binding into the connectivity relationship\nattach this connectivity into the middle man\nattach this connectivity into the service-instance",
+        "comments": "",
+        "x": 1882.6666564941406,
+        "y": 3516.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": []
+    },
+    {
+        "id": "f0f8f4ff.e42fa",
+        "type": "save",
+        "name": "save vpn-binding otnIdx resource (aka. OTN) in AAI",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid' >\n<parameter name='vpn-id' value='`$prop.vpn-binding-otnidx-uuid`' />\n<parameter name='vpn-name' value=\"`$prop.otn-tunnel-name + '-protection'`\" />\n<!--<parameter name='customer-vpn-id' value='`($idx + 1) * 10`' />-->\n<!--<parameter name='customer-vpn-id' value='`($maxtpn + $gfp)`' />-->\n<parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />\n<!--<parameter name='access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->\n<parameter name='access-provider-id' value='`$tmp.access-provider-id`' />\n<!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->\n<parameter name='access-client-id' value='`$tmp.access-client-id`' />\n<!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->\n<parameter name='access-topology-id' value='`$tmp.access-topology-id`' />\n<!--<parameter name='src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->\n<parameter name='src-access-node-id' value='`$tmp.domainG-src-access-node-id`' />\n<parameter name='src-access-ltp-id' value='`$tmp.otninfoProtect[$otnidx].srcPort.src-tunnel-tp-id`' />\n<!--<parameter name='dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />-->\n<parameter name='dst-access-node-id' value='`$tmp.domainG-dst-access-node-id`' />\n<parameter name='dst-access-ltp-id' value='`$tmp.otninfoProtect[$otnidx].dstPort.dst-tunnel-tp-id`' />\n<parameter name='route-distinguisher' value='`$gfp`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n\n\n<parameter name='vpn-region' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.url`' />\n<parameter name='vpn-description' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.user`' />\n<parameter name='vpn-platform' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.password`' />\n\n<!-- The following line is in lieu of vpn-binding.slice-id (new attribute in latest AAI) -->\n<!--<parameter name='ops-note' value='`$tmp.aai.service-instance.service-instance-id`' />-->\n<parameter name='slice-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='ops-note' value='`$tmp.srcTtpOtnLayer`' />\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1929.6666870117188,
+        "y": 3566.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": [
+            [
+                "37e8875.87c3378"
+            ]
+        ]
+    },
+    {
+        "id": "37e8875.87c3378",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2217.6666870117188,
+        "y": 3567.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": [
+            [
+                "90a3277d.c4bfc"
+            ]
+        ]
+    },
+    {
+        "id": "90a3277d.c4bfc",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 2401.1666870117188,
+        "y": 3566.15380859375,
+        "z": "ab59e982.86c81",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "4b046e56.9a1b9",
+        "type": "execute",
+        "name": "execute string.contains srcTtpdstTtpPair",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' >\n<parameter name=\"source\" value='`$tmp.the-connectivity.coupling-flag`'/>\n<parameter name=\"target\" value=\"`$tmp.srcTtpdstTtpPair`\"/>\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2003.6666870117188,
+        "y": 4370.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": [
+            [
+                "779ce37e.93a47c",
+                "f1f0cfe.10d413"
+            ]
+        ]
+    },
+    {
+        "id": "779ce37e.93a47c",
+        "type": "outcomeFalse",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2176.6666870117188,
+        "y": 4218.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "f1f0cfe.10d413",
+        "type": "outcomeFalse",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2208.6666870117188,
+        "y": 4477.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": [
+            [
+                "9f0cdaa9.449a9"
+            ]
+        ]
+    },
+    {
+        "id": "58dad5a1.4283d4",
+        "type": "save",
+        "name": "save vpn-binding otnIdx resource (aka. OTN) in AAI",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid' >\n<parameter name='vpn-id' value='`$prop.vpn-binding-otnidx-uuid`' />\n<parameter name='vpn-name' value=\"`$prop.otn-tunnel-name + '-protection'`\" />\n<!--<parameter name='customer-vpn-id' value='`($idx + 1) * 10`' />-->\n<!--<parameter name='customer-vpn-id' value='`($maxtpn + $gfp)`' />-->\n<parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />\n<!--<parameter name='access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->\n<parameter name='access-provider-id' value='`$tmp.access-provider-id`' />\n<!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->\n<parameter name='access-client-id' value='`$tmp.access-client-id`' />\n<!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->\n<parameter name='access-topology-id' value='`$tmp.access-topology-id`' />\n<!--<parameter name='src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->\n<parameter name='src-access-node-id' value='`$tmp.domainG-src-access-node-id`' />\n<parameter name='src-access-ltp-id' value='`$tmp.otninfoProtect[$otnidx].srcPort.src-tunnel-tp-id`' />\n<!--<parameter name='dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />-->\n<parameter name='dst-access-node-id' value='`$tmp.domainG-dst-access-node-id`' />\n<parameter name='dst-access-ltp-id' value='`$tmp.otninfoProtect[$otnidx].dstPort.dst-tunnel-tp-id`' />\n<parameter name='route-distinguisher' value='`$gfp`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n\n\n<parameter name='vpn-region' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.url`' />\n<parameter name='vpn-description' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.user`' />\n<parameter name='vpn-platform' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.password`' />\n\n<!-- The following line is in lieu of vpn-binding.slice-id (new attribute in latest AAI) -->\n<!--<parameter name='ops-note' value='`$tmp.aai.service-instance.service-instance-id`' />-->\n<parameter name='slice-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='ops-note' value='`$tmp.srcTtpOtnLayer`' />\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2615.6666870117188,
+        "y": 4008.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": [
+            [
+                "ca0562a9.f9dfa"
+            ]
+        ]
+    },
+    {
+        "id": "ca0562a9.f9dfa",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2919.6666870117188,
+        "y": 4005.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": [
+            [
+                "21917e0f.61cb02"
+            ]
+        ]
+    },
+    {
+        "id": "21917e0f.61cb02",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 3070.1666870117188,
+        "y": 4013.15380859375,
+        "z": "ab59e982.86c81",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "c456d560.e56b4",
+        "type": "execute",
+        "name": "execute UUID generator for connectivity domain otnidx",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"uuid.connectivity-otnidx-uuid\"/>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1909.6666870117188,
+        "y": 3621.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "1c6b3c2b.a8cfe4",
+        "type": "save",
+        "name": "save connectivity resource in AAI",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-otnidx-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-otnidx-uuid`' />\n<!--<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />-->\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$tmp.access-provider-id`' />\n<!--<parameter name='access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->\n<!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->\n<!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->\n<!--<parameter name='access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->\n<!--<parameter name='access-ltp-id' value='``' />-->\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n\n<parameter name='coupling-flag' value='`$srcTtpdstTtpPair`' />\n\n<!--<parameter name='bandwidth-profile-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='vpn-type' value='dummy' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<!--<parameter name='cbs' value='`$prop.sotn.cbs`' />-->\n<!--<parameter name='ebs' value='`$prop.sotn.ebs`' />-->\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1847.6666870117188,
+        "y": 3671.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "883e63bc.f1bf9",
+        "type": "save",
+        "name": "save middle-man-conn relationship to connectivity-otnidx, in AAI",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-otnidx-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-otnidx-uuid`\" />",
+        "comments": "",
+        "outputs": 1,
+        "x": 1948.6666870117188,
+        "y": 3716.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "67b90a5f.a2bde4",
+        "type": "save",
+        "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-otnidx-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-otnidx-uuid`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
+        "comments": "",
+        "outputs": 1,
+        "x": 1984.6666870117188,
+        "y": 3770.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "44633bde.4c2f24",
+        "type": "save",
+        "name": "save connectivity-otnidx relationship to vpn-binding-otnidx, in AAI",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-otnidx-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-otnidx-uuid`\" />",
+        "comments": "",
+        "outputs": 1,
+        "x": 1952.6666870117188,
+        "y": 3829.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "ad055e93.cbffc8",
+        "type": "comment",
+        "name": "find middle-man's eth-srv-name",
+        "info": "",
+        "comments": "",
+        "x": 1410.6666870117188,
+        "y": 3445.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": []
+    },
+    {
+        "id": "17ca39fd.1576de",
+        "type": "set",
+        "name": "set prop.ethernet-service-name",
+        "xml": "<set>\n<parameter name='prop.ethernet-service-name' value='`$middle-man-conn.etht-svc-name`' />\n\n",
+        "comments": "",
+        "x": 1432.6666870117188,
+        "y": 3489.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": []
+    },
+    {
+        "id": "91cb3623.bfa508",
+        "type": "save",
+        "name": "save middle-man-conn relationship to tmp.the-connectivity, in AAI",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $tmp.the-connectivity.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.the-connectivity.connectivity-id`\" />",
+        "comments": "",
+        "outputs": 1,
+        "x": 2639.6666870117188,
+        "y": 4225.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "749face3.2a032c",
+        "type": "save",
+        "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-otnidx-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-otnidx-uuid`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
+        "comments": "",
+        "outputs": 1,
+        "x": 2670.6666870117188,
+        "y": 4264.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "d1e29877.e2638",
+        "type": "save",
+        "name": "save tmp.the-connectivity relationship to vpn-binding-otnidx, in AAI",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $tmp.the-connectivity.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.the-connectivity.connectivity-id`\" />",
+        "comments": "",
+        "outputs": 1,
+        "x": 2641.6666870117188,
+        "y": 4337.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "ca553073.a3999",
+        "type": "comment",
+        "name": "update the founded connectivity to have a new coupling-flag",
+        "info": "",
+        "comments": "",
+        "x": 2611.6666870117188,
+        "y": 4053.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": []
+    },
+    {
+        "id": "30b58e5f.9a5412",
+        "type": "set",
+        "name": "set newFlag",
+        "xml": "<set>\n<parameter name='tmp.newFlag' value=\"`$tmp.the-connectivity.coupling-flag + '-' +\n                                               $tmp.srcTtpdstTtpPair`\" />\n\n\n",
+        "comments": "",
+        "x": 2497.6666870117188,
+        "y": 4092.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": []
+    },
+    {
+        "id": "b32f2c11.a0cbd",
+        "type": "save",
+        "name": "update connectivity resource in AAI",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.the-connectivity.connectivity-id`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Modified' />\n<parameter name='coupling-flag' value='`$tmp.newFlag`' />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2561.6666870117188,
+        "y": 4137.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "b26dba6c.6455b",
+        "type": "comment",
+        "name": "the following two relationships should have already been there; if not => error",
+        "info": "",
+        "comments": "",
+        "x": 2653.6666870117188,
+        "y": 4187.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": []
+    },
+    {
+        "id": "f615578d.11ca3",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1639.6666870117188,
+        "y": 3554.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": [
+            [
+                "f0f8f4ff.e42fa",
+                "c456d560.e56b4",
+                "1c6b3c2b.a8cfe4",
+                "883e63bc.f1bf9",
+                "67b90a5f.a2bde4",
+                "44633bde.4c2f24"
+            ]
+        ]
+    },
+    {
+        "id": "1d9dc789.fabfa",
+        "type": "outcomeFalse",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1501.6666870117188,
+        "y": 3550.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": [
+            [
+                "f615578d.11ca3"
+            ]
+        ]
+    },
+    {
+        "id": "5f9745ba.8cabdc",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 2299.6666870117188,
+        "y": 4017.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": [
+            [
+                "58dad5a1.4283d4",
+                "30b58e5f.9a5412",
+                "b32f2c11.a0cbd",
+                "d1e29877.e2638"
+            ]
+        ]
+    },
+    {
+        "id": "fe407594.64cba8",
+        "type": "comment",
+        "name": "loop through the relationships of this founded connectivity, then",
+        "info": "then find the vpn-binding that has same src ttp and dst ttp as this one",
+        "comments": "",
+        "x": 2304.6666870117188,
+        "y": 4442.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": []
+    },
+    {
+        "id": "c41409e5.b5d3c",
+        "type": "for",
+        "name": "for each relationship",
+        "xml": "<for silentFailure='true' index='tcridx' start='0' end='`$tmp.the-connectivity.relationship-list.relationship_length`' >\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2646.6666870117188,
+        "y": 4478.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": [
+            [
+                "edec3f37.241e6"
+            ]
+        ]
+    },
+    {
+        "id": "edec3f37.241e6",
+        "type": "switchNode",
+        "name": "switch related-to",
+        "xml": "<switch test='`$tmp.the-connectivity.relationship-list.relationship[$tcridx].related-to`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2858.6666870117188,
+        "y": 4476.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": [
+            [
+                "1919beb6.7cb971"
+            ]
+        ]
+    },
+    {
+        "id": "1919beb6.7cb971",
+        "type": "outcome",
+        "name": "vpn-binding",
+        "xml": "<outcome value='vpn-binding'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3042.6666870117188,
+        "y": 4474.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": [
+            [
+                "df4bf19a.978d2"
+            ]
+        ]
+    },
+    {
+        "id": "df4bf19a.978d2",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 3221.6666870117188,
+        "y": 4479.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": [
+            [
+                "89ff485c.8db648",
+                "2bf1f71c.a919d"
+            ]
+        ]
+    },
+    {
+        "id": "2bf1f71c.a919d",
+        "type": "set",
+        "name": "unset tmp.aai.vpn-binding",
+        "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value='' />\n",
+        "comments": "",
+        "x": 3438.6666870117188,
+        "y": 4410.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": []
+    },
+    {
+        "id": "89ff485c.8db648",
+        "type": "save",
+        "name": "get vpn-binding from aai",
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-binding\"\n\t    key=\"vpn-binding.vpn-id = $tmp.the-connectivity.relationship-list.relationship[$tcridx].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.vpn-binding\" >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3431.6666870117188,
+        "y": 4496.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": [
+            [
+                "5ee5ca48.dc9864",
+                "e1c034fb.99a648",
+                "c5ac5c6f.6f9258"
+            ]
+        ]
+    },
+    {
+        "id": "e1c034fb.99a648",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3645.1576538085938,
+        "y": 4481.473937988281,
+        "z": "ab59e982.86c81",
+        "wires": [
+            [
+                "6e271c06.d0d73c"
+            ]
+        ]
+    },
+    {
+        "id": "6e271c06.d0d73c",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
+        "comments": "",
+        "x": 3807.7291870117188,
+        "y": 4480.7596435546875,
+        "z": "ab59e982.86c81",
+        "wires": []
+    },
+    {
+        "id": "38e2891f.3394ee",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+        "comments": "",
+        "x": 3808.6666870117188,
+        "y": 4525.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": []
+    },
+    {
+        "id": "c5ac5c6f.6f9258",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3640.6666870117188,
+        "y": 4525.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": [
+            [
+                "38e2891f.3394ee"
+            ]
+        ]
+    },
+    {
+        "id": "5ee5ca48.dc9864",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3642.6666870117188,
+        "y": 4585.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": [
+            [
+                "e13c4300.ac87f"
+            ]
+        ]
+    },
+    {
+        "id": "e13c4300.ac87f",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 3811.6666870117188,
+        "y": 4584.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": [
+            [
+                "3fedffc1.068a9"
+            ]
+        ]
+    },
+    {
+        "id": "9f0cdaa9.449a9",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 2435.6666870117188,
+        "y": 4476.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": [
+            [
+                "c41409e5.b5d3c",
+                "ef03524f.322ab",
+                "a41cf4f1.35b988"
+            ]
+        ]
+    },
+    {
+        "id": "3fedffc1.068a9",
+        "type": "switchNode",
+        "name": "switch srcTtp",
+        "xml": "<switch test='`$tmp.aai.vpn-binding.src-access-ltp-id == $tmp.otninfoProtect[$otnidx].srcPort.src-tunnel-tp-id`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4010.6666870117188,
+        "y": 4585.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": [
+            [
+                "46797ae5.8f5fdc"
+            ]
+        ]
+    },
+    {
+        "id": "46797ae5.8f5fdc",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4173.666687011719,
+        "y": 4583.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": [
+            [
+                "26801daf.757d4a"
+            ]
+        ]
+    },
+    {
+        "id": "26801daf.757d4a",
+        "type": "switchNode",
+        "name": "switch dstTtp",
+        "xml": "<switch test='`$tmp.aai.vpn-binding.dst-access-ltp-id == $tmp.otninfoProtect[$otnidx].dstPort.dst-tunnel-tp-id`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4354.666687011719,
+        "y": 4583.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": [
+            [
+                "4ecd0d28.02b6dc"
+            ]
+        ]
+    },
+    {
+        "id": "4ecd0d28.02b6dc",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4517.666687011719,
+        "y": 4581.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": [
+            [
+                "2b446601.7eb632"
+            ]
+        ]
+    },
+    {
+        "id": "efbe91c3.9535c8",
+        "type": "set",
+        "name": "set tmp.the-vpn-binding",
+        "xml": "<set>\n<parameter name='tmp.the-vpn-binding.' value='`$tmp.aai.vpn-binding.`' />\n",
+        "comments": "",
+        "x": 4874.666687011719,
+        "y": 4588.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": []
+    },
+    {
+        "id": "2b446601.7eb632",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 4656.666687011719,
+        "y": 4580.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": [
+            [
+                "efbe91c3.9535c8",
+                "1b35126e.c915be"
+            ]
+        ]
+    },
+    {
+        "id": "1b35126e.c915be",
+        "type": "break",
+        "name": "break",
+        "xml": "<break>\n",
+        "comments": "",
+        "x": 4820.666687011719,
+        "y": 4632.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": []
+    },
+    {
+        "id": "ef03524f.322ab",
+        "type": "set",
+        "name": "unset tmp.the-vpn-binding",
+        "xml": "<set>\n<parameter name='tmp.the-vpn-binding.' value='' />\n",
+        "comments": "",
+        "x": 2656.6666870117188,
+        "y": 4439.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": []
+    },
+    {
+        "id": "bb2c64f6.a88498",
+        "type": "comment",
+        "name": "increase the bw of the-vpn-binding and change status to modified",
+        "info": "increase the bw of the-vpn-binding\nchange status to modified\n",
+        "comments": "",
+        "x": 2745.6666870117188,
+        "y": 4613.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": []
+    },
+    {
+        "id": "a41cf4f1.35b988",
+        "type": "save",
+        "name": "update vpn-binding otnIdx resource (aka. OTN) in AAI",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.the-vpn-binding.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.the-vpn-binding.vpn-id`' />\n<!--<parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />-->\n<!--<parameter name='customer-vpn-id' value='`($maxtpn + $gfp)`' />-->\n<parameter name='customer-vpn-id' value='`($tmp.the-vpn-binding.customer-vpn-id + $gfp)`' />\n\n<parameter name='route-distinguisher' value='`$gfp`' />\n<parameter name='operational-status' value='Modified' />\n\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2715.6666870117188,
+        "y": 4673.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "655b0cf9.434f14",
+        "type": "execute",
+        "name": "execute UUID generator for vpn-binding $otnidx",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.vpn-binding-otnidx-uuid\"/>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1550.6666870117188,
+        "y": 2841.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "390f0f63.f5713",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1630.6666870117188,
+        "y": 2892.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": [
+            [
+                "46e17225.a2db0c"
+            ]
+        ]
+    },
+    {
+        "id": "46e17225.a2db0c",
+        "type": "set",
+        "name": "set access-provider-id and client-id",
+        "xml": "<set>\n<parameter name='tmp.access-provider-id' value='`$tmp.otninfoProtect[$otnidx].srcPort.src-access-provider-id`' />\n<parameter name='tmp.access-client-id' value='`$tmp.otninfoProtect[$otnidx].srcPort.src-access-client-id`' />\n<parameter name='tmp.access-topology-id' value='`$tmp.otninfoProtect[$otnidx].srcPort.src-access-topology-id`' />\n<parameter name='tmp.srcdstpnf-id' value='`$tmp.otninfoProtect[$otnidx].srcPort.src-access-node-id`' />\n",
+        "comments": "",
+        "x": 1844.6666870117188,
+        "y": 2891.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": []
+    },
+    {
+        "id": "2286c595.dee83a",
+        "type": "set",
+        "name": "unset parameters",
+        "xml": "<set>\n<parameter name='tmp.srcdstpnf-name' value='' />\n<parameter name='prop.vpn-binding-otnidx-uuid' value='' />\n<parameter name='tmp.access-provider-id' value='' />\n<parameter name='tmp.access-client-id' value='' />\n<parameter name='tmp.access-topology-id' value='' />\n<parameter name='tmp.srcdstpnf-id' value='' />\n<parameter name='tmp.aai.srcdst-pnf.' value='' />\n<parameter name='tmp.domainG.esr-thirdparty-id' value='' />\n<parameter name='tmp.aai.domainG.esr-thirdparty-sdnc.' value='' />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.url' value='' />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.user' value='' />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.password' value='' />\n<parameter name='tmp.srcTtpdstTtpPair' value='' />\n\n\n",
+        "comments": "",
+        "x": 1210.5665893554688,
+        "y": 2476.89990234375,
+        "z": "ab59e982.86c81",
+        "wires": []
+    },
+    {
+        "id": "62f58207.69b144",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic='true'>",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 985.2000122070312,
+        "y": 2493.13330078125,
+        "z": "ab59e982.86c81",
+        "wires": [
+            [
+                "2286c595.dee83a",
+                "4da32200.1a505"
+            ]
+        ]
     }
 ]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-create-clean.json b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-create-clean.json
index c1b37ce6..338c6456 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": "458f4ac.c4718b4",
+    "id": "eebfe6b4.36c4f8",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 134.88333129882812,
-    "y": 96.88333129882812,
-    "z": "4456793a.59a288",
+    "x": 140,
+    "y": 119,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "2b796419.174294"
+        "f39097a1.daa63"
       ]
     ]
   },
   {
-    "id": "2b796419.174294",
+    "id": "f39097a1.daa63",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -22,5709 +22,7887 @@
     "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": 419.1690216064453,
-    "y": 158.12143993377686,
-    "z": "4456793a.59a288",
+    "x": 424.2856903076172,
+    "y": 180.23810863494873,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "81638429.4a926"
+        "af444c12.6df4"
       ]
     ]
   },
   {
-    "id": "81638429.4a926",
+    "id": "af444c12.6df4",
     "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": 425.3119354248047,
-    "y": 242.88336181640625,
-    "z": "4456793a.59a288",
+    "x": 430.42860412597656,
+    "y": 265.0000305175781,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "49ee9c33.493f7c"
+        "cd7fb41b.b80af8"
       ]
     ]
   },
   {
-    "id": "49ee9c33.493f7c",
+    "id": "cd7fb41b.b80af8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 774.8833312988281,
-    "y": 301.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 780,
+    "y": 324,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "a4831915.5eaaa",
-        "7639e853.9511c8",
-        "a54eb7d5.3629"
+        "1330d7b6.40f6",
+        "327e5a08.352bde",
+        "b36ceae.9917d98"
       ]
     ]
   },
   {
-    "id": "a4831915.5eaaa",
+    "id": "1330d7b6.40f6",
     "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": 1076.2168273925781,
-    "y": 572.8136291503906,
-    "z": "4456793a.59a288",
+    "x": 1081.33349609375,
+    "y": 594.9302978515625,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "7639e853.9511c8",
+    "id": "327e5a08.352bde",
     "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": 1097.6452941894531,
-    "y": 275.2166442871094,
-    "z": "4456793a.59a288",
+    "x": 1102.761962890625,
+    "y": 297.33331298828125,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "46a7c921.f80be8",
-        "fa1c1252.bcac98",
-        "22347b09.105eec"
+        "393ddb72.9cdaac",
+        "27423ab.7bf7dc6",
+        "e70357b.8e78fa8"
       ]
     ]
   },
   {
-    "id": "46a7c921.f80be8",
+    "id": "393ddb72.9cdaac",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1322.6452941894531,
-    "y": 133.21664428710938,
-    "z": "4456793a.59a288",
+    "x": 1327.761962890625,
+    "y": 155.33331298828125,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "f818b9cf.ba44c"
+        "db827fdb.ec8a7"
       ]
     ]
   },
   {
-    "id": "fa1c1252.bcac98",
+    "id": "27423ab.7bf7dc6",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1318.1362609863281,
-    "y": 202.79067993164062,
-    "z": "4456793a.59a288",
+    "x": 1323.2529296875,
+    "y": 224.9073486328125,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "7ac2bf1b.1c3bb8"
+        "2aba6522.745fa2"
       ]
     ]
   },
   {
-    "id": "22347b09.105eec",
+    "id": "e70357b.8e78fa8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1306.6452941894531,
-    "y": 249.21664428710938,
-    "z": "4456793a.59a288",
+    "x": 1311.761962890625,
+    "y": 271.33331298828125,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "9932a9c7.205738"
+        "85c2ab27.5d7c"
       ]
     ]
   },
   {
-    "id": "3db9725e.eccbce",
+    "id": "d67dd652.2acc48",
     "type": "comment",
     "name": "new for TransportSlicing",
     "info": "",
     "comments": "",
-    "x": 1076.6452941894531,
-    "y": 163.21664428710938,
-    "z": "4456793a.59a288",
+    "x": 1081.761962890625,
+    "y": 185.33331298828125,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "a54eb7d5.3629",
+    "id": "b36ceae.9917d98",
     "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": 1064.6452941894531,
-    "y": 215.21664428710938,
-    "z": "4456793a.59a288",
+    "x": 1069.761962890625,
+    "y": 237.33331298828125,
+    "z": "f8944603.71553",
     "wires": [
       []
     ]
   },
   {
-    "id": "f818b9cf.ba44c",
+    "id": "db827fdb.ec8a7",
     "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": 1562.8833312988281,
-    "y": 129.88333129882812,
-    "z": "4456793a.59a288",
+    "x": 1568,
+    "y": 152,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "8e919d6f.673508",
-        "51e0925d.04913c"
+        "cb5b5e94.b15ef8",
+        "b997ad22.d70e8"
       ]
     ]
   },
   {
-    "id": "7ac2bf1b.1c3bb8",
+    "id": "2aba6522.745fa2",
     "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": 1472.9457092285156,
-    "y": 205.74310302734375,
-    "z": "4456793a.59a288",
+    "x": 1478.0623779296875,
+    "y": 227.85977172851562,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "9932a9c7.205738",
+    "id": "85c2ab27.5d7c",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 1476.8833312988281,
-    "y": 249.88333129882812,
-    "z": "4456793a.59a288",
+    "x": 1482,
+    "y": 272,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "8e919d6f.673508",
+    "id": "cb5b5e94.b15ef8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1767.8833312988281,
-    "y": 166.88333129882812,
-    "z": "4456793a.59a288",
+    "x": 1773,
+    "y": 189,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "68453177.cb78b8"
+        "3cb72715.02a808"
       ]
     ]
   },
   {
-    "id": "51e0925d.04913c",
+    "id": "b997ad22.d70e8",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1777.8833312988281,
-    "y": 93.88333129882812,
-    "z": "4456793a.59a288",
+    "x": 1783,
+    "y": 116,
+    "z": "f8944603.71553",
     "wires": [
       []
     ]
   },
   {
-    "id": "68453177.cb78b8",
+    "id": "3cb72715.02a808",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1760.8833312988281,
-    "y": 241.88333129882812,
-    "z": "4456793a.59a288",
+    "x": 1766,
+    "y": 264,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "a82eb2b4.74145",
-        "2f11fd49.33bf4a",
-        "3f7479d2.cf6ebe",
-        "9bc906e5.702fc8",
-        "a8e7354f.a1833"
+        "ebf5f2d6.b4c7b8",
+        "490f1cae.a20b64",
+        "b4dd975f.8385a8",
+        "43a803a5.2842f4",
+        "651a17c0.63b678"
       ]
     ]
   },
   {
-    "id": "c81e4e53.d33bf",
+    "id": "d707b8ba.d22b28",
     "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": 2246.883331298828,
-    "y": 292.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 2252,
+    "y": 315,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "93e1f14a.5a9588",
-        "d05d8571.8f54d8",
-        "43bb6a89.efb504"
+        "3717142f.9eacbc",
+        "81f224b1.8ce278",
+        "360e18d9.8e8878"
       ]
     ]
   },
   {
-    "id": "93e1f14a.5a9588",
+    "id": "3717142f.9eacbc",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2462.883331298828,
-    "y": 359.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 2468,
+    "y": 382,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "29fa3a31.28ab1e"
+        "90fe9f39.2d3b48"
       ]
     ]
   },
   {
-    "id": "d05d8571.8f54d8",
+    "id": "81f224b1.8ce278",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2463.374298095703,
-    "y": 259.4573059082031,
-    "z": "4456793a.59a288",
+    "x": 2468.490966796875,
+    "y": 281.573974609375,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "9a07cfe7.b03588"
+        "fa7677d5.848dd"
       ]
     ]
   },
   {
-    "id": "43bb6a89.efb504",
+    "id": "360e18d9.8e8878",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2458.883331298828,
-    "y": 308.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 2464,
+    "y": 331,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "b1a3ba46.e979e8"
+        "72c2923b.56a34c"
       ]
     ]
   },
   {
-    "id": "a82eb2b4.74145",
+    "id": "ebf5f2d6.b4c7b8",
     "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": 1963.8833312988281,
-    "y": 273.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 1969,
+    "y": 296,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "9e7211a2.fa3648",
-        "c81e4e53.d33bf",
-        "d050303.0f4a3d",
-        "c2f95f80.985fc"
+        "618e3f4f.a42bf",
+        "d707b8ba.d22b28",
+        "e8527008.db6228",
+        "a669b945.663408"
       ]
     ]
   },
   {
-    "id": "9e7211a2.fa3648",
+    "id": "618e3f4f.a42bf",
     "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": 2243.883331298828,
-    "y": 211.88333129882812,
-    "z": "4456793a.59a288",
+    "x": 2249,
+    "y": 234,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "9bc906e5.702fc8",
+    "id": "43a803a5.2842f4",
     "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": 1937.8833312988281,
-    "y": 223.88333129882812,
-    "z": "4456793a.59a288",
+    "x": 1943,
+    "y": 246,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "2f11fd49.33bf4a",
+    "id": "490f1cae.a20b64",
     "type": "get-resource",
     "name": "get-resource pnfs-list",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"pnfs\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/pnfs?depth=0'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"ccsdkTopopnfs\" >",
     "comments": "",
     "outputs": 1,
-    "x": 1980.8833312988281,
-    "y": 82.88333129882812,
-    "z": "4456793a.59a288",
+    "x": 1986,
+    "y": 105,
+    "z": "f8944603.71553",
     "wires": [
       []
     ]
   },
   {
-    "id": "3f7479d2.cf6ebe",
+    "id": "b4dd975f.8385a8",
     "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": 1992.8833312988281,
-    "y": 123.88333129882812,
-    "z": "4456793a.59a288",
+    "x": 1998,
+    "y": 146,
+    "z": "f8944603.71553",
     "wires": [
       []
     ]
   },
   {
-    "id": "ea819687.b3e55",
+    "id": "d38afd8a.8bc96",
     "type": "comment",
     "name": "The following two nodes are for PCE",
     "info": "",
     "comments": "",
-    "x": 2017.8833312988281,
-    "y": 35.883331298828125,
-    "z": "4456793a.59a288",
+    "x": 2023,
+    "y": 58,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "a0a17876.3d9168",
+    "id": "8fedb211.a1c3d8",
     "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": 1937.8833312988281,
-    "y": 169.88333129882812,
-    "z": "4456793a.59a288",
+    "x": 1943,
+    "y": 192,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "9a07cfe7.b03588",
+    "id": "fa7677d5.848dd",
     "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": 2641.883331298828,
-    "y": 261.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 2647,
+    "y": 284,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "b1a3ba46.e979e8",
+    "id": "72c2923b.56a34c",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 2641.820831298828,
-    "y": 311.0235900878906,
-    "z": "4456793a.59a288",
+    "x": 2646.9375,
+    "y": 333.1402587890625,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "29fa3a31.28ab1e",
+    "id": "90fe9f39.2d3b48",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 2643.820831298828,
-    "y": 362.0235900878906,
-    "z": "4456793a.59a288",
+    "x": 2648.9375,
+    "y": 384.1402587890625,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "ccdb352a.c0afb"
+        "458d5965.a3abf"
       ]
     ]
   },
   {
-    "id": "ccdb352a.c0afb",
+    "id": "458d5965.a3abf",
     "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": 2936.820831298828,
-    "y": 309.0235900878906,
-    "z": "4456793a.59a288",
+    "x": 2941.9375,
+    "y": 331.1402587890625,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "1d1c178.a002b69",
-        "a96469cb.c566d8",
-        "1d270f4d.7f92d9"
+        "9e8135ff.08a04",
+        "11480c56.53825c",
+        "c18b528b.950eb"
       ]
     ]
   },
   {
-    "id": "a96469cb.c566d8",
+    "id": "11480c56.53825c",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3210.311798095703,
-    "y": 201.59756469726562,
-    "z": "4456793a.59a288",
+    "x": 3245.428436279297,
+    "y": 63.7142333984375,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "a9051800.9d7288"
+        "fafa91c8.b89"
       ]
     ]
   },
   {
-    "id": "a9051800.9d7288",
+    "id": "fafa91c8.b89",
     "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": 3387.883331298828,
-    "y": 201.88333129882812,
-    "z": "4456793a.59a288",
+    "x": 3422.999969482422,
+    "y": 64,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "1d270f4d.7f92d9",
+    "id": "c18b528b.950eb",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3205.820831298828,
-    "y": 251.02359008789062,
-    "z": "4456793a.59a288",
+    "x": 3240.937469482422,
+    "y": 113.1402587890625,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "74b9715b.81c6"
+        "c9c4d95e.e78bc8"
       ]
     ]
   },
   {
-    "id": "74b9715b.81c6",
+    "id": "c9c4d95e.e78bc8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3387.820831298828,
-    "y": 251.02359008789062,
-    "z": "4456793a.59a288",
+    "x": 3422.937469482422,
+    "y": 113.1402587890625,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "1d1c178.a002b69",
+    "id": "9e8135ff.08a04",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3209.820831298828,
-    "y": 302.0235900878906,
-    "z": "4456793a.59a288",
+    "x": 3244.937469482422,
+    "y": 164.1402587890625,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "dea72b0a.7f4d98"
+        "249c683e.fa6548"
       ]
     ]
   },
   {
-    "id": "dea72b0a.7f4d98",
+    "id": "249c683e.fa6548",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3389.820831298828,
-    "y": 302.0235900878906,
-    "z": "4456793a.59a288",
+    "x": 3424.937469482422,
+    "y": 164.1402587890625,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "1a6bb71b.cc26c9"
+        "8380148b.ccdda"
       ]
     ]
   },
   {
-    "id": "1a6bb71b.cc26c9",
+    "id": "8380148b.ccdda",
     "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": 2955.883331298828,
-    "y": 436.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 2961,
+    "y": 459,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "24693fb2.e93b7",
-        "a9c05c16.6229b8"
+        "f9f860ee.48ada",
+        "3ee71a32.7e39ae"
       ]
     ]
   },
   {
-    "id": "a9c05c16.6229b8",
+    "id": "3ee71a32.7e39ae",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3265.883331298828,
-    "y": 443.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 3300.999969482422,
+    "y": 306,
+    "z": "f8944603.71553",
     "wires": [
       []
     ]
   },
   {
-    "id": "24693fb2.e93b7",
+    "id": "f9f860ee.48ada",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3264.883331298828,
-    "y": 497.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 3299.999969482422,
+    "y": 360,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "54d9e040.3e5a2"
+        "88c3b86.63e2c48"
       ]
     ]
   },
   {
-    "id": "7514cb1e.22b7cc",
+    "id": "b0fb22ca.f9ce1",
     "type": "outcome",
     "name": "network-policy",
     "xml": "<outcome value='network-policy'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4009.883331298828,
-    "y": 451.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 4044.999969482422,
+    "y": 314,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "1a1e9340.1cb465"
+        "5f3f920d.e5225c"
       ]
     ]
   },
   {
-    "id": "1a1e9340.1cb465",
+    "id": "5f3f920d.e5225c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4186.883209228516,
-    "y": 444.8832092285156,
-    "z": "4456793a.59a288",
+    "x": 4221.999847412109,
+    "y": 306.9998779296875,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "1cd3fabc.2c7055",
-        "df5b418a.0dd23"
+        "8197a230.f5fc28",
+        "add943b3.661de"
       ]
     ]
   },
   {
-    "id": "54d9e040.3e5a2",
+    "id": "88c3b86.63e2c48",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3428.883331298828,
-    "y": 423.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 3463.999969482422,
+    "y": 286,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "dde05d5d.d568e8",
-        "89905857.784518"
+        "b1327250.c3733",
+        "de9a0d51.d824a"
       ]
     ]
   },
   {
-    "id": "dde05d5d.d568e8",
+    "id": "b1327250.c3733",
     "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": 3709.883331298828,
-    "y": 379.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 3744.999969482422,
+    "y": 242,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "abe51cd7.f8f208"
+        "64d386dc.4f4038"
       ]
     ]
   },
   {
-    "id": "abe51cd7.f8f208",
+    "id": "64d386dc.4f4038",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3971.883331298828,
-    "y": 379.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 4006.999969482422,
+    "y": 242,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "7514cb1e.22b7cc"
+        "b0fb22ca.f9ce1"
       ]
     ]
   },
   {
-    "id": "1cd3fabc.2c7055",
+    "id": "8197a230.f5fc28",
     "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": 4429.883209228516,
-    "y": 401.8832092285156,
-    "z": "4456793a.59a288",
+    "x": 4464.999847412109,
+    "y": 263.9998779296875,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "df5b418a.0dd23",
+    "id": "add943b3.661de",
     "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": 4418.883209228516,
-    "y": 456.8832092285156,
-    "z": "4456793a.59a288",
+    "x": 4453.999847412109,
+    "y": 318.9998779296875,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "b1c8bb90.0c2e78",
-        "2f32ddcf.c1426a",
-        "a81fdee7.10c348"
+        "584012e4.8af54c",
+        "84e11e56.e2a698",
+        "b5114711.48fe28"
       ]
     ]
   },
   {
-    "id": "a81fdee7.10c348",
+    "id": "b5114711.48fe28",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4671.883331298828,
-    "y": 342.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 4705.000213623047,
+    "y": 260,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "933dded8.905d48"
+        "3ff18282.41fa7e"
       ]
     ]
   },
   {
-    "id": "933dded8.905d48",
+    "id": "3ff18282.41fa7e",
     "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.454864501953,
-    "y": 343.1690979003906,
-    "z": "4456793a.59a288",
+    "x": 4853.571746826172,
+    "y": 260.2857666015625,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "4ff8891b.b27e6",
+    "id": "576f251.536f1dc",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 4819.392364501953,
-    "y": 387.3093566894531,
-    "z": "4456793a.59a288",
+    "x": 4852.509246826172,
+    "y": 304.426025390625,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "2f32ddcf.c1426a",
+    "id": "84e11e56.e2a698",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4660.392364501953,
-    "y": 387.3093566894531,
-    "z": "4456793a.59a288",
+    "x": 4693.509246826172,
+    "y": 304.426025390625,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "4ff8891b.b27e6"
+        "576f251.536f1dc"
       ]
     ]
   },
   {
-    "id": "b1c8bb90.0c2e78",
+    "id": "584012e4.8af54c",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4667.392364501953,
-    "y": 466.3093566894531,
-    "z": "4456793a.59a288",
+    "x": 4700.509246826172,
+    "y": 383.426025390625,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "9b0431ef.52336"
+        "84e0295.fec0058"
       ]
     ]
   },
   {
-    "id": "9b0431ef.52336",
+    "id": "84e0295.fec0058",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4806.392364501953,
-    "y": 466.3093566894531,
-    "z": "4456793a.59a288",
+    "x": 4839.509246826172,
+    "y": 383.426025390625,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "30420590.b9ff82",
-        "80a75b67.8413b8"
+        "40dc732c.a37574",
+        "72f9e36c.5c6004"
       ]
     ]
   },
   {
-    "id": "30420590.b9ff82",
+    "id": "40dc732c.a37574",
     "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": 5011.883331298828,
-    "y": 463.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 5045.000213623047,
+    "y": 381,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "80a75b67.8413b8",
+    "id": "72f9e36c.5c6004",
     "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": 5010.883331298828,
-    "y": 509.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 5044.000213623047,
+    "y": 427,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "89905857.784518",
+    "id": "de9a0d51.d824a",
     "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": 3526.883331298828,
-    "y": 495.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 3561.999969482422,
+    "y": 358,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "b46dcd3d.f4afe8"
+        "1f9cf648.b23842"
       ]
     ]
   },
   {
-    "id": "b46dcd3d.f4afe8",
+    "id": "1f9cf648.b23842",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3806.883331298828,
-    "y": 495.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 3841.999969482422,
+    "y": 358,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "f685aa80.8cfb4"
+        "9a7f86a9.e4bc3"
       ]
     ]
   },
   {
-    "id": "f685aa80.8cfb4",
+    "id": "9a7f86a9.e4bc3",
     "type": "outcome",
     "name": "logical-link",
     "xml": "<outcome value='logical-link'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2219.8834533691406,
-    "y": 748.8834533691406,
-    "z": "4456793a.59a288",
+    "x": 2225.0001220703125,
+    "y": 771.0001220703125,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "a18b2354.2da15"
+        "a00c69ca.adce48"
       ]
     ]
   },
   {
-    "id": "a18b2354.2da15",
+    "id": "a00c69ca.adce48",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 2396.883331298828,
-    "y": 741.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 2402,
+    "y": 764,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "ea2df6b1.4ac208",
-        "5238e333.611ed4"
+        "b1915aed.463e4",
+        "2d618162.692d86"
       ]
     ]
   },
   {
-    "id": "ea2df6b1.4ac208",
+    "id": "b1915aed.463e4",
     "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": 2639.883331298828,
-    "y": 698.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 2645,
+    "y": 721,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "5238e333.611ed4",
+    "id": "2d618162.692d86",
     "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": 2628.883331298828,
-    "y": 753.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 2634,
+    "y": 776,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "d29bd2a6.f0278",
-        "aae66833.e493",
-        "51948363.691cec"
+        "e482931e.42ecd",
+        "ed5f6487.2f87b",
+        "f8d33751.7b5a4"
       ]
     ]
   },
   {
-    "id": "d29bd2a6.f0278",
+    "id": "e482931e.42ecd",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2920.374298095703,
-    "y": 732.4573059082031,
-    "z": "4456793a.59a288",
+    "x": 2925.490966796875,
+    "y": 754.573974609375,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "a5baff8.5c15f"
+        "57635b4b.26640c"
       ]
     ]
   },
   {
-    "id": "aae66833.e493",
+    "id": "ed5f6487.2f87b",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2908.883331298828,
-    "y": 776.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 2914,
+    "y": 799,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "590adc04.7c8c64"
+        "a7b92e8f.8c52e8"
       ]
     ]
   },
   {
-    "id": "a5baff8.5c15f",
+    "id": "57635b4b.26640c",
     "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": 3068.945831298828,
-    "y": 732.7430725097656,
-    "z": "4456793a.59a288",
+    "x": 3074.0625,
+    "y": 754.8597412109375,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "590adc04.7c8c64",
+    "id": "a7b92e8f.8c52e8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3067.883331298828,
-    "y": 776.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 3073,
+    "y": 799,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "51948363.691cec",
+    "id": "f8d33751.7b5a4",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2915.883331298828,
-    "y": 855.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 2921,
+    "y": 878,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "138db6d7.8d5031"
+        "98a40400.3efa78"
       ]
     ]
   },
   {
-    "id": "138db6d7.8d5031",
+    "id": "98a40400.3efa78",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3054.883331298828,
-    "y": 855.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 3060,
+    "y": 878,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "7a4c5f2f.9027d8",
-        "f3e41369.61302",
-        "bb0c73ed.00d09",
-        "8e9b40a2.60b6c",
-        "bda9878c.43ffc8",
-        "746b18d4.be3d18",
-        "15698ad5.b40d3d",
-        "3d22a200.42e29e",
-        "ff1965cc.9c6318",
-        "a8011cb7.dd8288",
-        "60be6b60.c49e7c",
-        "77fe2bdc.eed0c4",
-        "c658e7ef.0b11d8",
-        "d48a24b6.db8ce8"
+        "71736994.8ef448",
+        "262a2cdd.1722ec",
+        "6dffa8a4.87ef28",
+        "19dc8ab.73ff975",
+        "442ee5c4.7ebc14",
+        "55e39af5.a2b61c",
+        "22efa8c9.c8576",
+        "d6e1611b.9ddcf",
+        "b18620c8.640928",
+        "11e0f934.faeab7",
+        "b71f57a7.e2a288",
+        "f7d11626.bd108",
+        "7d22810d.66642",
+        "5fc2699f.6720b8",
+        "d4db1de6.243c9",
+        "4c9f1a43.e137e4",
+        "f953800.9cf34",
+        "1931dff5.72d728",
+        "be1fed24.75522",
+        "3ab03c8.bdf8544",
+        "d566dc7.835f6a"
       ]
     ]
   },
   {
-    "id": "f45cdd5f.c90798",
+    "id": "8992052.d396a78",
     "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": 3368.883331298828,
-    "y": 661.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 3409,
+    "y": 411.9999694824219,
+    "z": "f8944603.71553",
     "wires": [
       []
     ]
   },
   {
-    "id": "7a4c5f2f.9027d8",
+    "id": "71736994.8ef448",
     "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": 3349.883331298828,
-    "y": 711.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 3389.9999389648438,
+    "y": 490.9999694824219,
+    "z": "f8944603.71553",
     "wires": [
       []
     ]
   },
   {
-    "id": "d48a24b6.db8ce8",
+    "id": "5fc2699f.6720b8",
     "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": 3306.883331298828,
-    "y": 756.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 3346.9999389648438,
+    "y": 535.9999694824219,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "f3e41369.61302",
+    "id": "262a2cdd.1722ec",
     "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": 3281.883331298828,
-    "y": 819.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 3311.999969482422,
+    "y": 589.9999694824219,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "bb0c73ed.00d09",
+    "id": "6dffa8a4.87ef28",
     "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": 3282.883331298828,
-    "y": 874.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 3312.999969482422,
+    "y": 644.9999694824219,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "8e9b40a2.60b6c",
+    "id": "19dc8ab.73ff975",
     "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": 3298.883331298828,
-    "y": 922.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 3310.999969482422,
+    "y": 908.9999694824219,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "5e527f7c.215cc8",
-        "e57980fe.5f9758",
-        "d6304ea1.fb76e"
+        "6a238476.e2fb94",
+        "535decdf.f72024",
+        "ae1cf5c7.80a6f8"
       ]
     ]
   },
   {
-    "id": "bda9878c.43ffc8",
+    "id": "442ee5c4.7ebc14",
     "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": 3287.883331298828,
-    "y": 1009.8832092285156,
-    "z": "4456793a.59a288",
+    "x": 3305.999969482422,
+    "y": 969.9998474121094,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "be8da30d.6c1bf8",
-        "59df3d01.4ec704",
-        "23f36ff9.6f46c"
+        "3acf80af.f43f8",
+        "d256cf0d.9aea78",
+        "e101efde.aba"
       ]
     ]
   },
   {
-    "id": "5e527f7c.215cc8",
+    "id": "6a238476.e2fb94",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3499.883331298828,
-    "y": 806.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 3621.999969482422,
+    "y": 679.9999694824219,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "7280738b.1a48a4"
+        "ab9f09fe.f29c98"
       ]
     ]
   },
   {
-    "id": "e57980fe.5f9758",
+    "id": "535decdf.f72024",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3495.392364501953,
-    "y": 856.3093566894531,
-    "z": "4456793a.59a288",
+    "x": 3617.509002685547,
+    "y": 729.4259948730469,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "74f46c1.d313d14"
+        "e4e6f924.884bf"
       ]
     ]
   },
   {
-    "id": "d6304ea1.fb76e",
+    "id": "ae1cf5c7.80a6f8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3499.392364501953,
-    "y": 909.3093566894531,
-    "z": "4456793a.59a288",
+    "x": 3621.509002685547,
+    "y": 782.4259948730469,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "1f52b8ab.2e56cf"
+        "ab5ff9c2.10c8a"
       ]
     ]
   },
   {
-    "id": "7280738b.1a48a4",
+    "id": "ab9f09fe.f29c98",
     "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": 3648.454864501953,
-    "y": 806.1690979003906,
-    "z": "4456793a.59a288",
+    "x": 3770.571502685547,
+    "y": 679.2857360839844,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "74f46c1.d313d14",
+    "id": "e4e6f924.884bf",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3638.392364501953,
-    "y": 856.3093566894531,
-    "z": "4456793a.59a288",
+    "x": 3760.509002685547,
+    "y": 729.4259948730469,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "be8da30d.6c1bf8",
+    "id": "3acf80af.f43f8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3510.883331298828,
-    "y": 979.8832092285156,
-    "z": "4456793a.59a288",
+    "x": 3583.9999389648438,
+    "y": 869.9998168945312,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "4c2e6e70.a93be8"
+        "87a2e14c.f364a"
       ]
     ]
   },
   {
-    "id": "59df3d01.4ec704",
+    "id": "d256cf0d.9aea78",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3506.392364501953,
-    "y": 1029.3092346191406,
-    "z": "4456793a.59a288",
+    "x": 3579.509002685547,
+    "y": 912.4258728027344,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "25d04654.5e839a"
+        "98a18e9a.d4f5a"
       ]
     ]
   },
   {
-    "id": "23f36ff9.6f46c",
+    "id": "e101efde.aba",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3507.392364501953,
-    "y": 1082.3092346191406,
-    "z": "4456793a.59a288",
+    "x": 3580.509002685547,
+    "y": 965.4258728027344,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "e7e2a18.77a626"
+        "4d45fe17.38da58"
       ]
     ]
   },
   {
-    "id": "4c2e6e70.a93be8",
+    "id": "87a2e14c.f364a",
     "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": 3659.454864501953,
-    "y": 979.1689758300781,
-    "z": "4456793a.59a288",
+    "x": 3732.5714721679688,
+    "y": 869.2855834960938,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "25d04654.5e839a",
+    "id": "98a18e9a.d4f5a",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3649.392364501953,
-    "y": 1029.3092346191406,
-    "z": "4456793a.59a288",
+    "x": 3722.509002685547,
+    "y": 912.4258728027344,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "1f52b8ab.2e56cf",
+    "id": "ab5ff9c2.10c8a",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3660.883331298828,
-    "y": 908.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 3782.999969482422,
+    "y": 781.9999694824219,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "37185a88.04a7d6"
+        "84478c6a.6d587"
       ]
     ]
   },
   {
-    "id": "e7e2a18.77a626",
+    "id": "4d45fe17.38da58",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3660.883331298828,
-    "y": 1081.8832092285156,
-    "z": "4456793a.59a288",
+    "x": 3733.999969482422,
+    "y": 964.9998474121094,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "2a90b49d.030114"
+        "2dfc998d.a2b3e6"
       ]
     ]
   },
   {
-    "id": "37185a88.04a7d6",
+    "id": "84478c6a.6d587",
     "type": "switchNode",
     "name": "switch nr type",
     "xml": "<switch test='`$tmp.aai.network-route-one.type`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3832.883331298828,
-    "y": 908.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 3957.999969482422,
+    "y": 755.9999694824219,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "b7871daf.9b4e8",
-        "5be956df.30349"
+        "be084505.b458",
+        "5b2d2057.dd8c4",
+        "83ce05e.7f315f8"
       ]
     ]
   },
   {
-    "id": "2a90b49d.030114",
+    "id": "2dfc998d.a2b3e6",
     "type": "switchNode",
     "name": "switch nr type",
     "xml": "<switch test='`$tmp.aai.network-route-two.type`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3833.883331298828,
-    "y": 1081.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 3917.999969482422,
+    "y": 872.9999694824219,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "7b05f3d6.ed8c14",
-        "ed6ce3d.aa0b8a"
+        "27a94561.e70e32",
+        "e39a6c9c.1e6dd8",
+        "fe4b773c.0eae98"
       ]
     ]
   },
   {
-    "id": "b7871daf.9b4e8",
+    "id": "be084505.b458",
     "type": "outcome",
     "name": "ROOT",
     "xml": "<outcome value='ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4008.883331298828,
-    "y": 887.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 4079.999969482422,
+    "y": 540.9999694824219,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "52465f0e.0c996"
+        "86b880d.ad45d"
       ]
     ]
   },
   {
-    "id": "5be956df.30349",
+    "id": "5b2d2057.dd8c4",
     "type": "outcome",
     "name": "LEAF",
     "xml": "<outcome value='LEAF'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4010.883331298828,
-    "y": 941.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 4081.999969482422,
+    "y": 594.9999694824219,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "98cbb890.5e8b88"
+        "10eaea8a.998afd"
       ]
     ]
   },
   {
-    "id": "7b05f3d6.ed8c14",
+    "id": "27a94561.e70e32",
     "type": "outcome",
     "name": "ROOT",
     "xml": "<outcome value='ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4009.883331298828,
-    "y": 1051.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 4099,
+    "y": 811,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "d0104e32.ac2ab8"
+        "e84921e.f8ecce"
       ]
     ]
   },
   {
-    "id": "ed6ce3d.aa0b8a",
+    "id": "e39a6c9c.1e6dd8",
     "type": "outcome",
     "name": "LEAF",
     "xml": "<outcome value='LEAF'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4011.883331298828,
-    "y": 1105.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 4101,
+    "y": 865,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "8e259d5c.262c5"
+        "b7ebf9b7.e2f348"
       ]
     ]
   },
   {
-    "id": "c68d1d99.71ec4",
+    "id": "4ebe65d0.3ec92c",
     "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": 4318.883331298828,
-    "y": 839.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 4389.999969482422,
+    "y": 492.9999694824219,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "97074ecd.08e3c8",
+    "id": "b5b3e89e.18b28",
     "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": 4311.883331298828,
-    "y": 937.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 4382.999969482422,
+    "y": 590.9999694824219,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "be8be686.f85c68",
+    "id": "81270995.5d712",
     "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": 4311.883331298828,
-    "y": 1024.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 4401,
+    "y": 784,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "3fa3de22.b5b33a",
+    "id": "7db54dd4.f36624",
     "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": 4315.883331298828,
-    "y": 1117.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 4405,
+    "y": 877,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "bd818350.b1a8a8",
+    "id": "3464c217.ddf82e",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3542.883331298828,
-    "y": 1526.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 3548,
+    "y": 1549,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "56ff5ea8.b777"
+        "5c2f3801.4eed3"
       ]
     ]
   },
   {
-    "id": "ec755270.8f35e8",
+    "id": "e12bcc6e.caae8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3552.374298095703,
-    "y": 1569.4573669433594,
-    "z": "4456793a.59a288",
+    "x": 3557.490966796875,
+    "y": 1591.5740356445312,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "e382dfde.5b31d8"
+        "fb3f4046.01bc4"
       ]
     ]
   },
   {
-    "id": "c9437d33.ef4e6",
+    "id": "a3a68564.d1334",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3540.883331298828,
-    "y": 1615.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 3546,
+    "y": 1638,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "f857e1e2.07be58"
+        "9f68f9be.d7aab8"
       ]
     ]
   },
   {
-    "id": "5760f0e8.25dba",
+    "id": "8a9b7f74.e3a568",
     "type": "comment",
     "name": "Question?",
     "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
     "comments": "",
-    "x": 3242.883331298828,
-    "y": 1488.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 3248,
+    "y": 1511,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "15698ad5.b40d3d",
+    "id": "22efa8c9.c8576",
     "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": 3285.883331298828,
-    "y": 1553.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 3291,
+    "y": 1576,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "bd818350.b1a8a8",
-        "ec755270.8f35e8",
-        "c9437d33.ef4e6"
+        "3464c217.ddf82e",
+        "e12bcc6e.caae8",
+        "a3a68564.d1334"
       ]
     ]
   },
   {
-    "id": "746b18d4.be3d18",
+    "id": "55e39af5.a2b61c",
     "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": 3286.883331298828,
-    "y": 1223.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 3292,
+    "y": 1246,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "16a316bf.36aa51",
-        "5dc43b13.af0e5c"
+        "cbe70d53.b79168",
+        "9e0cb899.0e0f"
       ]
     ]
   },
   {
-    "id": "5dc43b13.af0e5c",
+    "id": "9e0cb899.0e0f",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3509.883331298828,
-    "y": 1209.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 3512.999969482422,
+    "y": 1298.9999694824219,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "4015e76.5fd6098"
+        "300fab87.54654c"
       ]
     ]
   },
   {
-    "id": "16a316bf.36aa51",
+    "id": "cbe70d53.b79168",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3511.883331298828,
-    "y": 1242.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 3514.999969482422,
+    "y": 1331.9999694824219,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "f3f89c52.21e5b8"
+        "ad0b83ff.4cb308"
       ]
     ]
   },
   {
-    "id": "56ff5ea8.b777",
+    "id": "5c2f3801.4eed3",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3715.549835205078,
-    "y": 1525.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 3720.66650390625,
+    "y": 1548,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "286978b9.608f5",
-        "e1e71113.50d348"
+        "fe2c6692.47101",
+        "9af14a91.b12a68"
       ]
     ]
   },
   {
-    "id": "e382dfde.5b31d8",
+    "id": "fb3f4046.01bc4",
     "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": 3705.9457092285156,
-    "y": 1572.7431030273438,
-    "z": "4456793a.59a288",
+    "x": 3711.0623779296875,
+    "y": 1594.8597717285156,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "f857e1e2.07be58",
+    "id": "9f68f9be.d7aab8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3709.883331298828,
-    "y": 1616.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 3715,
+    "y": 1639,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "286978b9.608f5",
+    "id": "fe2c6692.47101",
     "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": 3979.883331298828,
-    "y": 1509.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 3985,
+    "y": 1532,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "5b0e63ee.a3ecd4",
-        "22c0e5a9.26fd0a"
+        "37956c14.cf1964",
+        "7f26a273.a5f25c"
       ]
     ]
   },
   {
-    "id": "22c0e5a9.26fd0a",
+    "id": "7f26a273.a5f25c",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4202.883331298828,
-    "y": 1464.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 4208,
+    "y": 1487,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "bad02ed0.d565e8"
+        "d180abab.fe69a"
       ]
     ]
   },
   {
-    "id": "5b0e63ee.a3ecd4",
+    "id": "37956c14.cf1964",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4204.883331298828,
-    "y": 1528.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 4210,
+    "y": 1551,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "cba8e08.e7cb12"
+        "11875f6b.e538c1"
       ]
     ]
   },
   {
-    "id": "cba8e08.e7cb12",
+    "id": "11875f6b.e538c1",
     "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": 4366.883331298828,
-    "y": 1524.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 4372,
+    "y": 1547,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "bad02ed0.d565e8",
+    "id": "d180abab.fe69a",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4367.883331298828,
-    "y": 1461.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 4373,
+    "y": 1484,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "14c7dbb3.7bb934",
-        "ad8d4f98.026b1"
+        "c42ee54d.ec9ea",
+        "e2dee17e.90746"
       ]
     ]
   },
   {
-    "id": "b0538c9f.9cd51",
-    "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\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='vpn-type' value='`$prop.sotn.vpnType`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 3981.883331298828,
-    "y": 1668.8833312988281,
-    "z": "4456793a.59a288",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "4ca2f9ab.45ab7",
-    "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": 4026.883331298828,
-    "y": 1578.8833312988281,
-    "z": "4456793a.59a288",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "ecb8fc16.8423f8",
-    "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": 4109.883331298828,
-    "y": 1716.8833312988281,
-    "z": "4456793a.59a288",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "f3f89c52.21e5b8",
+    "id": "ad0b83ff.4cb308",
     "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": 3654.883331298828,
-    "y": 1239.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 3657.999969482422,
+    "y": 1328.9999694824219,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "4015e76.5fd6098",
+    "id": "300fab87.54654c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3657.883331298828,
-    "y": 1202.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 3660.999969482422,
+    "y": 1291.9999694824219,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "ebd7b0f3.96fde8",
-        "1cc07a61.1b7696"
+        "844bb618.6c32e8",
+        "99a55ff.3057da"
       ]
     ]
   },
   {
-    "id": "ebd7b0f3.96fde8",
+    "id": "844bb618.6c32e8",
     "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": 3831.883331298828,
-    "y": 1158.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 3834.999969482422,
+    "y": 1247.9999694824219,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "e1e71113.50d348",
+    "id": "9af14a91.b12a68",
     "type": "for",
     "name": "for each relationship",
     "xml": "<for silentFailure='true' index='pividx' start='0' end='`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 3933.883331298828,
-    "y": 1793.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 3933.999969482422,
+    "y": 1641.9999694824219,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "bc68df19.413ab"
+        "1b19176e.822411"
       ]
     ]
   },
   {
-    "id": "bc68df19.413ab",
+    "id": "1b19176e.822411",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship[$pividx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4139.883331298828,
-    "y": 1793.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 4139.999969482422,
+    "y": 1641.9999694824219,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "50ca2971.ea36d8"
+        "c875ac48.6e9"
       ]
     ]
   },
   {
-    "id": "50ca2971.ea36d8",
+    "id": "c875ac48.6e9",
     "type": "outcome",
     "name": "tunnel-termination-point",
     "xml": "<outcome value='tunnel-termination-point'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4355.168975830078,
-    "y": 1793.7051086425781,
-    "z": "4456793a.59a288",
+    "x": 4355.285614013672,
+    "y": 1641.8217468261719,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "9aafd9b7.eaf6"
+        "6e0bf03.4de201"
       ]
     ]
   },
   {
-    "id": "1cc07a61.1b7696",
+    "id": "99a55ff.3057da",
     "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": 3846.883331298828,
-    "y": 1269.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 3849.999969482422,
+    "y": 1358.9999694824219,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "502e27f2.360128",
-        "613a0c37.ee93fc",
-        "15983fe1.c65378"
+        "26c5a31d.0e26c4",
+        "1dba38b8.e09647",
+        "703777cb.7523f"
       ]
     ]
   },
   {
-    "id": "502e27f2.360128",
+    "id": "26c5a31d.0e26c4",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4042.3834533691406,
-    "y": 1221.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 4045.5000915527344,
+    "y": 1310.9999694824219,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "ab759fb6.dae2a8"
+        "3f157e84.d62172"
       ]
     ]
   },
   {
-    "id": "613a0c37.ee93fc",
+    "id": "1dba38b8.e09647",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4034.3834533691406,
-    "y": 1276.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 4037.5000915527344,
+    "y": 1365.9999694824219,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "bc752416.e0cbc"
+        "7126adde.e76d1c"
       ]
     ]
   },
   {
-    "id": "15983fe1.c65378",
+    "id": "703777cb.7523f",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4039.3834533691406,
-    "y": 1333.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 4042.5000915527344,
+    "y": 1422.9999694824219,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "9670670b.649c48"
+        "f85ce86b.434b48"
       ]
     ]
   },
   {
-    "id": "9670670b.649c48",
+    "id": "f85ce86b.434b48",
     "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": 4191.383453369141,
-    "y": 1334.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 4194.500091552734,
+    "y": 1423.9999694824219,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "bc752416.e0cbc",
+    "id": "7126adde.e76d1c",
     "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": 4202.383453369141,
-    "y": 1279.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 4205.500091552734,
+    "y": 1368.9999694824219,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "ab759fb6.dae2a8",
+    "id": "3f157e84.d62172",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4186.765777587891,
-    "y": 1219.5390014648438,
-    "z": "4456793a.59a288",
+    "x": 4189.882415771484,
+    "y": 1308.6556396484375,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "fbc120c8.3124d8"
+        "61a6617b.c1f918"
       ]
     ]
   },
   {
-    "id": "fbc120c8.3124d8",
+    "id": "61a6617b.c1f918",
     "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": 4370.883331298828,
-    "y": 1233.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 4373.999969482422,
+    "y": 1322.9999694824219,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "df89787f.a5a578"
+        "c94ffafa.dcbd38"
       ]
     ]
   },
   {
-    "id": "ad8d4f98.026b1",
+    "id": "e2dee17e.90746",
     "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": 4537.883331298828,
-    "y": 1419.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 4543,
+    "y": 1442,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "14c7dbb3.7bb934",
+    "id": "c42ee54d.ec9ea",
     "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": 4538.883331298828,
-    "y": 1527.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 4544,
+    "y": 1550,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "832f55b4.d525f",
+    "id": "a1e5e819.9ba388",
     "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": 4539.883331298828,
-    "y": 1476.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 4545,
+    "y": 1499,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "9aafd9b7.eaf6",
+    "id": "6e0bf03.4de201",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4562.000518798828,
-    "y": 1794.2236633300781,
-    "z": "4456793a.59a288",
+    "x": 4562.117156982422,
+    "y": 1642.3403015136719,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "f4bf2a88.8e07c8",
-        "84226d1d.c53f58",
-        "5135c34e.c2878c"
+        "663b6226.995afc",
+        "dd7e9ff0.ed3a48",
+        "21e8d5ce.795f42"
       ]
     ]
   },
   {
-    "id": "f4bf2a88.8e07c8",
+    "id": "663b6226.995afc",
     "type": "set",
     "name": "set source ttp-id",
     "xml": "<set>\n<parameter name='tmp.source.ttp-id' value=\"`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship[$pividx].relationship-data[0].relationship-value`\" />\n",
     "comments": "",
-    "x": 4777.000518798828,
-    "y": 1756.2236633300781,
-    "z": "4456793a.59a288",
+    "x": 4777.117156982422,
+    "y": 1604.3403015136719,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "84226d1d.c53f58",
+    "id": "dd7e9ff0.ed3a48",
     "type": "get-resource",
     "name": "get-resource src TTP",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"tunnel-termination-point\" \n\t\tkey=\"tunnel-termination-point.ttp-id = $tmp.source.ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.source-ttp' local-only='false' >\n\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4774.000518798828,
-    "y": 1795.2236633300781,
-    "z": "4456793a.59a288",
+    "x": 4774.117156982422,
+    "y": 1643.3403015136719,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "9d44e19c.6d7318"
+        "49a01492.84fe34"
       ]
     ]
   },
   {
-    "id": "5135c34e.c2878c",
+    "id": "21e8d5ce.795f42",
     "type": "break",
     "name": "break",
     "xml": "<break>\n",
     "comments": "",
-    "x": 4729.500518798828,
-    "y": 1837.2236633300781,
-    "z": "4456793a.59a288",
+    "x": 4729.617156982422,
+    "y": 1685.3403015136719,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "9d44e19c.6d7318",
+    "id": "49a01492.84fe34",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4954.500518798828,
-    "y": 1794.2236633300781,
-    "z": "4456793a.59a288",
+    "x": 4954.617156982422,
+    "y": 1642.3403015136719,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "29687f0b.c77f5"
+        "292cacf5.882694"
       ]
     ]
   },
   {
-    "id": "a2ec001d.4a7fb8",
+    "id": "ccfcf164.268f1",
     "type": "outcome",
     "name": "esr-thirdparty-sdnc",
     "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4768.883331298828,
-    "y": 1237.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 4774,
+    "y": 1260,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "6f5c9a68.97563c"
+        "c88ef5fa.00d8b"
       ]
     ]
   },
   {
-    "id": "6f5c9a68.97563c",
+    "id": "c88ef5fa.00d8b",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4945.883331298828,
-    "y": 1229.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 4951,
+    "y": 1252,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "7ae681af.873ac8",
-        "9549ff73.9a1cc8"
+        "889b0a64.f04af",
+        "b7b819bd.9ab3a"
       ]
     ]
   },
   {
-    "id": "df89787f.a5a578",
+    "id": "c94ffafa.dcbd38",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4565.883331298828,
-    "y": 1233.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 4568.999969482422,
+    "y": 1322.9999694824219,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "a2ec001d.4a7fb8",
-        "bc76afd9.40381"
+        "ccfcf164.268f1",
+        "109fb904.331fef"
       ]
     ]
   },
   {
-    "id": "bc76afd9.40381",
+    "id": "109fb904.331fef",
     "type": "outcome",
     "name": "network-resource",
     "xml": "<outcome value='network-resource'>",
     "comments": "",
     "outputs": 1,
-    "x": 4771.883331298828,
-    "y": 1311.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 4777,
+    "y": 1334,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "1ac8b93a.8f9647"
+        "c72b69fd.2d015"
       ]
     ]
   },
   {
-    "id": "1ac8b93a.8f9647",
+    "id": "c72b69fd.2d015",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4948.883331298828,
-    "y": 1303.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 4954,
+    "y": 1326,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "12ac39b2.69f38e"
+        "7fcaaf72.ffd618"
       ]
     ]
   },
   {
-    "id": "29687f0b.c77f5",
+    "id": "292cacf5.882694",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5112.500518798828,
-    "y": 1794.2236633300781,
-    "z": "4456793a.59a288",
+    "x": 5112.617156982422,
+    "y": 1642.3403015136719,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "6aef1ca3.67a3dc"
+        "63e30873.d5c4b8"
       ]
     ]
   },
   {
-    "id": "6aef1ca3.67a3dc",
+    "id": "63e30873.d5c4b8",
     "type": "set",
     "name": "set source tunnel tp ip",
     "xml": "<set>\n<parameter name='source.tunnel-tp-id' value=\"`$tmp.aai.source-ttp.tunnel-tp-id`\" />\n",
     "comments": "",
-    "x": 5319.500518798828,
-    "y": 1794.2236633300781,
-    "z": "4456793a.59a288",
+    "x": 5319.617156982422,
+    "y": 1642.3403015136719,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "9549ff73.9a1cc8",
+    "id": "b7b819bd.9ab3a",
     "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": 5153.883331298828,
-    "y": 1236.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 5159,
+    "y": 1259,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "1ca68d2c.42a1b3",
-        "79238f45.d528a",
-        "b580a25b.41384"
+        "b062763c.d2a4c",
+        "54b52301.01aeac",
+        "c657b443.273d9"
       ]
     ]
   },
   {
-    "id": "7ae681af.873ac8",
+    "id": "889b0a64.f04af",
     "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": 5183.883331298828,
-    "y": 1184.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 5189,
+    "y": 1207,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "1ca68d2c.42a1b3",
+    "id": "b062763c.d2a4c",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5363.883331298828,
-    "y": 1227.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 5369,
+    "y": 1250,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "1cf65ad.e3b2e25"
+        "be5642b7.4ae158"
       ]
     ]
   },
   {
-    "id": "79238f45.d528a",
+    "id": "54b52301.01aeac",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5355.883331298828,
-    "y": 1282.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 5361,
+    "y": 1305,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "55debd4.7dcf144"
+        "4c818fe4.79442"
       ]
     ]
   },
   {
-    "id": "b580a25b.41384",
+    "id": "c657b443.273d9",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5360.883331298828,
-    "y": 1339.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 5366,
+    "y": 1362,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "277b43ae.d3d8bc"
+        "efb52045.6ba93"
       ]
     ]
   },
   {
-    "id": "277b43ae.d3d8bc",
+    "id": "efb52045.6ba93",
     "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": 5512.883331298828,
-    "y": 1340.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 5518,
+    "y": 1363,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "55debd4.7dcf144",
+    "id": "4c818fe4.79442",
     "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": 5523.883331298828,
-    "y": 1285.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 5529,
+    "y": 1308,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "1cf65ad.e3b2e25",
+    "id": "be5642b7.4ae158",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 5508.265655517578,
-    "y": 1225.5390014648438,
-    "z": "4456793a.59a288",
+    "x": 5513.38232421875,
+    "y": 1247.6556701660156,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "293b0137.5d1d8e"
+        "6763b660.709548"
       ]
     ]
   },
   {
-    "id": "12ac39b2.69f38e",
+    "id": "7fcaaf72.ffd618",
     "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": 5183.883331298828,
-    "y": 1427.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 5189,
+    "y": 1450,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "293b0137.5d1d8e",
+    "id": "6763b660.709548",
     "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": 5722.883331298828,
-    "y": 1221.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 5728,
+    "y": 1244,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "f12c4ac3.acc2d",
+    "id": "1bc82fcd.e38b3",
     "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": 4306.883331298828,
-    "y": 875.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 4377.999969482422,
+    "y": 528.9999694824219,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "23d5a8e8.6a48d8",
+    "id": "1ea9819.2a7577e",
     "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": 4297.883331298828,
-    "y": 973.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 4368.999969482422,
+    "y": 626.9999694824219,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "52465f0e.0c996",
+    "id": "86b880d.ad45d",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4131.883331298828,
-    "y": 881.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 4202.999969482422,
+    "y": 534.9999694824219,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "c68d1d99.71ec4",
-        "f12c4ac3.acc2d"
+        "4ebe65d0.3ec92c",
+        "1bc82fcd.e38b3"
       ]
     ]
   },
   {
-    "id": "98cbb890.5e8b88",
+    "id": "10eaea8a.998afd",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4137.883331298828,
-    "y": 945.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 4208.999969482422,
+    "y": 598.9999694824219,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "97074ecd.08e3c8",
-        "23d5a8e8.6a48d8"
+        "b5b3e89e.18b28",
+        "1ea9819.2a7577e"
       ]
     ]
   },
   {
-    "id": "d0104e32.ac2ab8",
+    "id": "e84921e.f8ecce",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4137.883331298828,
-    "y": 1051.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 4227,
+    "y": 811,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "be8be686.f85c68",
-        "e50dfba7.f60328"
+        "81270995.5d712",
+        "aacd9933.603dc8"
       ]
     ]
   },
   {
-    "id": "8e259d5c.262c5",
+    "id": "b7ebf9b7.e2f348",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4140.883331298828,
-    "y": 1104.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 4230,
+    "y": 864,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "3fa3de22.b5b33a",
-        "6c2da806.3569b"
+        "7db54dd4.f36624",
+        "bffe7efa.872038"
       ]
     ]
   },
   {
-    "id": "e50dfba7.f60328",
+    "id": "aacd9933.603dc8",
     "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": 4297.883331298828,
-    "y": 1064.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 4387,
+    "y": 824,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "6c2da806.3569b",
+    "id": "bffe7efa.872038",
     "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": 4300.883331298828,
-    "y": 1155.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 4390,
+    "y": 915,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "b9324a20.74a63",
+    "id": "786dd6d1.bb9f",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3672.883331298828,
-    "y": 2365.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3681.999969482422,
+    "y": 2041.9999694824219,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "f10be91.1b09d98",
-        "d09bd461.c7ba88"
+        "ced1d6e7.1761a",
+        "debfaec3.11449"
       ]
     ]
   },
   {
-    "id": "56bce95e.90bfe",
+    "id": "4b469f00.bbd698",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3500.216827392578,
-    "y": 2366.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3509.333465576172,
+    "y": 2042.9999694824219,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "b9324a20.74a63"
+        "786dd6d1.bb9f"
       ]
     ]
   },
   {
-    "id": "aea1bf99.8fdcc",
+    "id": "abe29976.f7b82",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3509.707794189453,
-    "y": 2409.4573669433594,
-    "z": "4456793a.59a288",
+    "x": 3518.824432373047,
+    "y": 2085.574005126953,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "29a46b5c.88b5bc"
+        "fd5b7bb5.9eb778"
       ]
     ]
   },
   {
-    "id": "87e0206.8796c6",
+    "id": "df5e24e1.4bbfc8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3498.216827392578,
-    "y": 2455.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3507.333465576172,
+    "y": 2131.999969482422,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "1d955e57.2601ca"
+        "8efc96df.7aca9"
       ]
     ]
   },
   {
-    "id": "29a46b5c.88b5bc",
+    "id": "fd5b7bb5.9eb778",
     "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": 3663.2792053222656,
-    "y": 2412.7431030273438,
-    "z": "4456793a.59a288",
+    "x": 3672.3958435058594,
+    "y": 2088.8597412109375,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "1d955e57.2601ca",
+    "id": "8efc96df.7aca9",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3667.216827392578,
-    "y": 2456.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3676.333465576172,
+    "y": 2132.999969482422,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "f10be91.1b09d98",
+    "id": "ced1d6e7.1761a",
     "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": 3959.216827392578,
-    "y": 2369.8834533691406,
-    "z": "4456793a.59a288",
+    "x": 3968.333465576172,
+    "y": 2046.0000915527344,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "fda7c536.3acee",
-        "c79b96a2.97ef58"
+        "8ff8205e.94493",
+        "d23599ca.696b88"
       ]
     ]
   },
   {
-    "id": "c79b96a2.97ef58",
+    "id": "d23599ca.696b88",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4182.216827392578,
-    "y": 2324.8834533691406,
-    "z": "4456793a.59a288",
+    "x": 4191.333465576172,
+    "y": 2001.0000915527344,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "81ad908f.6a16e"
+        "9c58fe22.c1b4f8"
       ]
     ]
   },
   {
-    "id": "fda7c536.3acee",
+    "id": "8ff8205e.94493",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4184.216827392578,
-    "y": 2388.8834533691406,
-    "z": "4456793a.59a288",
+    "x": 4193.333465576172,
+    "y": 2065.0000915527344,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "e8b14d91.9e5c88"
+        "f9f53a1b.e6879"
       ]
     ]
   },
   {
-    "id": "e8b14d91.9e5c88",
+    "id": "f9f53a1b.e6879",
     "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": 4343.216827392578,
-    "y": 2407.8834533691406,
-    "z": "4456793a.59a288",
+    "x": 4352.333465576172,
+    "y": 2084.0000915527344,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "81ad908f.6a16e",
+    "id": "9c58fe22.c1b4f8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4347.216827392578,
-    "y": 2321.8834533691406,
-    "z": "4456793a.59a288",
+    "x": 4356.333465576172,
+    "y": 1998.0000915527344,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "cad9326b.b2da",
-        "3eb5f127.732d1e"
+        "a3891ddf.35707",
+        "dedb2135.03f5b8"
       ]
     ]
   },
   {
-    "id": "cf8b334d.12d69",
-    "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<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\n\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='vpn-type' value='`$prop.sotn.vpnType`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 3961.216827392578,
-    "y": 2528.8834533691406,
-    "z": "4456793a.59a288",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "a51bfc6c.2ab4b",
-    "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": 4006.216827392578,
-    "y": 2438.8834533691406,
-    "z": "4456793a.59a288",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "5d70457e.e444e4",
-    "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": 4088.216827392578,
-    "y": 2593.8834533691406,
-    "z": "4456793a.59a288",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "ff1965cc.9c6318",
+    "id": "b18620c8.640928",
     "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": 3272.216827392578,
-    "y": 2401.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3281.333465576172,
+    "y": 2077.999969482422,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "56bce95e.90bfe",
-        "aea1bf99.8fdcc",
-        "87e0206.8796c6"
+        "4b469f00.bbd698",
+        "abe29976.f7b82",
+        "df5e24e1.4bbfc8"
       ]
     ]
   },
   {
-    "id": "e04ad761.fdc11",
+    "id": "2363f2d1.c22566",
     "type": "comment",
     "name": "Question?",
     "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
     "comments": "",
-    "x": 3233.216827392578,
-    "y": 2345.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3242.333465576172,
+    "y": 2021.9999694824219,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "3d22a200.42e29e",
+    "id": "d6e1611b.9ddcf",
     "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": 3290.216827392578,
-    "y": 2064.8832092285156,
-    "z": "4456793a.59a288",
+    "x": 3301.333465576172,
+    "y": 1817.9999694824219,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "f0778891.f400f",
-        "2be980fe.83d6b8"
+        "cf2f2f41.e3b378",
+        "39e668ff.f44578"
       ]
     ]
   },
   {
-    "id": "2be980fe.83d6b8",
+    "id": "39e668ff.f44578",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3513.216827392578,
-    "y": 2050.8832092285156,
-    "z": "4456793a.59a288",
+    "x": 3524.333465576172,
+    "y": 1803.9999694824219,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "1ec9f8d.bab6807"
+        "a19c910d.573ee"
       ]
     ]
   },
   {
-    "id": "f0778891.f400f",
+    "id": "cf2f2f41.e3b378",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3515.216827392578,
-    "y": 2083.8832092285156,
-    "z": "4456793a.59a288",
+    "x": 3526.333465576172,
+    "y": 1836.9999694824219,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "45edb459.c45c8c"
+        "13f310d4.058aff"
       ]
     ]
   },
   {
-    "id": "45edb459.c45c8c",
+    "id": "13f310d4.058aff",
     "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": 3658.216827392578,
-    "y": 2080.8832092285156,
-    "z": "4456793a.59a288",
+    "x": 3669.333465576172,
+    "y": 1833.9999694824219,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "1ec9f8d.bab6807",
+    "id": "a19c910d.573ee",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3661.216827392578,
-    "y": 2043.8832092285156,
-    "z": "4456793a.59a288",
+    "x": 3672.333465576172,
+    "y": 1796.9999694824219,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "8bf99b8b.4af368",
-        "57c842ba.83379c"
+        "f7d74c47.1bc978",
+        "f5bac544.61fa48"
       ]
     ]
   },
   {
-    "id": "8bf99b8b.4af368",
+    "id": "f7d74c47.1bc978",
     "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": 3855.216827392578,
-    "y": 2046.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 3866.333465576172,
+    "y": 1800.0000915527344,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "d09bd461.c7ba88",
+    "id": "debfaec3.11449",
     "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": 3918.216827392578,
-    "y": 2678.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3919.3334350585938,
+    "y": 2168.9999389648438,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "adbd165.7c69a68"
+        "9615e6c.711fd18"
       ]
     ]
   },
   {
-    "id": "adbd165.7c69a68",
+    "id": "9615e6c.711fd18",
     "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": 4124.216827392578,
-    "y": 2678.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4125.333435058594,
+    "y": 2168.9999389648438,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "9b58a38.dc3806"
+        "cbe4341f.004078"
       ]
     ]
   },
   {
-    "id": "9b58a38.dc3806",
+    "id": "cbe4341f.004078",
     "type": "outcome",
     "name": "tunnel-termination-point",
     "xml": "<outcome value='tunnel-termination-point'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4341.502471923828,
-    "y": 2677.705108642578,
-    "z": "4456793a.59a288",
+    "x": 4342.619079589844,
+    "y": 2167.8217163085938,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "ec0e6199.3c529"
+        "c7f950c4.309208"
       ]
     ]
   },
   {
-    "id": "57c842ba.83379c",
+    "id": "f5bac544.61fa48",
     "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": 3877.216827392578,
-    "y": 2114.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3888.333465576172,
+    "y": 1868.0000915527344,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "34626e8a.0bbe1a",
-        "390dcffe.f00898",
-        "4d1fe4fe.2890ec"
+        "2c3b0cc0.e9a8bc",
+        "964d0d68.ea7238",
+        "c9fecb15.92dc4"
       ]
     ]
   },
   {
-    "id": "34626e8a.0bbe1a",
+    "id": "2c3b0cc0.e9a8bc",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4072.7169494628906,
-    "y": 2066.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4083.8335876464844,
+    "y": 1820.0000915527344,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "95be6ff8.bea0e"
+        "d8e08a6a.bad6c"
       ]
     ]
   },
   {
-    "id": "390dcffe.f00898",
+    "id": "964d0d68.ea7238",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4064.7169494628906,
-    "y": 2121.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4075.8335876464844,
+    "y": 1875.0000915527344,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "46312f08.59959"
+        "30330606.c5c78a"
       ]
     ]
   },
   {
-    "id": "4d1fe4fe.2890ec",
+    "id": "c9fecb15.92dc4",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4069.7169494628906,
-    "y": 2178.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4080.8335876464844,
+    "y": 1932.0000915527344,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "15450853.01aa88"
+        "7d5217b1.764cf"
       ]
     ]
   },
   {
-    "id": "15450853.01aa88",
+    "id": "7d5217b1.764cf",
     "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": 4221.716949462891,
-    "y": 2179.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4232.833587646484,
+    "y": 1933.0000915527344,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "46312f08.59959",
+    "id": "30330606.c5c78a",
     "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": 4232.716949462891,
-    "y": 2124.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4243.833587646484,
+    "y": 1878.0000915527344,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "95be6ff8.bea0e",
+    "id": "d8e08a6a.bad6c",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4217.099273681641,
-    "y": 2064.5390014648438,
-    "z": "4456793a.59a288",
+    "x": 4228.215911865234,
+    "y": 1817.65576171875,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "691678af.c2875"
+        "57c065bf.a4bd5c"
       ]
     ]
   },
   {
-    "id": "cad9326b.b2da",
+    "id": "a3891ddf.35707",
     "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": 4517.216827392578,
-    "y": 2282.8834533691406,
-    "z": "4456793a.59a288",
+    "x": 4526.333465576172,
+    "y": 1959.0000915527344,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "3eb5f127.732d1e",
+    "id": "dedb2135.03f5b8",
     "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": 4518.216827392578,
-    "y": 2387.8834533691406,
-    "z": "4456793a.59a288",
+    "x": 4527.333465576172,
+    "y": 2064.0000915527344,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "bf01d807.ca2a6",
+    "id": "cd4b037.d584a",
     "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": 4513.216827392578,
-    "y": 2336.8834533691406,
-    "z": "4456793a.59a288",
+    "x": 4522.333465576172,
+    "y": 2013.0000915527344,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "ec0e6199.3c529",
+    "id": "c7f950c4.309208",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4548.334014892578,
-    "y": 2667.2237854003906,
-    "z": "4456793a.59a288",
+    "x": 4549.450622558594,
+    "y": 2157.3403930664062,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "310c30a2.98cdd8",
-        "f852afcd.3e249",
-        "77117052.72541"
+        "dd90bf13.7024b8",
+        "71302a26.8b2194",
+        "1d143619.b4c942"
       ]
     ]
   },
   {
-    "id": "310c30a2.98cdd8",
+    "id": "dd90bf13.7024b8",
     "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": 4763.334014892578,
-    "y": 2629.2237854003906,
-    "z": "4456793a.59a288",
+    "x": 4764.450622558594,
+    "y": 2119.3403930664062,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "f852afcd.3e249",
+    "id": "71302a26.8b2194",
     "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": 4760.334014892578,
-    "y": 2668.2237854003906,
-    "z": "4456793a.59a288",
+    "x": 4761.450622558594,
+    "y": 2158.3403930664062,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "8dd58be1.de6918"
+        "d8986410.1ab67"
       ]
     ]
   },
   {
-    "id": "77117052.72541",
+    "id": "1d143619.b4c942",
     "type": "break",
     "name": "break",
     "xml": "<break>\n",
     "comments": "",
-    "x": 4715.834014892578,
-    "y": 2710.2237854003906,
-    "z": "4456793a.59a288",
+    "x": 4716.950622558594,
+    "y": 2200.3403930664062,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "8dd58be1.de6918",
+    "id": "d8986410.1ab67",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4940.834014892578,
-    "y": 2667.2237854003906,
-    "z": "4456793a.59a288",
+    "x": 4941.950622558594,
+    "y": 2157.3403930664062,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "bf6de4b9.07a8d8"
+        "ce977a1e.eca43"
       ]
     ]
   },
   {
-    "id": "bf6de4b9.07a8d8",
+    "id": "ce977a1e.eca43",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5098.834014892578,
-    "y": 2667.2237854003906,
-    "z": "4456793a.59a288",
+    "x": 5099.950622558594,
+    "y": 2157.3403930664062,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "4337b0b8.5fd258"
+        "fad51809.c9b758"
       ]
     ]
   },
   {
-    "id": "4337b0b8.5fd258",
+    "id": "fad51809.c9b758",
     "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": 5305.834014892578,
-    "y": 2667.2237854003906,
-    "z": "4456793a.59a288",
+    "x": 5306.950622558594,
+    "y": 2157.3403930664062,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "290c1291.0be836",
+    "id": "3e817052.af0e48",
     "type": "outcome",
     "name": "esr-thirdparty-sdnc",
     "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4799.216827392578,
-    "y": 2082.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4810.333465576172,
+    "y": 1836.0000915527344,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "4a42d224.6e916c"
+        "41d964fa.bed18c"
       ]
     ]
   },
   {
-    "id": "4a42d224.6e916c",
+    "id": "41d964fa.bed18c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4976.216827392578,
-    "y": 2074.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4987.333465576172,
+    "y": 1828.0000915527344,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "44500a36.8314c4",
-        "edf4775.6feec88"
+        "286abe4.161a1c2",
+        "51859ea0.e5a788"
       ]
     ]
   },
   {
-    "id": "691678af.c2875",
+    "id": "57c065bf.a4bd5c",
     "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": 4401.216827392578,
-    "y": 2078.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4412.333465576172,
+    "y": 1832.0000915527344,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "e26ac43.7b22838"
+        "89b46226.1281f"
       ]
     ]
   },
   {
-    "id": "e26ac43.7b22838",
+    "id": "89b46226.1281f",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4596.216827392578,
-    "y": 2078.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4607.333465576172,
+    "y": 1832.0000915527344,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "290c1291.0be836",
-        "91efe90a.a989f"
+        "3e817052.af0e48",
+        "56bdf4f5.249c24"
       ]
     ]
   },
   {
-    "id": "edf4775.6feec88",
+    "id": "51859ea0.e5a788",
     "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": 5184.216827392578,
-    "y": 2081.883331298828,
-    "z": "4456793a.59a288",
+    "x": 5195.333465576172,
+    "y": 1835.0000915527344,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "ccc8d651.608a58",
-        "4c1a6f18.7cad4",
-        "d7a69532.21f81"
+        "d1ce3d2f.531928",
+        "ba2a8dba.a8d52",
+        "4ba192d1.030d84"
       ]
     ]
   },
   {
-    "id": "1e83e9df.5f1ca6",
+    "id": "f8a3b14d.675a5",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4978.216827392578,
-    "y": 2147.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4989.333465576172,
+    "y": 1901.0000915527344,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "36af6584.4e4842"
+        "25c16268.66f006"
       ]
     ]
   },
   {
-    "id": "91efe90a.a989f",
+    "id": "56bdf4f5.249c24",
     "type": "outcome",
     "name": "network-resource",
     "xml": "<outcome value='network-resource'>",
     "comments": "",
     "outputs": 1,
-    "x": 4801.216827392578,
-    "y": 2155.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4812.333465576172,
+    "y": 1909.0000915527344,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "1e83e9df.5f1ca6"
+        "f8a3b14d.675a5"
       ]
     ]
   },
   {
-    "id": "44500a36.8314c4",
+    "id": "286abe4.161a1c2",
     "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": 5214.216827392578,
-    "y": 2029.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 5225.333465576172,
+    "y": 1783.0000915527344,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "36af6584.4e4842",
+    "id": "25c16268.66f006",
     "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": 5213.216827392578,
-    "y": 2271.883331298828,
-    "z": "4456793a.59a288",
+    "x": 5224.333465576172,
+    "y": 2025.0000915527344,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "ccc8d651.608a58",
+    "id": "d1ce3d2f.531928",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5394.216827392578,
-    "y": 2072.883331298828,
-    "z": "4456793a.59a288",
+    "x": 5405.333465576172,
+    "y": 1826.0000915527344,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "39681472.975784"
+        "9d788655.20f98"
       ]
     ]
   },
   {
-    "id": "4c1a6f18.7cad4",
+    "id": "ba2a8dba.a8d52",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5386.216827392578,
-    "y": 2127.883331298828,
-    "z": "4456793a.59a288",
+    "x": 5397.333465576172,
+    "y": 1881.0000915527344,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "bc7c4cb6.e261e8"
+        "96363bdc.091"
       ]
     ]
   },
   {
-    "id": "d7a69532.21f81",
+    "id": "4ba192d1.030d84",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5391.216827392578,
-    "y": 2184.883331298828,
-    "z": "4456793a.59a288",
+    "x": 5402.333465576172,
+    "y": 1938.0000915527344,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "10a038dd.f22947"
+        "6a0588e1.3fd2b8"
       ]
     ]
   },
   {
-    "id": "10a038dd.f22947",
+    "id": "6a0588e1.3fd2b8",
     "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": 5543.216827392578,
-    "y": 2185.883331298828,
-    "z": "4456793a.59a288",
+    "x": 5554.333465576172,
+    "y": 1939.0000915527344,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "bc7c4cb6.e261e8",
+    "id": "96363bdc.091",
     "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": 5554.216827392578,
-    "y": 2130.883331298828,
-    "z": "4456793a.59a288",
+    "x": 5565.333465576172,
+    "y": 1884.0000915527344,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "39681472.975784",
+    "id": "9d788655.20f98",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 5538.599151611328,
-    "y": 2070.5390014648438,
-    "z": "4456793a.59a288",
+    "x": 5549.715789794922,
+    "y": 1823.65576171875,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "19f3508c.df2467"
+        "f42174ac.a42b5"
       ]
     ]
   },
   {
-    "id": "19f3508c.df2467",
+    "id": "f42174ac.a42b5",
     "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": 5753.216827392578,
-    "y": 2066.883331298828,
-    "z": "4456793a.59a288",
+    "x": 5764.333465576172,
+    "y": 1820.0000915527344,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "a8011cb7.dd8288",
+    "id": "11e0f934.faeab7",
     "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": 3251.883331298828,
-    "y": 1676.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 3248.999969482422,
+    "y": 1638.9999694824219,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "48c20a24.e1d944",
+    "id": "87d62238.4ede38",
     "type": "comment",
     "name": "This is it (should be)",
     "info": "",
     "comments": "",
-    "x": 4473.883331298828,
-    "y": 959.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 4544.999969482422,
+    "y": 612.9999694824219,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "33f8c668.c00922",
+    "id": "da6b2335.2cb2",
     "type": "comment",
     "name": "This is it (should be)",
     "info": "",
     "comments": "",
-    "x": 4465.883331298828,
-    "y": 1049.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 4555,
+    "y": 809,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "60be6b60.c49e7c",
+    "id": "b71f57a7.e2a288",
     "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": 3232.883331298828,
-    "y": 2532.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3251.9999389648438,
+    "y": 2146.9999389648438,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "77fe2bdc.eed0c4",
+    "id": "f7d11626.bd108",
     "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": 3383.883331298828,
-    "y": 2780.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3389,
+    "y": 2803,
+    "z": "f8944603.71553",
     "wires": [
       []
     ]
   },
   {
-    "id": "c658e7ef.0b11d8",
+    "id": "7d22810d.66642",
     "type": "switchNode",
     "name": "switch found-middle-man?",
     "xml": "<switch test='`$found-middle-man`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3260.883331298828,
-    "y": 2890.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3266,
+    "y": 2913,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "5eb047e9.2f7668",
-        "a0bb1c61.b88728"
+        "74458dfb.e82acc",
+        "6d43d493.c2ab14"
       ]
     ]
   },
   {
-    "id": "5eb047e9.2f7668",
+    "id": "74458dfb.e82acc",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3444.883331298828,
-    "y": 2869.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3450,
+    "y": 2892,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "fb1841e2.6264"
+        "bd8c7362.5e86a8"
       ]
     ]
   },
   {
-    "id": "a0bb1c61.b88728",
+    "id": "6d43d493.c2ab14",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3336.883331298828,
-    "y": 5047.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3342,
+    "y": 5070,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "4d88182e.2579a"
+        "f235a0e0.02a8"
       ]
     ]
   },
   {
-    "id": "4d88182e.2579a",
+    "id": "f235a0e0.02a8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 3491.883331298828,
-    "y": 5040.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3497,
+    "y": 5063,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "44d48088.590d78",
-        "a2dd9c19.75287",
-        "906b118c.b5ca4",
-        "80cc4c1e.a6bfe",
-        "3d1de5ec.2ac45a"
+        "69d3ed18.577c3c",
+        "f2a7dc4a.68ede",
+        "a789852e.51cd48",
+        "434bd8c2.bae4f8",
+        "cd1fc06c.124968",
+        "c32fbe2a.4ce3f"
       ]
     ]
   },
   {
-    "id": "fb1841e2.6264",
+    "id": "bd8c7362.5e86a8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 3587.883331298828,
-    "y": 2869.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3593,
+    "y": 2892,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "e6eab534.0772a8",
-        "b10b9835.71fc5",
-        "9c84ab4f.a1a008",
-        "50925bce.958aec",
-        "eab645cb.c973",
-        "74310cc1.794b3c",
-        "b442de01.03d108",
-        "a559e6ec.97fea8",
-        "c65cb0db.1db578",
-        "c0792f26.4d13b8",
-        "e82ea719.e6f068",
-        "c4a1bace.0d4bb",
-        "8f561f42.000fe8",
-        "aa738c85.1c137",
-        "54d18bcb.0986c4",
-        "4494cc45.3ce764",
-        "b937ed07.a77618",
-        "d5c180c8.9f0b08",
-        "123d53b6.2c62dc"
+        "edf6563f.502118",
+        "59e68189.ade8e8",
+        "39d89d00.a48b3c",
+        "f51c657e.c3fcc8",
+        "3b5e2d55.c49c42",
+        "c40c923d.ffb318",
+        "3d1335ab.d13122",
+        "441ba30c.ae2a1c",
+        "5bfaebb4.b0d114",
+        "32f3c697.c51f22",
+        "f60b0d1b.343218",
+        "51fbee04.79f4f",
+        "a2a5771a.032e88",
+        "a39c337f.4b8598",
+        "f9369eb9.dd61b",
+        "dad20130.739d78",
+        "124ab46d.2d752c",
+        "fdfcc8c4.b3e8a8",
+        "8b9dcfa3.01c508",
+        "87dcb71b.a618f",
+        "286f0ec8.852352",
+        "2bbca6cc.0ec622"
       ]
     ]
   },
   {
-    "id": "c65cb0db.1db578",
+    "id": "5bfaebb4.b0d114",
     "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": 3898.883331298828,
-    "y": 3224.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3903,
+    "y": 3207,
+    "z": "f8944603.71553",
     "wires": [
       []
     ]
   },
   {
-    "id": "e6eab534.0772a8",
+    "id": "edf6563f.502118",
     "type": "save",
     "name": "save connectivity resource in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainB-uuid`' />\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' -->\n<!--      key='connectivity.connectivity-id = $tmp.ROOT.uni-p-interface-long'>-->\n<!--<parameter name='connectivity-id' value='`$tmp.ROOT.uni-p-interface-long`' />-->\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\n<parameter name='color-aware' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='vpn-type' value='root' />\n\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 3852.883331298828,
-    "y": 3322.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3851,
+    "y": 3249,
+    "z": "f8944603.71553",
     "wires": [
       []
     ]
   },
   {
-    "id": "b10b9835.71fc5",
+    "id": "59e68189.ade8e8",
     "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": 3988.883331298828,
-    "y": 3369.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3980,
+    "y": 3291,
+    "z": "f8944603.71553",
     "wires": [
       []
     ]
   },
   {
-    "id": "6e8e8040.0d64",
+    "id": "c425c4b.b5f8838",
     "type": "comment",
     "name": "Create ROOT connectivity",
     "info": "",
     "comments": "",
-    "x": 3819.883331298828,
-    "y": 3173.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3826,
+    "y": 3166,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "69147836.dfe478",
+    "id": "78e08e98.7c634",
     "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": 4345.883331298828,
-    "y": 3664.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4351,
+    "y": 3687,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "9c84ab4f.a1a008",
+    "id": "39d89d00.a48b3c",
     "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": 3909.883331298828,
-    "y": 3703.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3915,
+    "y": 3726,
+    "z": "f8944603.71553",
     "wires": [
       []
     ]
   },
   {
-    "id": "50925bce.958aec",
+    "id": "f51c657e.c3fcc8",
     "type": "save",
     "name": "save connectivity resource in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-middle-man-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-middle-man-uuid`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<!--The followings are not needed for the middle-man-connectivity-->\n<!--<parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />-->\n<!--<parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />-->\n<!--<parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />-->\n<!--<parameter name='access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />-->\n<!--<parameter name='access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />-->\n<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\n<parameter name='color-aware' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='vpn-type' value='mdsc' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 3857.883331298828,
-    "y": 3754.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3863,
+    "y": 3777,
+    "z": "f8944603.71553",
     "wires": [
       []
     ]
   },
   {
-    "id": "eab645cb.c973",
+    "id": "3b5e2d55.c49c42",
     "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": 3993.883331298828,
-    "y": 3801.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3999,
+    "y": 3824,
+    "z": "f8944603.71553",
     "wires": [
       []
     ]
   },
   {
-    "id": "921a5ccf.2b2f38",
+    "id": "62d7e2a.9cbc61c",
     "type": "comment",
     "name": "Create MIDDLE-MAN connectivity",
     "info": "",
     "comments": "",
-    "x": 3850.883331298828,
-    "y": 3663.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3856,
+    "y": 3686,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "8fa15646.014b68",
+    "id": "1f0597e7.f750d8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4280.883331298828,
-    "y": 3860.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4286,
+    "y": 3883,
+    "z": "f8944603.71553",
     "wires": [
       []
     ]
   },
   {
-    "id": "74310cc1.794b3c",
+    "id": "c40c923d.ffb318",
     "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": 3871.883331298828,
-    "y": 3907.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3877,
+    "y": 3930,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "9785079b.24c0f8",
-        "81e9c000.43765",
-        "377b8f18.e7499"
+        "b2dc6149.43ec28",
+        "f8c162ee.8e2a8",
+        "a8c36503.377908"
       ]
     ]
   },
   {
-    "id": "9785079b.24c0f8",
+    "id": "b2dc6149.43ec28",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4118.883331298828,
-    "y": 3861.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4124,
+    "y": 3884,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "8fa15646.014b68"
+        "1f0597e7.f750d8"
       ]
     ]
   },
   {
-    "id": "81e9c000.43765",
+    "id": "f8c162ee.8e2a8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4119.374298095703,
-    "y": 3907.4573669433594,
-    "z": "4456793a.59a288",
+    "x": 4124.490966796875,
+    "y": 3929.5740356445312,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "b389b203.4af2"
+        "244505cb.7c97da"
       ]
     ]
   },
   {
-    "id": "377b8f18.e7499",
+    "id": "a8c36503.377908",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4116.883331298828,
-    "y": 3950.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4122,
+    "y": 3973,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "7f887f7.029e08"
+        "fac0a6c3.57a578"
       ]
     ]
   },
   {
-    "id": "b389b203.4af2",
+    "id": "244505cb.7c97da",
     "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": 4281.945709228516,
-    "y": 3907.7431030273438,
-    "z": "4456793a.59a288",
+    "x": 4287.0623779296875,
+    "y": 3929.8597717285156,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "7f887f7.029e08",
+    "id": "fac0a6c3.57a578",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 4285.883331298828,
-    "y": 3951.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4291,
+    "y": 3974,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "54d18bcb.0986c4",
+    "id": "f9369eb9.dd61b",
     "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": 3928.883331298828,
-    "y": 4186.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3931,
+    "y": 4272,
+    "z": "f8944603.71553",
     "wires": [
       []
     ]
   },
   {
-    "id": "4494cc45.3ce764",
+    "id": "dad20130.739d78",
     "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": 3931.883331298828,
-    "y": 4231.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3934,
+    "y": 4317,
+    "z": "f8944603.71553",
     "wires": [
       []
     ]
   },
   {
-    "id": "d5c180c8.9f0b08",
+    "id": "fdfcc8c4.b3e8a8",
     "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": 3920.883331298828,
-    "y": 4022.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3926,
+    "y": 4045,
+    "z": "f8944603.71553",
     "wires": [
       []
     ]
   },
   {
-    "id": "123d53b6.2c62dc",
+    "id": "8b9dcfa3.01c508",
     "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": 3922.883331298828,
-    "y": 4069.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3928,
+    "y": 4092,
+    "z": "f8944603.71553",
     "wires": [
       []
     ]
   },
   {
-    "id": "8369bd06.57f78",
+    "id": "ed841a30.7664d",
     "type": "comment",
     "name": "The following two will be done in F1",
     "info": "",
     "comments": "",
-    "x": 3844.883331298828,
-    "y": 4139.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3847,
+    "y": 4225,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "487123e4.9cc8ac",
+    "id": "7144ff5f.c519e8",
     "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": 4451.883331298828,
-    "y": 4868.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4457,
+    "y": 4891,
+    "z": "f8944603.71553",
     "wires": [
       []
     ]
   },
   {
-    "id": "44d48088.590d78",
+    "id": "69d3ed18.577c3c",
     "type": "switchNode",
     "name": "switch no-pce-call",
     "xml": "<switch test='`$no-pce-call`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3706.883331298828,
-    "y": 5021.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3712,
+    "y": 5044,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "876b39f.35a52c8",
-        "8bc7cacf.04871"
+        "ae7574f4.3ebe3",
+        "8bd2d4fd.8c4f1"
       ]
     ]
   },
   {
-    "id": "8bc7cacf.04871",
+    "id": "8bd2d4fd.8c4f1",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3878.883331298828,
-    "y": 5018.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3884,
+    "y": 5041,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "682f4705.be7878"
+        "439959aa.a8d0e"
       ]
     ]
   },
   {
-    "id": "876b39f.35a52c8",
+    "id": "ae7574f4.3ebe3",
     "type": "outcomeFalse",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3830.883331298828,
-    "y": 5865.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3836,
+    "y": 5888,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "dd90ad1a.7eef1"
+        "b05d129.ef1b1f"
       ]
     ]
   },
   {
-    "id": "270e251f.118d82",
+    "id": "bbd89123.3c84c8",
     "type": "comment",
     "name": "1 --> PCE is needed",
     "info": "",
     "comments": "",
-    "x": 3891.883331298828,
-    "y": 4988.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3897,
+    "y": 5011,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "4e629c01.10676c",
+    "id": "88e636e4.0ad278",
     "type": "comment",
     "name": "2 --> no need to call PCE",
     "info": "",
     "comments": "",
-    "x": 3901.883331298828,
-    "y": 5823.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3907,
+    "y": 5846,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "b442de01.03d108",
+    "id": "3d1335ab.d13122",
     "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": 3928.883331298828,
-    "y": 4295.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3930,
+    "y": 4420,
+    "z": "f8944603.71553",
     "wires": [
       []
     ]
   },
   {
-    "id": "682f4705.be7878",
+    "id": "439959aa.a8d0e",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4054.883331298828,
-    "y": 5020.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4060,
+    "y": 5043,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "bf69d5f0.d5943",
-        "50051e09.5a44c8",
-        "d933fbbc.703308",
-        "52cab496.bab24c",
-        "86c9672.840f818",
-        "81a4b89b.48797",
-        "487123e4.9cc8ac"
+        "398ca5b9.10ae92",
+        "26315d76.5ba5da",
+        "70413194.4e4218",
+        "36f7b692.fe5f9a",
+        "23762b83.94d65c",
+        "1981b041.f96778",
+        "7144ff5f.c519e8",
+        "d1a4e2c9.15ac9",
+        "24040f90.d6a4"
       ]
     ]
   },
   {
-    "id": "b674f25b.3aa2a8",
+    "id": "9b6d23e8.2f4c1",
     "type": "comment",
     "name": "Use the middle-man-conn.eth-srv-name for the LEAF connectivity's eth srv name",
     "info": "",
     "comments": "",
-    "x": 5499.883331298828,
-    "y": 4493.883331298828,
-    "z": "4456793a.59a288",
+    "x": 5505,
+    "y": 4516,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "bf69d5f0.d5943",
+    "id": "398ca5b9.10ae92",
     "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": 4446.883331298828,
-    "y": 5171.883331298828,
-    "z": "4456793a.59a288",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "5c84b550.a10344",
-    "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": 3938.883331298828,
-    "y": 4350.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4438,
+    "y": 5546,
+    "z": "f8944603.71553",
     "wires": [
       []
     ]
   },
   {
-    "id": "a559e6ec.97fea8",
+    "id": "441ba30c.ae2a1c",
     "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": 3904.883331298828,
-    "y": 3563.883331298828,
-    "z": "4456793a.59a288",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "ce126dd2.e4e358",
-    "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 = $prop.connectivity-domainA-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.LEAF.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.LEAF.uni-p-interface-long`\" />",
-    "comments": "",
-    "outputs": 1,
-    "x": 3364.883331298828,
-    "y": 1782.8833312988281,
-    "z": "4456793a.59a288",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "b48deb35.d704b8",
-    "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-p-interface-short`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 3271.883331298828,
-    "y": 1729.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 3909,
+    "y": 3420,
+    "z": "f8944603.71553",
     "wires": [
       []
     ]
   },
   {
-    "id": "dfa7cbf8.916408",
-    "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": 3954.883331298828,
-    "y": 3266.883331298828,
-    "z": "4456793a.59a288",
-    "wires": []
-  },
-  {
-    "id": "c0792f26.4d13b8",
+    "id": "32f3c697.c51f22",
     "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": 3901.883331298828,
-    "y": 2854.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3907,
+    "y": 2877,
+    "z": "f8944603.71553",
     "wires": [
       []
     ]
   },
   {
-    "id": "e82ea719.e6f068",
+    "id": "f60b0d1b.343218",
     "type": "save",
     "name": "save connectivity resource in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='vpn-type' value='leaf' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 3849.883331298828,
-    "y": 2902.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3855,
+    "y": 2925,
+    "z": "f8944603.71553",
     "wires": [
       []
     ]
   },
   {
-    "id": "c4a1bace.0d4bb",
+    "id": "51fbee04.79f4f",
     "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": 3977.883331298828,
-    "y": 2949.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3983,
+    "y": 2972,
+    "z": "f8944603.71553",
     "wires": [
       []
     ]
   },
   {
-    "id": "c598b640.a89e8",
+    "id": "f3326814.1ece9",
     "type": "comment",
     "name": "Create LEAF connectivity",
     "info": "",
     "comments": "",
-    "x": 3814.883331298828,
-    "y": 2812.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3820,
+    "y": 2835,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "8f561f42.000fe8",
+    "id": "a2a5771a.032e88",
     "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`' />",
     "comments": "",
     "outputs": 1,
-    "x": 3811.883331298828,
-    "y": 3040.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3817,
+    "y": 3063,
+    "z": "f8944603.71553",
     "wires": [
       []
     ]
   },
   {
-    "id": "aa738c85.1c137",
+    "id": "a39c337f.4b8598",
     "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": 3904.883331298828,
-    "y": 3093.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3910,
+    "y": 3116,
+    "z": "f8944603.71553",
     "wires": [
       []
     ]
   },
   {
-    "id": "b51a7f91.5cff9",
+    "id": "71641615.6f44c8",
     "type": "comment",
     "name": "Create LEAF UNI",
     "info": "",
     "comments": "",
-    "x": 3795.883331298828,
-    "y": 2996.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3801,
+    "y": 3019,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "4ec3384a.676a5",
+    "id": "11067d29.f83e4b",
     "type": "comment",
     "name": "Create ROOT UNI",
     "info": "",
     "comments": "",
-    "x": 3801.883331298828,
-    "y": 3446.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3805,
+    "y": 3335,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "52cab496.bab24c",
+    "id": "36f7b692.fe5f9a",
     "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",
     "comments": "",
     "outputs": 1,
-    "x": 4368.883331298828,
-    "y": 4501.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4374,
+    "y": 4524,
+    "z": "f8944603.71553",
     "wires": [
       []
     ]
   },
   {
-    "id": "1646f155.836fb7",
+    "id": "fa6ec7f0.b5b858",
     "type": "comment",
     "name": "Create LEAF UNI",
     "info": "",
     "comments": "",
-    "x": 4352.883331298828,
-    "y": 4457.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4358,
+    "y": 4480,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "778ce84a.a3568",
+    "id": "87e40dc2.3dae2",
     "type": "comment",
     "name": "Create LEAF connectivity",
     "info": "",
     "comments": "",
-    "x": 5099.883331298828,
-    "y": 4488.883331298828,
-    "z": "4456793a.59a288",
+    "x": 5105,
+    "y": 4511,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "b61f10f5.eeecf",
+    "id": "a4406b4c.17bbc",
     "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": 5186.883331298828,
-    "y": 4530.883331298828,
-    "z": "4456793a.59a288",
+    "x": 5192,
+    "y": 4553,
+    "z": "f8944603.71553",
     "wires": [
       []
     ]
   },
   {
-    "id": "90640d99.12302",
+    "id": "18ca4a3.634f536",
     "type": "save",
     "name": "save connectivity resource in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />\n<parameter name='etht-svc-name' value='`$middle-man-conn.etht-svc-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='vpn-type' value='leaf' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 5134.883331298828,
-    "y": 4578.883331298828,
-    "z": "4456793a.59a288",
+    "x": 5140,
+    "y": 4601,
+    "z": "f8944603.71553",
     "wires": [
       []
     ]
   },
   {
-    "id": "42e8372d.d506e",
+    "id": "b4f57662.21d798",
     "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": 5262.883331298828,
-    "y": 4625.883331298828,
-    "z": "4456793a.59a288",
+    "x": 5268,
+    "y": 4648,
+    "z": "f8944603.71553",
     "wires": [
       []
     ]
   },
   {
-    "id": "81a4b89b.48797",
+    "id": "1981b041.f96778",
     "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": 4439.883331298828,
-    "y": 4910.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4445,
+    "y": 4933,
+    "z": "f8944603.71553",
     "wires": [
       []
     ]
   },
   {
-    "id": "a53bc0fc.34d448",
+    "id": "1ff0ab3b.554fd5",
     "type": "comment",
     "name": "populate connectivity-B variable in the context map",
     "info": "",
     "comments": "",
-    "x": 4422.883331298828,
-    "y": 4972.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4428,
+    "y": 4995,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "50051e09.5a44c8",
+    "id": "26315d76.5ba5da",
     "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": 4533.883331298828,
-    "y": 5014.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4539,
+    "y": 5037,
+    "z": "f8944603.71553",
     "wires": [
       []
     ]
   },
   {
-    "id": "3073b323.349b7c",
+    "id": "99476299.d65948",
     "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": 4981.883331298828,
-    "y": 5067.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4987,
+    "y": 5090,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "dbdd7c00.c39698",
+    "id": "7e1b41de.44cf5",
     "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": 4291.883331298828,
-    "y": 5765.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4297,
+    "y": 5788,
+    "z": "f8944603.71553",
     "wires": [
       []
     ]
   },
   {
-    "id": "1d6ec4bb.ad8c0b",
+    "id": "99207b39.65e8d8",
     "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",
     "comments": "",
     "outputs": 1,
-    "x": 4189.883331298828,
-    "y": 5714.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4195,
+    "y": 5737,
+    "z": "f8944603.71553",
     "wires": [
       []
     ]
   },
   {
-    "id": "41eb9866.4372",
+    "id": "fc9d3b48.0b961",
     "type": "comment",
     "name": "Create LEAF UNI",
     "info": "",
     "comments": "",
-    "x": 4173.883331298828,
-    "y": 5670.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4179,
+    "y": 5693,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "c54f6272.9ba24",
+    "id": "cdbca407.a3714",
     "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": 4980.883087158203,
-    "y": 5868.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4965,
+    "y": 5950,
+    "z": "f8944603.71553",
     "wires": [
       []
     ]
   },
   {
-    "id": "d933fbbc.703308",
+    "id": "70413194.4e4218",
     "type": "switchNode",
     "name": "switch found-root-connectivity",
     "xml": "\n<switch test=\"`$found-root-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4360.883331298828,
-    "y": 5071.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4366,
+    "y": 5094,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "4c2996a3.75ee88",
-        "d5943bd2.ad1f5"
+        "9e68e3f9.d79778",
+        "3f3ed24c.0decee"
       ]
     ]
   },
   {
-    "id": "4c2996a3.75ee88",
+    "id": "9e68e3f9.d79778",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4571.883331298828,
-    "y": 5071.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4577,
+    "y": 5094,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "8f5805d9.890fd8"
+        "e924e4da.1f13b"
       ]
     ]
   },
   {
-    "id": "8f5805d9.890fd8",
+    "id": "e924e4da.1f13b",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4727.883331298828,
-    "y": 5067.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4733,
+    "y": 5090,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "3073b323.349b7c",
-        "7eeebeb3.54b298",
-        "eadd33f3.5f43"
+        "99476299.d65948",
+        "259aff1b.d97a1",
+        "b61f1c95.4694d"
       ]
     ]
   },
   {
-    "id": "d5943bd2.ad1f5",
+    "id": "3f3ed24c.0decee",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4567.883331298828,
-    "y": 5119.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4573,
+    "y": 5142,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "329fba30.af81ce"
+        "6bc2c49e.5247fc"
       ]
     ]
   },
   {
-    "id": "329fba30.af81ce",
+    "id": "6bc2c49e.5247fc",
     "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": 4715.883331298828,
-    "y": 5114.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4721,
+    "y": 5137,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "7679135b.31e8e4",
+    "id": "540d81b.ac8608",
     "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": 5223.883331298828,
-    "y": 4696.883331298828,
-    "z": "4456793a.59a288",
+    "x": 5229,
+    "y": 4719,
+    "z": "f8944603.71553",
     "wires": [
       []
     ]
   },
   {
-    "id": "d050303.0f4a3d",
+    "id": "e8527008.db6228",
     "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": 2389.883331298828,
-    "y": 107.88333129882812,
-    "z": "4456793a.59a288",
+    "x": 2395,
+    "y": 130,
+    "z": "f8944603.71553",
     "wires": [
       []
     ]
   },
   {
-    "id": "c2f95f80.985fc",
+    "id": "a669b945.663408",
     "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": 2323.883331298828,
-    "y": 143.88333129882812,
-    "z": "4456793a.59a288",
+    "x": 2329,
+    "y": 166,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "360465cd.d1fc3a",
+    "id": "ba20200a.599368",
     "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": 2508.883331298828,
-    "y": 70.88333129882812,
-    "z": "4456793a.59a288",
+    "x": 2514,
+    "y": 93,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "33673680.57cf72",
+    "id": "f5cafc97.3be338",
     "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": 4258.883331298828,
-    "y": 5831.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4264,
+    "y": 5854,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "e2cec405.b0409",
+    "id": "433677c1.52ee48",
     "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": 4391.883331298828,
-    "y": 5879.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4397,
+    "y": 5902,
+    "z": "f8944603.71553",
     "wires": [
       []
     ]
   },
   {
-    "id": "6e2ab292.566884",
+    "id": "fabf4cab.b217e",
     "type": "switchNode",
     "name": "switch found-connectivity?",
     "xml": "\n<switch test=\"`$found-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4210.883331298828,
-    "y": 5937.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4216,
+    "y": 5960,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "9073e816.ad482",
-        "45d66689.aaaf7"
+        "d58843e6.45b67",
+        "5480ce12.618198"
       ]
     ]
   },
   {
-    "id": "9073e816.ad482",
+    "id": "d58843e6.45b67",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4403.883331298828,
-    "y": 5938.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4409,
+    "y": 5961,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "db09f17e.79bb3"
+        "3584d606.ea3b92"
       ]
     ]
   },
   {
-    "id": "db09f17e.79bb3",
+    "id": "3584d606.ea3b92",
     "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": 4559.883331298828,
-    "y": 5935.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4565,
+    "y": 5958,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "45d66689.aaaf7",
+    "id": "5480ce12.618198",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4407.883331298828,
-    "y": 5982.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4413,
+    "y": 6005,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "2adb498f.b3f97e"
+        "2c5800b.fe6138"
       ]
     ]
   },
   {
-    "id": "2adb498f.b3f97e",
+    "id": "2c5800b.fe6138",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4546.883331298828,
-    "y": 5977.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4552,
+    "y": 6000,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "c54f6272.9ba24",
-        "6998ca1d.92c5d4",
-        "15021f96.80eb18",
-        "e6e1dbd3.6e0a6",
-        "67962261.2516d4",
-        "1b601be6.7f6134",
-        "27a83227.012ede",
-        "b320b0e.20770d",
-        "34955381.c5797c",
-        "9ca77368.01f7",
-        "6922fe88.2fe5f8",
-        "4514c9c4.eaef1"
+        "cdbca407.a3714",
+        "908326bd.db0de8",
+        "252b791f.9db75e",
+        "275b22ee.4a806e",
+        "331c47e0.bff598",
+        "cf9d9601.e8d088",
+        "b92b2881.bc3e18",
+        "19e51740.b8f8a1",
+        "2ded21f8.219046",
+        "a0a762d0.469c28",
+        "60c16c76.a98d34",
+        "8396080f.a7f6c8"
       ]
     ]
   },
   {
-    "id": "27a83227.012ede",
+    "id": "b92b2881.bc3e18",
     "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": 4743.883331298828,
-    "y": 6656.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4749,
+    "y": 6679,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "c2308ca7.57dff",
-        "aeb0b0d0.9dedb8",
-        "b67a59a3.18fb1"
+        "b068e9a3.d4db4",
+        "b79debc6.f268c",
+        "599f79e1.6940a8"
       ]
     ]
   },
   {
-    "id": "c2308ca7.57dff",
+    "id": "b068e9a3.d4db4",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4948.883331298828,
-    "y": 6653.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4954,
+    "y": 6676,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "eeeb2441.6710c8"
+        "be7eb0d3.672b2"
       ]
     ]
   },
   {
-    "id": "aeb0b0d0.9dedb8",
+    "id": "b79debc6.f268c",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4932.374298095703,
-    "y": 6715.457366943359,
-    "z": "4456793a.59a288",
+    "x": 4937.490966796875,
+    "y": 6737.574035644531,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "77e5496.94ba0b8"
+        "7384abca.e83424"
       ]
     ]
   },
   {
-    "id": "b67a59a3.18fb1",
+    "id": "599f79e1.6940a8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4929.883331298828,
-    "y": 6758.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4935,
+    "y": 6781,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "f70b29bb.3fb788"
+        "5c72f79d.0cafa"
       ]
     ]
   },
   {
-    "id": "eeeb2441.6710c8",
+    "id": "be7eb0d3.672b2",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5104.883331298828,
-    "y": 6667.883331298828,
-    "z": "4456793a.59a288",
+    "x": 5110,
+    "y": 6690,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "a3bf8aa6.020cb8"
+        "477f7936.afbf38"
       ]
     ]
   },
   {
-    "id": "77e5496.94ba0b8",
+    "id": "7384abca.e83424",
     "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": 5094.945709228516,
-    "y": 6715.743103027344,
-    "z": "4456793a.59a288",
+    "x": 5100.0623779296875,
+    "y": 6737.859771728516,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "f70b29bb.3fb788",
+    "id": "5c72f79d.0cafa",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 5096.883331298828,
-    "y": 6757.883331298828,
-    "z": "4456793a.59a288",
+    "x": 5102,
+    "y": 6780,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "a3bf8aa6.020cb8",
+    "id": "477f7936.afbf38",
     "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": 5351.883331298828,
-    "y": 6664.883331298828,
-    "z": "4456793a.59a288",
+    "x": 5357,
+    "y": 6687,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "8a5692b6.b002c8"
+        "8d0d8dd8.5dff18"
       ]
     ]
   },
   {
-    "id": "8a5692b6.b002c8",
+    "id": "8d0d8dd8.5dff18",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5588.883331298828,
-    "y": 6660.883331298828,
-    "z": "4456793a.59a288",
+    "x": 5594,
+    "y": 6683,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "eabc4609.9defb"
+        "234239f1.092ec6"
       ]
     ]
   },
   {
-    "id": "98f388ed.2cda7",
+    "id": "af0f93b9.f63018",
     "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": 5831.883331298828,
-    "y": 6632.883331298828,
-    "z": "4456793a.59a288",
+    "x": 5837,
+    "y": 6655,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "6a0ae6a2.ba9fb",
-        "25f881ea.6e0566"
+        "1906307e.4f6708",
+        "7e26fbb1.9c733c"
       ]
     ]
   },
   {
-    "id": "6a0ae6a2.ba9fb",
+    "id": "1906307e.4f6708",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6036.883331298828,
-    "y": 6652.883331298828,
-    "z": "4456793a.59a288",
+    "x": 6042,
+    "y": 6675,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "eabc4609.9defb"
+        "234239f1.092ec6"
       ]
     ]
   },
   {
-    "id": "25f881ea.6e0566",
+    "id": "7e26fbb1.9c733c",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6035.883331298828,
-    "y": 6605.883331298828,
-    "z": "4456793a.59a288",
+    "x": 6041,
+    "y": 6628,
+    "z": "f8944603.71553",
     "wires": [
       []
     ]
   },
   {
-    "id": "eabc4609.9defb",
+    "id": "234239f1.092ec6",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4779.883331298828,
-    "y": 6927.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4785,
+    "y": 6950,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "392e3f81.e0a6a8"
+        "9c243a63.6beae8"
       ]
     ]
   },
   {
-    "id": "f8de35a7.d0325",
+    "id": "7d275a16.b90c94",
     "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": 6241.88330078125,
-    "y": 6865.88330078125,
-    "z": "4456793a.59a288",
+    "x": 6246.999969482422,
+    "y": 6887.999969482422,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "8d84ad9.3a159d",
+    "id": "62c83b20.7bb344",
     "type": "comment",
     "name": "find all OTNs that have srcTtpOtnLayer and increase their bandwidth",
     "info": "",
     "comments": "",
-    "x": 4841.883331298828,
-    "y": 6603.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4847,
+    "y": 6626,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "1b601be6.7f6134",
+    "id": "cf9d9601.e8d088",
     "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": 4725.883331298828,
-    "y": 6452.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4729,
+    "y": 6514,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "6e7ae435.b7607c",
+    "id": "fb325d12.16a73",
     "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": 5070.883331298828,
-    "y": 6283.883331298828,
-    "z": "4456793a.59a288",
+    "x": 5074,
+    "y": 6345,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "82ed19a6.aafd78"
+        "2ae3447b.0a1c44"
       ]
     ]
   },
   {
-    "id": "82ed19a6.aafd78",
+    "id": "2ae3447b.0a1c44",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5290.883331298828,
-    "y": 6289.883331298828,
-    "z": "4456793a.59a288",
+    "x": 5294,
+    "y": 6351,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "fa1ec726.b4647"
+        "47fb23b1.c734fc"
       ]
     ]
   },
   {
-    "id": "fa1ec726.b4647",
+    "id": "47fb23b1.c734fc",
     "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": 5475.883331298828,
-    "y": 6288.883331298828,
-    "z": "4456793a.59a288",
+    "x": 5481,
+    "y": 6311,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "46306bd4.ee79e4"
+        "504a47cd.0300d8"
       ]
     ]
   },
   {
-    "id": "46306bd4.ee79e4",
+    "id": "504a47cd.0300d8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5667.883331298828,
-    "y": 6291.883331298828,
-    "z": "4456793a.59a288",
+    "x": 5673,
+    "y": 6314,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "3b3ddb68.994c3c"
+        "70b7cd06.f487e4"
       ]
     ]
   },
   {
-    "id": "3b3ddb68.994c3c",
+    "id": "70b7cd06.f487e4",
     "type": "set",
     "name": "set otnTopoIdSrc",
     "xml": "<set>\n<parameter name='otnTopoIdSrc' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />\n",
     "comments": "",
-    "x": 5876.883331298828,
-    "y": 6289.883331298828,
-    "z": "4456793a.59a288",
+    "x": 5882,
+    "y": 6312,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "b320b0e.20770d",
+    "id": "19e51740.b8f8a1",
     "type": "for",
     "name": "for netwidx..allNetworksList_length",
     "xml": "<for index='netwidx' start='0' end='`$allNetworksList.network-resource_length`' >",
     "comments": "",
     "outputs": 1,
-    "x": 4777.883331298828,
-    "y": 6277.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4781,
+    "y": 6339,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "6e7ae435.b7607c"
+        "fb325d12.16a73"
       ]
     ]
   },
   {
-    "id": "15021f96.80eb18",
+    "id": "252b791f.9db75e",
     "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": 4785.883331298828,
-    "y": 6170.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4789,
+    "y": 6232,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "90de6696.037bd8",
-        "ce29f9bd.7d263",
-        "94bbebf0.09f428"
+        "ab2e0e9b.e6e2a",
+        "175d6a26.e8f2ae",
+        "30472c6d.7bfeec"
       ]
     ]
   },
   {
-    "id": "90de6696.037bd8",
+    "id": "ab2e0e9b.e6e2a",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5021.883331298828,
-    "y": 6153.883331298828,
-    "z": "4456793a.59a288",
+    "x": 5025,
+    "y": 6215,
+    "z": "f8944603.71553",
     "wires": [
       []
     ]
   },
   {
-    "id": "ce29f9bd.7d263",
+    "id": "175d6a26.e8f2ae",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5018.883331298828,
-    "y": 6194.883331298828,
-    "z": "4456793a.59a288",
+    "x": 5022,
+    "y": 6256,
+    "z": "f8944603.71553",
     "wires": [
       []
     ]
   },
   {
-    "id": "94bbebf0.09f428",
+    "id": "30472c6d.7bfeec",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5032.883331298828,
-    "y": 6234.883331298828,
-    "z": "4456793a.59a288",
+    "x": 5036,
+    "y": 6296,
+    "z": "f8944603.71553",
     "wires": [
       []
     ]
   },
   {
-    "id": "e6e1dbd3.6e0a6",
+    "id": "275b22ee.4a806e",
     "type": "set",
     "name": "unset parameters",
     "xml": "<set>\n<parameter name='tmp.pce-src-node.' value='' />\n",
     "comments": "",
-    "x": 4721.883331298828,
-    "y": 6329.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4725,
+    "y": 6391,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "67962261.2516d4",
+    "id": "331c47e0.bff598",
     "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": 4729.883331298828,
-    "y": 6387.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4733,
+    "y": 6449,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "6998ca1d.92c5d4",
+    "id": "908326bd.db0de8",
     "type": "set",
     "name": "unset parameters",
     "xml": "<set>\n<parameter name='allNetworksList.' value='' />\n",
     "comments": "",
-    "x": 4734.883331298828,
-    "y": 6127.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4738,
+    "y": 6189,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "94b4d538.041a9",
+    "id": "8ef1afe7.71ad38",
     "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": 4849.883331298828,
-    "y": 6079.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4853,
+    "y": 6141,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "392e3f81.e0a6a8",
+    "id": "9c243a63.6beae8",
     "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": 5022.883331298828,
-    "y": 6924.883331298828,
-    "z": "4456793a.59a288",
+    "x": 5028,
+    "y": 6947,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "84fb2e7.f2e54d",
-        "113d3615.17adaa"
+        "14533561.0c5673",
+        "af779ea0.7fb81"
       ]
     ]
   },
   {
-    "id": "84fb2e7.f2e54d",
+    "id": "14533561.0c5673",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5251.883331298828,
-    "y": 6901.883331298828,
-    "z": "4456793a.59a288",
+    "x": 5257,
+    "y": 6924,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "c3b316fd.fba0a8"
+        "55635f65.d76ee8"
       ]
     ]
   },
   {
-    "id": "113d3615.17adaa",
+    "id": "af779ea0.7fb81",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5251.883331298828,
-    "y": 6950.883331298828,
-    "z": "4456793a.59a288",
+    "x": 5257,
+    "y": 6973,
+    "z": "f8944603.71553",
     "wires": [
       []
     ]
   },
   {
-    "id": "b6424391.0ceee8",
+    "id": "494eed0f.99eb84",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5984.88330078125,
-    "y": 6956.88330078125,
-    "z": "4456793a.59a288",
+    "x": 5989.999969482422,
+    "y": 6978.999969482422,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "1cb2d5ed.65008a",
-        "f8de35a7.d0325",
-        "515cca2b.2a6e8c"
+        "6ed262af.6482c4",
+        "7d275a16.b90c94",
+        "ea085aad.03ece"
       ]
     ]
   },
   {
-    "id": "b0305853.25009",
+    "id": "eb8bdae2.80aaf8",
     "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": 6369.88330078125,
-    "y": 6919.88330078125,
-    "z": "4456793a.59a288",
+    "x": 6374.999969482422,
+    "y": 6941.999969482422,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "515cca2b.2a6e8c",
+    "id": "ea085aad.03ece",
     "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": 6339.88330078125,
-    "y": 6979.88330078125,
-    "z": "4456793a.59a288",
+    "x": 6344.999969482422,
+    "y": 7001.999969482422,
+    "z": "f8944603.71553",
     "wires": [
       []
     ]
   },
   {
-    "id": "1cb2d5ed.65008a",
+    "id": "6ed262af.6482c4",
     "type": "set",
     "name": "unset tmp.aai.the-vpn-binding",
     "xml": "<set>\n<parameter name='tmp.aai.the-vpn-binding.' value=\"\" />\n",
     "comments": "",
-    "x": 6246.88330078125,
-    "y": 6807.88330078125,
-    "z": "4456793a.59a288",
+    "x": 6251.999969482422,
+    "y": 6829.999969482422,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "dd90ad1a.7eef1",
+    "id": "b05d129.ef1b1f",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 3982.883331298828,
-    "y": 5864.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3988,
+    "y": 5887,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "1d6ec4bb.ad8c0b",
-        "33673680.57cf72",
-        "e2cec405.b0409",
-        "6e2ab292.566884",
-        "dbdd7c00.c39698"
+        "99207b39.65e8d8",
+        "f5cafc97.3be338",
+        "433677c1.52ee48",
+        "fabf4cab.b217e",
+        "7e1b41de.44cf5"
       ]
     ]
   },
   {
-    "id": "74fcf6b5.dbb39",
+    "id": "e2f1cfff.a8b258",
     "type": "set",
     "name": "unset otnTopoIdSrc",
     "xml": "<set>\n<parameter name='otnTopoIdSrc' value='' />\n",
     "comments": "",
-    "x": 4726.883331298828,
-    "y": 6227.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4730,
+    "y": 6289,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "34955381.c5797c",
+    "id": "2ded21f8.219046",
     "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": 4873.883087158203,
-    "y": 5949.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4858,
+    "y": 6031,
+    "z": "f8944603.71553",
     "wires": [
       []
     ]
   },
   {
-    "id": "2a032dd9.9380b2",
+    "id": "4a18264c.6d9e",
     "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": 5010.883087158203,
-    "y": 5899.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4995,
+    "y": 5981,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "b937ed07.a77618",
+    "id": "124ab46d.2d752c",
     "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",
     "comments": "",
     "outputs": 1,
-    "x": 3817.883331298828,
-    "y": 3505.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3822,
+    "y": 3374,
+    "z": "f8944603.71553",
     "wires": [
       []
     ]
   },
   {
-    "id": "3dd82151.976f0e",
+    "id": "826efc02.44c7b",
     "type": "comment",
     "name": "NOT NEEDED ANYMORE?",
     "info": "",
     "comments": "",
-    "x": 3999.883331298828,
-    "y": 1760.8833312988281,
-    "z": "4456793a.59a288",
+    "x": 3999.999969482422,
+    "y": 1608.9999694824219,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "6b6522.bc964ae",
+    "id": "3746cfac.cfad98",
     "type": "comment",
     "name": "NOT NEEDED ANYMORE?",
     "info": "",
     "comments": "",
-    "x": 3977.883331298828,
-    "y": 2630.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3978.9999389648438,
+    "y": 2120.9999389648438,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "195c3e5b.085da2",
+    "id": "b5ea3d16.fd41f",
     "type": "comment",
     "name": "TEMPORARY REMOVING THE FOLLOWING TWO NODES",
     "info": "",
     "comments": "",
-    "x": 3808.883331298828,
-    "y": 3972.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3814,
+    "y": 3995,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "a8e7354f.a1833",
+    "id": "9d7f2116.baeda",
     "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": 3489.883331298828,
-    "y": 6004.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3904,
+    "y": 6375,
+    "z": "f8944603.71553",
     "wires": [
       []
     ]
   },
   {
-    "id": "a2dd9c19.75287",
+    "id": "f2a7dc4a.68ede",
     "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": 3700.883331298828,
-    "y": 4881.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3706,
+    "y": 4904,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "906b118c.b5ca4",
+    "id": "a789852e.51cd48",
     "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": 3833.883331298828,
-    "y": 4929.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3839,
+    "y": 4952,
+    "z": "f8944603.71553",
     "wires": [
       []
     ]
   },
   {
-    "id": "86c9672.840f818",
+    "id": "23762b83.94d65c",
     "type": "switchNode",
     "name": "switch found-connectivity?",
     "xml": "\n<switch test=\"`$found-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4379.883331298828,
-    "y": 4557.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4385,
+    "y": 4580,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "b9a92126.1d0eb",
-        "e7523195.456808"
+        "e4f34350.306628",
+        "84eda9bb.13e58"
       ]
     ]
   },
   {
-    "id": "b9a92126.1d0eb",
+    "id": "e4f34350.306628",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4572.883331298828,
-    "y": 4558.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4578,
+    "y": 4581,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "71a4d763.a9eac"
+        "d93f9a59.274b5"
       ]
     ]
   },
   {
-    "id": "e7523195.456808",
+    "id": "84eda9bb.13e58",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4576.883331298828,
-    "y": 4602.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4582,
+    "y": 4625,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "6742a953.fe0d28"
+        "fa8add54.9c2898"
       ]
     ]
   },
   {
-    "id": "6742a953.fe0d28",
+    "id": "fa8add54.9c2898",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4715.883331298828,
-    "y": 4597.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4721,
+    "y": 4620,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "34f2cb8a.7f3954",
-        "50607a4b.9927b4",
-        "d6e6e1de.8f0598"
+        "48346123.4f10a8",
+        "5e210590.033b4c",
+        "140ccb32.dd72dd"
       ]
     ]
   },
   {
-    "id": "71a4d763.a9eac",
+    "id": "d93f9a59.274b5",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4715.883331298828,
-    "y": 4554.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4721,
+    "y": 4577,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "b61f10f5.eeecf",
-        "90640d99.12302",
-        "42e8372d.d506e",
-        "7679135b.31e8e4"
+        "a4406b4c.17bbc",
+        "18ca4a3.634f536",
+        "b4f57662.21d798",
+        "540d81b.ac8608"
       ]
     ]
   },
   {
-    "id": "34f2cb8a.7f3954",
+    "id": "48346123.4f10a8",
     "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": 5117.883575439453,
-    "y": 4819.883331298828,
-    "z": "4456793a.59a288",
+    "x": 5123.000244140625,
+    "y": 4842,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "9d0b91dc.02ae8",
+    "id": "54a11c60.7fd1ec",
     "type": "comment",
     "name": "populate connectivity-A variable in the context map",
     "info": "",
     "comments": "",
-    "x": 5124.883575439453,
-    "y": 4773.883331298828,
-    "z": "4456793a.59a288",
+    "x": 5130.000244140625,
+    "y": 4796,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "9ca77368.01f7",
+    "id": "a0a762d0.469c28",
     "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": 4914.883331298828,
-    "y": 6552.883331298828,
-    "z": "4456793a.59a288",
+    "x": 4920,
+    "y": 6575,
+    "z": "f8944603.71553",
     "wires": [
       []
     ]
   },
   {
-    "id": "50607a4b.9927b4",
+    "id": "5e210590.033b4c",
     "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": 5235.883575439453,
-    "y": 4861.883331298828,
-    "z": "4456793a.59a288",
+    "x": 5241.000244140625,
+    "y": 4884,
+    "z": "f8944603.71553",
     "wires": [
       []
     ]
   },
   {
-    "id": "7eeebeb3.54b298",
+    "id": "259aff1b.d97a1",
     "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": 5110.883331298828,
-    "y": 5119.883331298828,
-    "z": "4456793a.59a288",
+    "x": 5116,
+    "y": 5142,
+    "z": "f8944603.71553",
     "wires": [
       []
     ]
   },
   {
-    "id": "d039e4e7.e91be8",
+    "id": "80314ddc.393748",
     "type": "comment",
     "name": "Update ROOT UNI's bw",
     "info": "",
     "comments": "",
-    "x": 3664.883331298828,
-    "y": 4479.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3461,
+    "y": 4475,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "3c0dfd8f.f0eaca",
+    "id": "d1326c21.abc33",
     "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": 3998.883331298828,
-    "y": 4662.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3983,
+    "y": 4576,
+    "z": "f8944603.71553",
     "wires": [
       []
     ]
   },
   {
-    "id": "80cc4c1e.a6bfe",
+    "id": "434bd8c2.bae4f8",
     "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": 3610.883331298828,
-    "y": 4529.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3440,
+    "y": 4519,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "ef8f5d34.35bfc8",
-        "7b54fcfe.00d69c",
-        "e9708f34.58ed3"
+        "7ea7dff4.93abc",
+        "616c8d40.285e14",
+        "ffe0a536.7eaff8"
       ]
     ]
   },
   {
-    "id": "7b54fcfe.00d69c",
+    "id": "616c8d40.285e14",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3838.374298095703,
-    "y": 4502.457305908203,
-    "z": "4456793a.59a288",
+    "x": 3628.490966796875,
+    "y": 4487.57421875,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "edc83f73.f7df38"
+        "739b53.f4a4fcac"
       ]
     ]
   },
   {
-    "id": "e9708f34.58ed3",
+    "id": "ffe0a536.7eaff8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3833.883331298828,
-    "y": 4546.883270263672,
-    "z": "4456793a.59a288",
+    "x": 3617,
+    "y": 4527,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "a66e06b4.3bd7c"
+        "68d1064e.ebb3b8"
       ]
     ]
   },
   {
-    "id": "edc83f73.f7df38",
+    "id": "739b53.f4a4fcac",
     "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": 4000.945831298828,
-    "y": 4501.743011474609,
-    "z": "4456793a.59a288",
+    "x": 3788.0625,
+    "y": 4485.85986328125,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "a66e06b4.3bd7c",
+    "id": "68d1064e.ebb3b8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 4001.883331298828,
-    "y": 4546.883270263672,
-    "z": "4456793a.59a288",
+    "x": 3778,
+    "y": 4528,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "fa42d876.f3bfc8",
+    "id": "aedbd8f5.94f11",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3786.883331298828,
-    "y": 4619.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3780,
+    "y": 4572,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "b660a30a.8893a8",
-        "3c0dfd8f.f0eaca"
+        "530f885c.d5a28",
+        "d1326c21.abc33"
       ]
     ]
   },
   {
-    "id": "ef8f5d34.35bfc8",
+    "id": "7ea7dff4.93abc",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3617.883331298828,
-    "y": 4619.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3622,
+    "y": 4564,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "fa42d876.f3bfc8"
+        "aedbd8f5.94f11"
       ]
     ]
   },
   {
-    "id": "b660a30a.8893a8",
+    "id": "530f885c.d5a28",
     "type": "set",
     "name": "set new bw",
     "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.rootuni.data-source + $gfp`' />\n",
     "comments": "",
-    "x": 3975.883331298828,
-    "y": 4611.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3941,
+    "y": 4504,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "3d1de5ec.2ac45a",
+    "id": "cd1fc06c.124968",
     "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": 3808.883331298828,
-    "y": 4757.883331298828,
-    "z": "4456793a.59a288",
+    "x": 3806,
+    "y": 4843,
+    "z": "f8944603.71553",
     "wires": [
       []
     ]
   },
   {
-    "id": "25e4380.733ab48",
+    "id": "ac8fc812.ca8b88",
     "type": "comment",
     "name": "Temporary skipping this check - to support multiple instances in one slice",
     "info": "",
     "comments": "",
-    "x": 5915.766632080078,
-    "y": 6570.766632080078,
-    "z": "4456793a.59a288",
+    "x": 5920.88330078125,
+    "y": 6592.88330078125,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "d6e6e1de.8f0598",
+    "id": "140ccb32.dd72dd",
     "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": 5115.550567626953,
-    "y": 4957.966827392578,
-    "z": "4456793a.59a288",
+    "x": 5120.667236328125,
+    "y": 4980.08349609375,
+    "z": "f8944603.71553",
     "wires": [
       []
     ]
   },
   {
-    "id": "924c8eb8.8bcc2",
+    "id": "60fccea7.c83a28",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 5117.767364501953,
-    "y": 4917.766632080078,
-    "z": "4456793a.59a288",
+    "x": 5122.884033203125,
+    "y": 4939.88330078125,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "eadd33f3.5f43",
+    "id": "b61f1c95.4694d",
     "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": 4991.550323486328,
-    "y": 5207.966827392578,
-    "z": "4456793a.59a288",
+    "x": 4996.6669921875,
+    "y": 5230.08349609375,
+    "z": "f8944603.71553",
     "wires": [
       []
     ]
   },
   {
-    "id": "33d164e6.6e7844",
+    "id": "82a40a13.767da8",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 4993.767120361328,
-    "y": 5167.766632080078,
-    "z": "4456793a.59a288",
+    "x": 4998.8837890625,
+    "y": 5189.88330078125,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "3216abfb.82724c",
+    "id": "91bd4596.74f628",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-ROOT-conn",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-ROOT-conn' mode='sync' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5086.350128173828,
-    "y": 5663.399932861328,
-    "z": "4456793a.59a288",
+    "x": 5086.466796875,
+    "y": 5592.5166015625,
+    "z": "f8944603.71553",
     "wires": [
       []
     ]
   },
   {
-    "id": "723b66c7.37bb08",
+    "id": "f50c2a2e.93dfe8",
     "type": "switchNode",
     "name": "switch found-root-connectivity",
     "xml": "\n<switch test=\"`$found-root-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4913.350128173828,
-    "y": 5720.399932861328,
-    "z": "4456793a.59a288",
+    "x": 4913.466796875,
+    "y": 5649.5166015625,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "4b59f245.4d6edc",
-        "fb820a66.06fc1"
+        "8646fa93.554c38",
+        "a6ded94a.e3e54"
       ]
     ]
   },
   {
-    "id": "4b59f245.4d6edc",
+    "id": "8646fa93.554c38",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5124.350128173828,
-    "y": 5720.399932861328,
-    "z": "4456793a.59a288",
+    "x": 5124.466796875,
+    "y": 5649.5166015625,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "95f01780.285928"
+        "258b63bd.85fb7c"
       ]
     ]
   },
   {
-    "id": "fb820a66.06fc1",
+    "id": "a6ded94a.e3e54",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5120.350128173828,
-    "y": 5768.399932861328,
-    "z": "4456793a.59a288",
+    "x": 5120.466796875,
+    "y": 5697.5166015625,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "ceaa430d.e25cf8"
+        "d925f9fa.8153b8"
       ]
     ]
   },
   {
-    "id": "95f01780.285928",
+    "id": "258b63bd.85fb7c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5280.350128173828,
-    "y": 5716.399932861328,
-    "z": "4456793a.59a288",
+    "x": 5280.466796875,
+    "y": 5645.5166015625,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "363f2480.f640d4",
-        "ec57c9d5.e1e658",
-        "18db1f41.a7c409"
+        "8d6cf51e.6059f8",
+        "44488697.cdb02",
+        "c9ce352b.46ce88"
       ]
     ]
   },
   {
-    "id": "ceaa430d.e25cf8",
+    "id": "d925f9fa.8153b8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='Root Connectivity was not found' />\n",
     "comments": "",
-    "x": 5268.350128173828,
-    "y": 5763.399932861328,
-    "z": "4456793a.59a288",
+    "x": 5268.466796875,
+    "y": 5692.5166015625,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "7a15e8cb.5f6df8",
+    "id": "df7464c9.77f0d",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 5546.233917236328,
-    "y": 5816.283233642578,
-    "z": "4456793a.59a288",
+    "x": 5590.3505859375,
+    "y": 5746.39990234375,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "18db1f41.a7c409",
+    "id": "c9ce352b.46ce88",
     "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": 5544.017120361328,
-    "y": 5856.483428955078,
-    "z": "4456793a.59a288",
+    "x": 5594.1337890625,
+    "y": 5784.60009765625,
+    "z": "f8944603.71553",
     "wires": [
       []
     ]
   },
   {
-    "id": "ec57c9d5.e1e658",
+    "id": "44488697.cdb02",
     "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": 5663.350128173828,
-    "y": 5768.399932861328,
-    "z": "4456793a.59a288",
+    "x": 5700.466796875,
+    "y": 5697.5166015625,
+    "z": "f8944603.71553",
     "wires": [
       []
     ]
   },
   {
-    "id": "363f2480.f640d4",
+    "id": "8d6cf51e.6059f8",
     "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": 5534.350128173828,
-    "y": 5716.399932861328,
-    "z": "4456793a.59a288",
+    "x": 5584.466796875,
+    "y": 5645.5166015625,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "60039858.187258",
+    "id": "7e224339.ebcda4",
     "type": "comment",
     "name": "populate connectivity-B variable in the context map",
     "info": "",
     "comments": "",
-    "x": 4975.350128173828,
-    "y": 5621.399932861328,
-    "z": "4456793a.59a288",
+    "x": 4975.466796875,
+    "y": 5550.5166015625,
+    "z": "f8944603.71553",
     "wires": []
   },
   {
-    "id": "6922fe88.2fe5f8",
+    "id": "60c16c76.a98d34",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4682.683135986328,
-    "y": 5703.399932861328,
-    "z": "4456793a.59a288",
+    "x": 4687.7998046875,
+    "y": 5725.5166015625,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "3216abfb.82724c",
-        "723b66c7.37bb08"
+        "91bd4596.74f628",
+        "f50c2a2e.93dfe8",
+        "b08c7802.5d204",
+        "7492e58a.da53dc"
       ]
     ]
   },
   {
-    "id": "4514c9c4.eaef1",
+    "id": "8396080f.a7f6c8",
     "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": 5003.716094970703,
-    "y": 6005.083526611328,
-    "z": "4456793a.59a288",
+    "x": 4987.8330078125,
+    "y": 6086.2001953125,
+    "z": "f8944603.71553",
     "wires": [
       []
     ]
   },
   {
-    "id": "d7548734.759b08",
+    "id": "e07ba4bc.bfaae8",
     "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": 5789,
-    "y": 6901,
-    "z": "4456793a.59a288",
+    "x": 5794.116668701172,
+    "y": 6923.116668701172,
+    "z": "f8944603.71553",
     "wires": [
       []
     ]
   },
   {
-    "id": "c3b316fd.fba0a8",
+    "id": "55635f65.d76ee8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5408,
-    "y": 6904,
-    "z": "4456793a.59a288",
+    "x": 5413.116668701172,
+    "y": 6926.116668701172,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "d7548734.759b08",
-        "d42bdb23.7a5dc8",
-        "40573be3.cee89c"
+        "e07ba4bc.bfaae8",
+        "d0282e45.27576",
+        "be279863.754a6"
       ]
     ]
   },
   {
-    "id": "d42bdb23.7a5dc8",
+    "id": "d0282e45.27576",
     "type": "switchNode",
     "name": "switch $foundVpnName",
     "xml": "<switch test=\"`$foundVpnName`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5634,
-    "y": 6956,
-    "z": "4456793a.59a288",
+    "x": 5639.116668701172,
+    "y": 6978.116668701172,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "4a08f8b2.c71278"
+        "adb0d898.09cba8"
       ]
     ]
   },
   {
-    "id": "4a08f8b2.c71278",
+    "id": "adb0d898.09cba8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5813,
-    "y": 6955,
-    "z": "4456793a.59a288",
+    "x": 5818.116668701172,
+    "y": 6977.116668701172,
+    "z": "f8944603.71553",
     "wires": [
       [
-        "b6424391.0ceee8"
+        "494eed0f.99eb84"
       ]
     ]
   },
   {
-    "id": "40573be3.cee89c",
+    "id": "be279863.754a6",
     "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": 5635,
-    "y": 6849,
-    "z": "4456793a.59a288",
+    "x": 5640.116668701172,
+    "y": 6871.116668701172,
+    "z": "f8944603.71553",
+    "wires": []
+  },
+  {
+    "id": "3cd9264c.3cdbea",
+    "type": "notify",
+    "name": "notify",
+    "xml": "<notify plugin='' resource='' action='' >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2634.116668701172,
+    "y": 920.1166687011719,
+    "z": "f8944603.71553",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "d4db1de6.243c9",
+    "type": "set",
+    "name": "set network-route-three",
+    "xml": "<set>\n<parameter name='network-route-three' value=\"`$tmp.aai.logical-link.segment-id`\" />\n\n\n",
+    "comments": "",
+    "x": 3312.116668701172,
+    "y": 696.1166687011719,
+    "z": "f8944603.71553",
+    "wires": []
+  },
+  {
+    "id": "b2eea3d4.d83b2",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3528.116668701172,
+    "y": 1024.1166687011719,
+    "z": "f8944603.71553",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "c92a9c74.6d8cb",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3523.625732421875,
+    "y": 1066.542724609375,
+    "z": "f8944603.71553",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "be6d3c2.c1bdfc",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3527.625701904297,
+    "y": 1114.5426940917969,
+    "z": "f8944603.71553",
+    "wires": [
+      [
+        "82044de7.824378"
+      ]
+    ]
+  },
+  {
+    "id": "82044de7.824378",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 3685.116668701172,
+    "y": 1114.1166687011719,
+    "z": "f8944603.71553",
+    "wires": [
+      [
+        "9732d3c5.76e0c8"
+      ]
+    ]
+  },
+  {
+    "id": "9732d3c5.76e0c8",
+    "type": "switchNode",
+    "name": "switch nr type",
+    "xml": "<switch test='`$tmp.aai.network-route-three.type`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3855.11669921875,
+    "y": 1117.1168212890625,
+    "z": "f8944603.71553",
+    "wires": [
+      [
+        "7d1d73b.5c3fc8c",
+        "8cd6f95a.d7c4d",
+        "68098f91.a64618"
+      ]
+    ]
+  },
+  {
+    "id": "7d1d73b.5c3fc8c",
+    "type": "outcome",
+    "name": "ROOT",
+    "xml": "<outcome value='ROOT'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4029.116668701172,
+    "y": 1055.1167907714844,
+    "z": "f8944603.71553",
+    "wires": [
+      [
+        "a9479bec.894888"
+      ]
+    ]
+  },
+  {
+    "id": "8cd6f95a.d7c4d",
+    "type": "outcome",
+    "name": "LEAF",
+    "xml": "<outcome value='LEAF'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4031.116668701172,
+    "y": 1109.1167907714844,
+    "z": "f8944603.71553",
+    "wires": [
+      [
+        "d844935e.741748"
+      ]
+    ]
+  },
+  {
+    "id": "a9479bec.894888",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 4157.116668701172,
+    "y": 1055.1167907714844,
+    "z": "f8944603.71553",
+    "wires": [
+      [
+        "7a232bae.539a2c",
+        "19f7263a.0f2e72"
+      ]
+    ]
+  },
+  {
+    "id": "d844935e.741748",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 4160.116668701172,
+    "y": 1108.1167907714844,
+    "z": "f8944603.71553",
+    "wires": [
+      [
+        "e31191f4.c7e44",
+        "c783c2e3.52d62"
+      ]
+    ]
+  },
+  {
+    "id": "19f7263a.0f2e72",
+    "type": "set",
+    "name": "set network-route-B",
+    "xml": "<set>\n<parameter name='tmp.aai.network-route-B.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
+    "comments": "",
+    "x": 4318.116668701172,
+    "y": 1079.1167907714844,
+    "z": "f8944603.71553",
+    "wires": []
+  },
+  {
+    "id": "e31191f4.c7e44",
+    "type": "set",
+    "name": "set network-route-LEAF",
+    "xml": "<set>\n<parameter name='tmp.aai.network-route-LEAF.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
+    "comments": "",
+    "x": 4335.116668701172,
+    "y": 1121.1167907714844,
+    "z": "f8944603.71553",
+    "wires": []
+  },
+  {
+    "id": "c783c2e3.52d62",
+    "type": "set",
+    "name": "set network-route-A",
+    "xml": "<set>\n<parameter name='tmp.aai.network-route-A.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
+    "comments": "",
+    "x": 4320.116668701172,
+    "y": 1159.1167907714844,
+    "z": "f8944603.71553",
+    "wires": []
+  },
+  {
+    "id": "7a232bae.539a2c",
+    "type": "set",
+    "name": "set network-route-ROOT",
+    "xml": "<set>\n<parameter name='tmp.aai.network-route-ROOT.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
+    "comments": "",
+    "x": 4332.116668701172,
+    "y": 1039.1167907714844,
+    "z": "f8944603.71553",
+    "wires": []
+  },
+  {
+    "id": "5dbb2ad5.55ee04",
+    "type": "comment",
+    "name": "This is it (should be)",
+    "info": "",
+    "comments": "",
+    "x": 4497.116668701172,
+    "y": 1055.1167907714844,
+    "z": "f8944603.71553",
     "wires": []
+  },
+  {
+    "id": "4c9f1a43.e137e4",
+    "type": "save",
+    "name": "get network-route-three from aai",
+    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-route\"\n\tkey='network-route.route-id = $network-route-three'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-route-three\">",
+    "comments": "",
+    "outputs": 1,
+    "x": 3288.116668701172,
+    "y": 1041.1166687011719,
+    "z": "f8944603.71553",
+    "wires": [
+      [
+        "b2eea3d4.d83b2",
+        "c92a9c74.6d8cb",
+        "be6d3c2.c1bdfc"
+      ]
+    ]
+  },
+  {
+    "id": "68098f91.a64618",
+    "type": "outcome",
+    "name": "SECONDARY-ROOT",
+    "xml": "<outcome value='SECONDARY-ROOT'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3974.116668701172,
+    "y": 1173.1166687011719,
+    "z": "f8944603.71553",
+    "wires": [
+      [
+        "3baeb12d.78947e"
+      ]
+    ]
+  },
+  {
+    "id": "3baeb12d.78947e",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 4148.116668701172,
+    "y": 1168.1166687011719,
+    "z": "f8944603.71553",
+    "wires": [
+      [
+        "f32a06d7.18ee6",
+        "9c8c5f6f.4f4828"
+      ]
+    ]
+  },
+  {
+    "id": "9c8c5f6f.4f4828",
+    "type": "set",
+    "name": "set network-route-C",
+    "xml": "<set>\n<parameter name='tmp.aai.network-route-C.' value=\"`$tmp.aai.network-route-three.`\" />\n\n\n",
+    "comments": "",
+    "x": 4318.116668701172,
+    "y": 1241.1166687011719,
+    "z": "f8944603.71553",
+    "wires": []
+  },
+  {
+    "id": "f32a06d7.18ee6",
+    "type": "set",
+    "name": "set network-route-SECONDARY-ROOT",
+    "xml": "<set>\n<parameter name='tmp.aai.network-route-SECONDARY-ROOT.' value=\"`$tmp.aai.network-route-three.`\" />\n\n\n",
+    "comments": "",
+    "x": 4372.116668701172,
+    "y": 1201.1166687011719,
+    "z": "f8944603.71553",
+    "wires": []
+  },
+  {
+    "id": "89b3411b.fe2cb",
+    "type": "comment",
+    "name": "This is it (should be)",
+    "info": "",
+    "comments": "",
+    "x": 4486.116668701172,
+    "y": 1226.1166687011719,
+    "z": "f8944603.71553",
+    "wires": []
+  },
+  {
+    "id": "fe4b773c.0eae98",
+    "type": "outcome",
+    "name": "SECONDARY-ROOT",
+    "xml": "<outcome value='SECONDARY-ROOT'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4045.116668701172,
+    "y": 929.1166687011719,
+    "z": "f8944603.71553",
+    "wires": [
+      [
+        "a6d4107d.6655f"
+      ]
+    ]
+  },
+  {
+    "id": "e8ae3a08.56b988",
+    "type": "set",
+    "name": "set network-route-C",
+    "xml": "<set>\n<parameter name='tmp.aai.network-route-C.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
+    "comments": "",
+    "x": 4389.116668701172,
+    "y": 997.1166687011719,
+    "z": "f8944603.71553",
+    "wires": []
+  },
+  {
+    "id": "8ecb2104.b1fc58",
+    "type": "set",
+    "name": "set network-route-SECONDARY-ROOT",
+    "xml": "<set>\n<parameter name='tmp.aai.network-route-SECONDARY-ROOT.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
+    "comments": "",
+    "x": 4443.116668701172,
+    "y": 957.1166687011719,
+    "z": "f8944603.71553",
+    "wires": []
+  },
+  {
+    "id": "a817660e.e9d2",
+    "type": "comment",
+    "name": "This is it (should be)",
+    "info": "",
+    "comments": "",
+    "x": 4587.116668701172,
+    "y": 986.1166687011719,
+    "z": "f8944603.71553",
+    "wires": []
+  },
+  {
+    "id": "a6d4107d.6655f",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 4219.116668701172,
+    "y": 924.1166687011719,
+    "z": "f8944603.71553",
+    "wires": [
+      [
+        "8ecb2104.b1fc58",
+        "e8ae3a08.56b988"
+      ]
+    ]
+  },
+  {
+    "id": "83ce05e.7f315f8",
+    "type": "outcome",
+    "name": "SECONDARY-ROOT",
+    "xml": "<outcome value='SECONDARY-ROOT'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4105.116668701172,
+    "y": 667.1166687011719,
+    "z": "f8944603.71553",
+    "wires": [
+      [
+        "d03cb873.c57328"
+      ]
+    ]
+  },
+  {
+    "id": "2049e56d.3172ca",
+    "type": "set",
+    "name": "set network-route-C",
+    "xml": "<set>\n<parameter name='tmp.aai.network-route-C.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",
+    "comments": "",
+    "x": 4449.116668701172,
+    "y": 735.1166687011719,
+    "z": "f8944603.71553",
+    "wires": []
+  },
+  {
+    "id": "6995e48e.171b9c",
+    "type": "set",
+    "name": "set network-route-SECONDARY-ROOT",
+    "xml": "<set>\n<parameter name='tmp.aai.network-route-SECONDARY-ROOT.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",
+    "comments": "",
+    "x": 4503.116668701172,
+    "y": 695.1166687011719,
+    "z": "f8944603.71553",
+    "wires": []
+  },
+  {
+    "id": "80fe4b30.9273d",
+    "type": "comment",
+    "name": "This is it (should be)",
+    "info": "",
+    "comments": "",
+    "x": 4617.116668701172,
+    "y": 720.1166687011719,
+    "z": "f8944603.71553",
+    "wires": []
+  },
+  {
+    "id": "d03cb873.c57328",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 4279.116668701172,
+    "y": 662.1166687011719,
+    "z": "f8944603.71553",
+    "wires": [
+      [
+        "6995e48e.171b9c",
+        "2049e56d.3172ca"
+      ]
+    ]
+  },
+  {
+    "id": "d8eb368d.7e35e8",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 3686.116668701172,
+    "y": 2544.116668701172,
+    "z": "f8944603.71553",
+    "wires": [
+      [
+        "9d31c4f.62b63b8",
+        "42d540.6e2552c"
+      ]
+    ]
+  },
+  {
+    "id": "4acebe87.51a2e",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3513.450164794922,
+    "y": 2545.116668701172,
+    "z": "f8944603.71553",
+    "wires": [
+      [
+        "d8eb368d.7e35e8"
+      ]
+    ]
+  },
+  {
+    "id": "faf79ca9.39c718",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3522.941131591797,
+    "y": 2587.690704345703,
+    "z": "f8944603.71553",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "760b8826.a76aa",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3511.450164794922,
+    "y": 2634.116668701172,
+    "z": "f8944603.71553",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "9d31c4f.62b63b8",
+    "type": "execute",
+    "name": "execute split tp-id to get pnf-name",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-C.p-interface-dst.interface-name`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainC\"/>\n\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3972.450164794922,
+    "y": 2548.1167907714844,
+    "z": "f8944603.71553",
+    "wires": [
+      [
+        "beea1414.622ca8",
+        "e0900c85.f5153"
+      ]
+    ]
+  },
+  {
+    "id": "e0900c85.f5153",
+    "type": "failure",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4195.450164794922,
+    "y": 2503.1167907714844,
+    "z": "f8944603.71553",
+    "wires": [
+      [
+        "b1fce547.cdefa8"
+      ]
+    ]
+  },
+  {
+    "id": "beea1414.622ca8",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4197.450164794922,
+    "y": 2567.1167907714844,
+    "z": "f8944603.71553",
+    "wires": [
+      [
+        "1f2077c9.d2f12"
+      ]
+    ]
+  },
+  {
+    "id": "1931dff5.72d728",
+    "type": "save",
+    "name": "get p-interface-dst from aai",
+    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"p-interface\"\n\t    key=\"pnf.pnf-name = $tmp.dst.domainC.pnf-name\n\t        AND p-interface.interface-name = $tmp.aai.network-route-C.next-hop\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.network-route-C.p-interface-dst\" >\n\n<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"p-interface\"-->\n<!--\t    key=\"pnf.pnf-name = $unique-src-node-Id-->\n<!--\t        and p-interface.interface-name = $tmp.aai.endpointA.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"-->\n<!--\t\tlocal-only=\"false\" -->\n<!--\t\tpfx=\"tmp.aai.endpointA.p-interface-src\" >-->\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3285.450164794922,
+    "y": 2580.116668701172,
+    "z": "f8944603.71553",
+    "wires": [
+      [
+        "4acebe87.51a2e",
+        "faf79ca9.39c718",
+        "760b8826.a76aa"
+      ]
+    ]
+  },
+  {
+    "id": "20a2805c.f7ce68",
+    "type": "comment",
+    "name": "Question?",
+    "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
+    "comments": "",
+    "x": 3246.450164794922,
+    "y": 2524.116668701172,
+    "z": "f8944603.71553",
+    "wires": []
+  },
+  {
+    "id": "f953800.9cf34",
+    "type": "execute",
+    "name": "execute split tp-id to get pnf-name",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-C.next-hop`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainC-pnfName\"/>\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3305.450164794922,
+    "y": 2320.116668701172,
+    "z": "f8944603.71553",
+    "wires": [
+      [
+        "1523d633.28a802",
+        "23587c7d.fbba4c"
+      ]
+    ]
+  },
+  {
+    "id": "23587c7d.fbba4c",
+    "type": "failure",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3528.450164794922,
+    "y": 2306.116668701172,
+    "z": "f8944603.71553",
+    "wires": [
+      [
+        "c7b4b7e7.8e8b78"
+      ]
+    ]
+  },
+  {
+    "id": "1523d633.28a802",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3530.450164794922,
+    "y": 2339.116668701172,
+    "z": "f8944603.71553",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "c7b4b7e7.8e8b78",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 3676.450164794922,
+    "y": 2299.116668701172,
+    "z": "f8944603.71553",
+    "wires": [
+      [
+        "cb965cfe.67a2f",
+        "1a7add8d.af97ca"
+      ]
+    ]
+  },
+  {
+    "id": "cb965cfe.67a2f",
+    "type": "set",
+    "name": "set pnf-name",
+    "xml": "<set>\n<parameter name='tmp.dst.domainC.pnf-name' value=\"`$param-prefix-domainC-pnfName[0] + '-' +\n                                                   $param-prefix-domainC-pnfName[1] + '-' +\n                                                   $param-prefix-domainC-pnfName[2] + '-' +\n                                                   $param-prefix-domainC-pnfName[3] + '-' +\n                                                   $param-prefix-domainC-pnfName[4] + '-' +\n                                                   $param-prefix-domainC-pnfName[5] + '-' +\n                                                   $param-prefix-domainC-pnfName[6] + '-' +\n                                                   $param-prefix-domainC-pnfName[7] + '-' +\n                                                   $param-prefix-domainC-pnfName[8]`\" />\n",
+    "comments": "",
+    "x": 3870.450164794922,
+    "y": 2302.1167907714844,
+    "z": "f8944603.71553",
+    "wires": []
+  },
+  {
+    "id": "42d540.6e2552c",
+    "type": "for",
+    "name": "for each relationship",
+    "xml": "<for silentFailure='true' index='dividx' start='0' end='`$tmp.aai.network-route-C.p-interface-dst.relationship-list.relationship_length`' >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3923.4501342773438,
+    "y": 2671.1166381835938,
+    "z": "f8944603.71553",
+    "wires": [
+      [
+        "b84e7511.3844a8"
+      ]
+    ]
+  },
+  {
+    "id": "b84e7511.3844a8",
+    "type": "switchNode",
+    "name": "switch related-to",
+    "xml": "<switch test='`$tmp.aai.network-route-C.p-interface-dst.relationship-list.relationship[$dividx].related-to`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4129.450134277344,
+    "y": 2671.1166381835938,
+    "z": "f8944603.71553",
+    "wires": [
+      [
+        "ac19c527.29aaf8"
+      ]
+    ]
+  },
+  {
+    "id": "1a7add8d.af97ca",
+    "type": "get-resource",
+    "name": "get-resource src pnf",
+    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.dst.domainC.pnf-name\"\n        pfx='tmp.aai.destination-secondary-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3892.450164794922,
+    "y": 2370.1167907714844,
+    "z": "f8944603.71553",
+    "wires": [
+      [
+        "c6c93f82.1aa228",
+        "f4da497f.0275c8",
+        "6e9758a5.eabec"
+      ]
+    ]
+  },
+  {
+    "id": "c6c93f82.1aa228",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4087.9502868652344,
+    "y": 2322.1167907714844,
+    "z": "f8944603.71553",
+    "wires": [
+      [
+        "a1f1dc1c.4be4e8"
+      ]
+    ]
+  },
+  {
+    "id": "f4da497f.0275c8",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4079.9502868652344,
+    "y": 2377.1167907714844,
+    "z": "f8944603.71553",
+    "wires": [
+      [
+        "dd2530b3.0ce388"
+      ]
+    ]
+  },
+  {
+    "id": "6e9758a5.eabec",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4084.9502868652344,
+    "y": 2434.1167907714844,
+    "z": "f8944603.71553",
+    "wires": [
+      [
+        "35cb1b46.9ab3ac"
+      ]
+    ]
+  },
+  {
+    "id": "35cb1b46.9ab3ac",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
+    "comments": "",
+    "x": 4236.950286865234,
+    "y": 2435.1167907714844,
+    "z": "f8944603.71553",
+    "wires": []
+  },
+  {
+    "id": "a1f1dc1c.4be4e8",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 4232.332611083984,
+    "y": 2319.7724609375,
+    "z": "f8944603.71553",
+    "wires": [
+      [
+        "807e8aa5.b5f288"
+      ]
+    ]
+  },
+  {
+    "id": "be1fed24.75522",
+    "type": "set",
+    "name": "set SECONDARY-ROOT stuff",
+    "xml": "<set>\n<parameter name='tmp.SECONDARY-ROOT.pnf-name-long' value=\"`$param-prefix-domainC-pnfName[0] + '-' +\n                                                   $param-prefix-domainC-pnfName[1] + '-' +\n                                                   $param-prefix-domainC-pnfName[2] + '-' +\n                                                   $param-prefix-domainC-pnfName[3] + '-' +\n                                                   $param-prefix-domainC-pnfName[4] + '-' +\n                                                   $param-prefix-domainC-pnfName[5] + '-' +\n                                                   $param-prefix-domainC-pnfName[6] + '-' +\n                                                   $param-prefix-domainC-pnfName[7] + '-' +\n                                                   $param-prefix-domainC-pnfName[8]`\" />\n\n<!--<parameter name='tmp.ROOT.pnf-name-short' value=\"`$param-prefix-domainB-pnfName[8]`\" />-->\n<parameter name='tmp.SECONDARY-ROOT.pnf-name-short' value=\"`$tmp.dst-secondary.pnf-name`\" />\n\n<parameter name='tmp.SECONDARY-ROOT.uni-p-interface-long' value=\"`$tmp.aai.network-route-C.next-hop + '-' + $tmp.aai.network-route-C.logical-interface-id`\" />\n<parameter name='tmp.SECONDARY-ROOT.uni-tp-id' value=\"`$tmp.dst-secondary.ltpId`\" />\n",
+    "comments": "",
+    "x": 3308.116668701172,
+    "y": 2659.116668701172,
+    "z": "f8944603.71553",
+    "wires": []
+  },
+  {
+    "id": "89002347.f12fb8",
+    "type": "comment",
+    "name": "NOT NEEDED ANYMORE?",
+    "info": "",
+    "comments": "",
+    "x": 3983.1166381835938,
+    "y": 2623.1166381835938,
+    "z": "f8944603.71553",
+    "wires": []
+  },
+  {
+    "id": "1f2077c9.d2f12",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
+    "comments": "",
+    "x": 4356.450164794922,
+    "y": 2586.1167907714844,
+    "z": "f8944603.71553",
+    "wires": []
+  },
+  {
+    "id": "b1fce547.cdefa8",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 4360.450164794922,
+    "y": 2500.1167907714844,
+    "z": "f8944603.71553",
+    "wires": [
+      [
+        "9ddcbad2.3cd968",
+        "a4909c74.16b3c"
+      ]
+    ]
+  },
+  {
+    "id": "ac19c527.29aaf8",
+    "type": "outcome",
+    "name": "tunnel-termination-point",
+    "xml": "<outcome value='tunnel-termination-point'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4346.735778808594,
+    "y": 2669.9384155273438,
+    "z": "f8944603.71553",
+    "wires": [
+      [
+        "aecc45b1.07799"
+      ]
+    ]
+  },
+  {
+    "id": "dd2530b3.0ce388",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
+    "comments": "",
+    "x": 4247.950286865234,
+    "y": 2380.1167907714844,
+    "z": "f8944603.71553",
+    "wires": []
+  },
+  {
+    "id": "9ddcbad2.3cd968",
+    "type": "set",
+    "name": "set ltpId",
+    "xml": "<set>\n<parameter name='tmp.dst-secondary.ltpId' value='`$param-prefix-domainC[$param-prefix-domainC_length -1]`' />\n",
+    "comments": "",
+    "x": 4530.450164794922,
+    "y": 2461.1167907714844,
+    "z": "f8944603.71553",
+    "wires": []
+  },
+  {
+    "id": "a4909c74.16b3c",
+    "type": "set",
+    "name": "set pnf-name",
+    "xml": "<set>\n<parameter name='tmp.dst-secondary.pnf-name' value='`$param-prefix-domainC[$param-prefix-domainC_length -3]`' />\n",
+    "comments": "",
+    "x": 4531.450164794922,
+    "y": 2566.1167907714844,
+    "z": "f8944603.71553",
+    "wires": []
+  },
+  {
+    "id": "90f369e0.1f5ea",
+    "type": "comment",
+    "name": "TODO: FIXME",
+    "info": "using the output of regex string arrays,\nconcatinate index 0 to index[length-2] all together\nin order to assemble the correct pnf-name",
+    "comments": "",
+    "x": 4526.450164794922,
+    "y": 2515.1167907714844,
+    "z": "f8944603.71553",
+    "wires": []
+  },
+  {
+    "id": "aecc45b1.07799",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 4553.567321777344,
+    "y": 2659.4570922851562,
+    "z": "f8944603.71553",
+    "wires": [
+      [
+        "d7d46b6.f157298",
+        "a76ccf28.3b019",
+        "6d38c2ba.e73f94"
+      ]
+    ]
+  },
+  {
+    "id": "d7d46b6.f157298",
+    "type": "set",
+    "name": "set destination ttp-id",
+    "xml": "<set>\n<parameter name='tmp.destination-secondary.ttp-id' value=\"`$tmp.aai.network-route-C.p-interface-dst.relationship-list.relationship[$dividx].relationship-data[0].relationship-value`\" />\n",
+    "comments": "",
+    "x": 4768.567321777344,
+    "y": 2621.4570922851562,
+    "z": "f8944603.71553",
+    "wires": []
+  },
+  {
+    "id": "a76ccf28.3b019",
+    "type": "get-resource",
+    "name": "get-resource src TTP",
+    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"tunnel-termination-point\" \n\t\tkey=\"tunnel-termination-point.ttp-id = $tmp.destination-secondary.ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.destination-secondary-ttp' local-only='false' >\n\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4765.567321777344,
+    "y": 2660.4570922851562,
+    "z": "f8944603.71553",
+    "wires": [
+      [
+        "af66a72d.a68048"
+      ]
+    ]
+  },
+  {
+    "id": "6d38c2ba.e73f94",
+    "type": "break",
+    "name": "break",
+    "xml": "<break>\n",
+    "comments": "",
+    "x": 4721.067321777344,
+    "y": 2702.4570922851562,
+    "z": "f8944603.71553",
+    "wires": []
+  },
+  {
+    "id": "56aae750.4bf18",
+    "type": "outcome",
+    "name": "esr-thirdparty-sdnc",
+    "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4814.450164794922,
+    "y": 2338.1167907714844,
+    "z": "f8944603.71553",
+    "wires": [
+      [
+        "df2c6ab5.f8c7a"
+      ]
+    ]
+  },
+  {
+    "id": "807e8aa5.b5f288",
+    "type": "for",
+    "name": "for each relationship",
+    "xml": "<for silentFailure='true' index='dpvidx' start='0' end='`$tmp.aai.destination-secondary-pnf.relationship-list.relationship_length`' >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4416.450164794922,
+    "y": 2334.1167907714844,
+    "z": "f8944603.71553",
+    "wires": [
+      [
+        "83815f42.db62e8"
+      ]
+    ]
+  },
+  {
+    "id": "83815f42.db62e8",
+    "type": "switchNode",
+    "name": "switch related-to",
+    "xml": "<switch test='`$tmp.aai.destination-secondary-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4611.450164794922,
+    "y": 2334.1167907714844,
+    "z": "f8944603.71553",
+    "wires": [
+      [
+        "56aae750.4bf18",
+        "ace3955f.b78118"
+      ]
+    ]
+  },
+  {
+    "id": "ace3955f.b78118",
+    "type": "outcome",
+    "name": "network-resource",
+    "xml": "<outcome value='network-resource'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 4816.450164794922,
+    "y": 2411.1167907714844,
+    "z": "f8944603.71553",
+    "wires": [
+      [
+        "86fe5017.1c8158"
+      ]
+    ]
+  },
+  {
+    "id": "af66a72d.a68048",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4946.067321777344,
+    "y": 2659.4570922851562,
+    "z": "f8944603.71553",
+    "wires": [
+      [
+        "73b98dcb.d53e2c"
+      ]
+    ]
+  },
+  {
+    "id": "73b98dcb.d53e2c",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 5104.067321777344,
+    "y": 2659.4570922851562,
+    "z": "f8944603.71553",
+    "wires": [
+      [
+        "35f64a50.ea71a6"
+      ]
+    ]
+  },
+  {
+    "id": "35f64a50.ea71a6",
+    "type": "set",
+    "name": "set destination tunnel tp ip",
+    "xml": "<set>\n<parameter name='destination-secondary.tunnel-tp-id' value=\"`$tmp.aai.destination-secondary-ttp.tunnel-tp-id`\" />\n",
+    "comments": "",
+    "x": 5311.067321777344,
+    "y": 2659.4570922851562,
+    "z": "f8944603.71553",
+    "wires": []
+  },
+  {
+    "id": "df2c6ab5.f8c7a",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 4991.450164794922,
+    "y": 2330.1167907714844,
+    "z": "f8944603.71553",
+    "wires": [
+      [
+        "b41095a1.9dd71",
+        "c294b821.4082d"
+      ]
+    ]
+  },
+  {
+    "id": "c294b821.4082d",
+    "type": "execute",
+    "name": "get esr-thirdparty-sdnc",
+    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainC.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainC.esr-thirdparty-sdnc' local-only='false' >",
+    "comments": "",
+    "outputs": 1,
+    "x": 5199.450164794922,
+    "y": 2337.1167907714844,
+    "z": "f8944603.71553",
+    "wires": [
+      [
+        "cbd53666.7a192",
+        "70f8105c.8c53c8",
+        "d07f4c5c.e57d28"
+      ]
+    ]
+  },
+  {
+    "id": "86fe5017.1c8158",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 4993.450164794922,
+    "y": 2403.1167907714844,
+    "z": "f8944603.71553",
+    "wires": [
+      [
+        "29792fa0.312a5"
+      ]
+    ]
+  },
+  {
+    "id": "b41095a1.9dd71",
+    "type": "set",
+    "name": "set esr-thirdparty-sdnc domainC id",
+    "xml": "<set>\n<parameter name='tmp.domainC.esr-thirdparty-id' value=\"`$tmp.aai.destination-secondary-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",
+    "comments": "",
+    "x": 5229.450164794922,
+    "y": 2285.1167907714844,
+    "z": "f8944603.71553",
+    "wires": []
+  },
+  {
+    "id": "29792fa0.312a5",
+    "type": "set",
+    "name": "set domainC ethernet layer network-id",
+    "xml": "<set>\n<parameter name='tmp.domainC.eth-network-id' value=\"`$tmp.aai.destination-secondary-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",
+    "comments": "",
+    "x": 5228.450164794922,
+    "y": 2527.1167907714844,
+    "z": "f8944603.71553",
+    "wires": []
+  },
+  {
+    "id": "cbd53666.7a192",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5409.450164794922,
+    "y": 2328.1167907714844,
+    "z": "f8944603.71553",
+    "wires": [
+      [
+        "12fe1a85.5f5265"
+      ]
+    ]
+  },
+  {
+    "id": "70f8105c.8c53c8",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5401.450164794922,
+    "y": 2383.1167907714844,
+    "z": "f8944603.71553",
+    "wires": [
+      [
+        "720591da.7ff908"
+      ]
+    ]
+  },
+  {
+    "id": "d07f4c5c.e57d28",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5406.450164794922,
+    "y": 2440.1167907714844,
+    "z": "f8944603.71553",
+    "wires": [
+      [
+        "50fd00db.804e78"
+      ]
+    ]
+  },
+  {
+    "id": "50fd00db.804e78",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
+    "comments": "",
+    "x": 5558.450164794922,
+    "y": 2441.1167907714844,
+    "z": "f8944603.71553",
+    "wires": []
+  },
+  {
+    "id": "720591da.7ff908",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
+    "comments": "",
+    "x": 5569.450164794922,
+    "y": 2386.1167907714844,
+    "z": "f8944603.71553",
+    "wires": []
+  },
+  {
+    "id": "12fe1a85.5f5265",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 5553.832489013672,
+    "y": 2325.7724609375,
+    "z": "f8944603.71553",
+    "wires": [
+      [
+        "d4fbd78f.a8b058"
+      ]
+    ]
+  },
+  {
+    "id": "d4fbd78f.a8b058",
+    "type": "set",
+    "name": "set controller domainC data",
+    "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainC.url' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainC.user' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainC.password' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
+    "comments": "",
+    "x": 5768.450164794922,
+    "y": 2322.1167907714844,
+    "z": "f8944603.71553",
+    "wires": []
+  },
+  {
+    "id": "3ab03c8.bdf8544",
+    "type": "switchNode",
+    "name": "switch secondary empty?",
+    "xml": "<switch test='`length($network-route-three) == 0`'>\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3282.116668701172,
+    "y": 795.1166687011719,
+    "z": "f8944603.71553",
+    "wires": [
+      [
+        "7806cbe6.64ea14",
+        "91bd4861.b38048"
+      ]
+    ]
+  },
+  {
+    "id": "7806cbe6.64ea14",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3404.11669921875,
+    "y": 740.11669921875,
+    "z": "f8944603.71553",
+    "wires": [
+      [
+        "4d1b7d4.397bf04"
+      ]
+    ]
+  },
+  {
+    "id": "91bd4861.b38048",
+    "type": "outcomeFalse",
+    "name": "false",
+    "xml": "<outcome value='false'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3391.11669921875,
+    "y": 849.11669921875,
+    "z": "f8944603.71553",
+    "wires": [
+      [
+        "a8d8fc87.45b9a"
+      ]
+    ]
+  },
+  {
+    "id": "4d1b7d4.397bf04",
+    "type": "set",
+    "name": "set hasSecondary false",
+    "xml": "<set>\n<parameter name='hasSecondary' value=\"false\" />\n\n\n",
+    "comments": "",
+    "x": 3619.116668701172,
+    "y": 577.1166687011719,
+    "z": "f8944603.71553",
+    "wires": []
+  },
+  {
+    "id": "a8d8fc87.45b9a",
+    "type": "set",
+    "name": "set hasSecondary true",
+    "xml": "<set>\n<parameter name='hasSecondary' value=\"true\" />\n\n\n",
+    "comments": "",
+    "x": 3615.116668701172,
+    "y": 621.1166687011719,
+    "z": "f8944603.71553",
+    "wires": []
+  },
+  {
+    "id": "87dcb71b.a618f",
+    "type": "switchNode",
+    "name": "switch $hasSecondary",
+    "xml": "<switch test='`$hasSecondary`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3812.11669921875,
+    "y": 3521.11669921875,
+    "z": "f8944603.71553",
+    "wires": [
+      [
+        "9a1c6f33.80c0c"
+      ]
+    ]
+  },
+  {
+    "id": "9a1c6f33.80c0c",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4003.11669921875,
+    "y": 3525.11669921875,
+    "z": "f8944603.71553",
+    "wires": [
+      [
+        "8de09ee3.1f82b8"
+      ]
+    ]
+  },
+  {
+    "id": "8de09ee3.1f82b8",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 4130.11669921875,
+    "y": 3524.11669921875,
+    "z": "f8944603.71553",
+    "wires": [
+      [
+        "cc59ae49.952b8",
+        "3b72359b.f45e6a"
+      ]
+    ]
+  },
+  {
+    "id": "3b72359b.f45e6a",
+    "type": "save",
+    "name": "save SECONDARY-ROOT UNI in AAI",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.SECONDARY-ROOT.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.SECONDARY-ROOT.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-C.logical-interface-id`' />\n<parameter name='type' value='secondary-root' />\n<parameter name='data-source' value='`$gfp`' />\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4352.11669921875,
+    "y": 3413.11669921875,
+    "z": "f8944603.71553",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "d566dc7.835f6a",
+    "type": "set",
+    "name": "unset secondary related variables",
+    "xml": "<set>\n<parameter name='hasSecondary' value=\"false\" />\n<parameter name='network-route-three' value=\"\" />\n<parameter name='tmp.aai.network-route-three.' value=\"\" />\n<parameter name='tmp.aai.network-route-C.' value=\"\" />\n",
+    "comments": "",
+    "x": 3357,
+    "y": 453,
+    "z": "f8944603.71553",
+    "wires": []
+  },
+  {
+    "id": "cc59ae49.952b8",
+    "type": "switchNode",
+    "name": "switch 2-ROOTS in same domain?",
+    "xml": "<!-- This is to check the provider-id of ROOt and SECONDARY-ROOT-->\n<switch test='`$param-prefix-domainB[$param-prefix-domainB_length -9] == $param-prefix-domainC[$param-prefix-domainC_length -9]`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4348,
+    "y": 3472,
+    "z": "f8944603.71553",
+    "wires": [
+      [
+        "e0cf290a.3bb57",
+        "91bee9e5.bd12c8"
+      ]
+    ]
+  },
+  {
+    "id": "e0cf290a.3bb57",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4558,
+    "y": 3449,
+    "z": "f8944603.71553",
+    "wires": [
+      [
+        "2e6c4f7b.89f37"
+      ]
+    ]
+  },
+  {
+    "id": "2e6c4f7b.89f37",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 4684,
+    "y": 3449,
+    "z": "f8944603.71553",
+    "wires": [
+      [
+        "e80cf077.13626"
+      ]
+    ]
+  },
+  {
+    "id": "eb956f81.674a8",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 4689,
+    "y": 3498,
+    "z": "f8944603.71553",
+    "wires": [
+      [
+        "538ba095.13ecb8",
+        "a894e133.03a62",
+        "bbac82b0.611ad8",
+        "5d08bff9.d57b18"
+      ]
+    ]
+  },
+  {
+    "id": "91bee9e5.bd12c8",
+    "type": "outcomeTrue",
+    "name": "false",
+    "xml": "<outcome value='false'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4563,
+    "y": 3498,
+    "z": "f8944603.71553",
+    "wires": [
+      [
+        "eb956f81.674a8"
+      ]
+    ]
+  },
+  {
+    "id": "e80cf077.13626",
+    "type": "save",
+    "name": "save connectivityB relationship to UNI-SECONDARY-ROOT, in AAI",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.SECONDARY-ROOT.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.SECONDARY-ROOT.uni-p-interface-long`\" />",
+    "comments": "",
+    "outputs": 1,
+    "x": 5012,
+    "y": 3446,
+    "z": "f8944603.71553",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "538ba095.13ecb8",
+    "type": "execute",
+    "name": "execute UUID generator for connectivity domainC",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.connectivity-domainC-uuid\"/>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4965,
+    "y": 3537,
+    "z": "f8944603.71553",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "a894e133.03a62",
+    "type": "save",
+    "name": "save connectivity resource in AAI",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainC-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainC-uuid`' />\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' -->\n<!--      key='connectivity.connectivity-id = $tmp.ROOT.uni-p-interface-long'>-->\n<!--<parameter name='connectivity-id' value='`$tmp.ROOT.uni-p-interface-long`' />-->\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-C.logical-interface-id`' />\n<parameter name='color-aware' value='`$tmp.SECONDARY-ROOT.uni-p-interface-long`' />\n<parameter name='vpn-type' value='secondary-root' />\n\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4913,
+    "y": 3579,
+    "z": "f8944603.71553",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "bbac82b0.611ad8",
+    "type": "save",
+    "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.connectivity-domainC-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.connectivity-domainC-uuid`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
+    "comments": "",
+    "outputs": 1,
+    "x": 5042,
+    "y": 3621,
+    "z": "f8944603.71553",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "7be6dab9.621efc",
+    "type": "comment",
+    "name": "Create SECONDARY-ROOT connectivity",
+    "info": "",
+    "comments": "",
+    "x": 4928,
+    "y": 3494,
+    "z": "f8944603.71553",
+    "wires": []
+  },
+  {
+    "id": "5d08bff9.d57b18",
+    "type": "save",
+    "name": "save connectivityC relationship to UNI-SECONDARY-ROOT, in AAI",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $prop.connectivity-domainC-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.SECONDARY-ROOT.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.SECONDARY-ROOT.uni-p-interface-long`\" />",
+    "comments": "",
+    "outputs": 1,
+    "x": 5020,
+    "y": 3669,
+    "z": "f8944603.71553",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "748bc1ca.c78678",
+    "type": "comment",
+    "name": "Create SECONDARY-ROOT UNI",
+    "info": "",
+    "comments": "",
+    "x": 3840,
+    "y": 3472,
+    "z": "f8944603.71553",
+    "wires": []
+  },
+  {
+    "id": "286f0ec8.852352",
+    "type": "switchNode",
+    "name": "switch $hasSecondary",
+    "xml": "<switch test='`$hasSecondary`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3815,
+    "y": 4143,
+    "z": "f8944603.71553",
+    "wires": [
+      [
+        "d7543b1f.0223a"
+      ]
+    ]
+  },
+  {
+    "id": "d7543b1f.0223a",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4007,
+    "y": 4138,
+    "z": "f8944603.71553",
+    "wires": [
+      [
+        "8aacb5a.7bd82c8"
+      ]
+    ]
+  },
+  {
+    "id": "8aacb5a.7bd82c8",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 4136,
+    "y": 4138,
+    "z": "f8944603.71553",
+    "wires": [
+      [
+        "9ecf386c.da77f"
+      ]
+    ]
+  },
+  {
+    "id": "9ecf386c.da77f",
+    "type": "save",
+    "name": "save middle-man-conn relationship to UNI-SECONDARY-ROOT, in AAI",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.SECONDARY-ROOT.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.SECONDARY-ROOT.uni-p-interface-long`\" />",
+    "comments": "",
+    "outputs": 1,
+    "x": 4468,
+    "y": 4136,
+    "z": "f8944603.71553",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "2bbca6cc.0ec622",
+    "type": "switchNode",
+    "name": "switch $hasSecondary",
+    "xml": "<switch test='`$hasSecondary`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3803,
+    "y": 4367,
+    "z": "f8944603.71553",
+    "wires": [
+      [
+        "85f62fba.be3af8"
+      ]
+    ]
+  },
+  {
+    "id": "85f62fba.be3af8",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3983,
+    "y": 4366,
+    "z": "f8944603.71553",
+    "wires": [
+      [
+        "f0b10235.e7e788"
+      ]
+    ]
+  },
+  {
+    "id": "f0b10235.e7e788",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 4112,
+    "y": 4366,
+    "z": "f8944603.71553",
+    "wires": [
+      [
+        "ccf3ecf0.96a2b"
+      ]
+    ]
+  },
+  {
+    "id": "ccf3ecf0.96a2b",
+    "type": "switchNode",
+    "name": "switch 2-ROOTS in same domain?",
+    "xml": "<!-- This is to check the provider-id of ROOt and SECONDARY-ROOT-->\n<switch test='`$param-prefix-domainB[$param-prefix-domainB_length -9] == $param-prefix-domainC[$param-prefix-domainC_length -9]`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4329.88330078125,
+    "y": 4364.88330078125,
+    "z": "f8944603.71553",
+    "wires": [
+      [
+        "cabe89a7.9d69e"
+      ]
+    ]
+  },
+  {
+    "id": "cabe89a7.9d69e",
+    "type": "outcomeTrue",
+    "name": "false",
+    "xml": "<outcome value='false'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4544.88330078125,
+    "y": 4364.88330078125,
+    "z": "f8944603.71553",
+    "wires": [
+      [
+        "760290ae.a21e"
+      ]
+    ]
+  },
+  {
+    "id": "760290ae.a21e",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 4676.88330078125,
+    "y": 4364.88330078125,
+    "z": "f8944603.71553",
+    "wires": [
+      [
+        "d0b7affb.c1db2"
+      ]
+    ]
+  },
+  {
+    "id": "d0b7affb.c1db2",
+    "type": "save",
+    "name": "save middle-man-conn relationship to connectivity-SECONDARY-ROOT, in AAI",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.connectivity-domainC-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.connectivity-domainC-uuid`\" />",
+    "comments": "",
+    "outputs": 1,
+    "x": 5041,
+    "y": 4364,
+    "z": "f8944603.71553",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "c32fbe2a.4ce3f",
+    "type": "switchNode",
+    "name": "switch $hasSecondary",
+    "xml": "<switch test='`$hasSecondary`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3478,
+    "y": 4622,
+    "z": "f8944603.71553",
+    "wires": [
+      [
+        "f2b98ff2.538df8"
+      ]
+    ]
+  },
+  {
+    "id": "f2b98ff2.538df8",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3658,
+    "y": 4621,
+    "z": "f8944603.71553",
+    "wires": [
+      [
+        "44866831.1c971"
+      ]
+    ]
+  },
+  {
+    "id": "44866831.1c971",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 3787,
+    "y": 4621,
+    "z": "f8944603.71553",
+    "wires": [
+      [
+        "531a8e91.6c36e8"
+      ]
+    ]
+  },
+  {
+    "id": "6aa2083f.c88dc",
+    "type": "comment",
+    "name": "Update SECONDARY-ROOT UNI's bw",
+    "info": "",
+    "comments": "",
+    "x": 3523,
+    "y": 4680,
+    "z": "f8944603.71553",
+    "wires": []
+  },
+  {
+    "id": "5db121cf.f62b2",
+    "type": "save",
+    "name": "update S-ROOT UNI in AAI",
+    "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.SECONDARY-ROOT.uni-p-interface-long`' />\n<parameter name='data-source' value='`$tmp.newbw`' />\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4089,
+    "y": 4779,
+    "z": "f8944603.71553",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "531a8e91.6c36e8",
+    "type": "save",
+    "name": "get S-root uni from aai",
+    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.secondaryrootuni\" >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3553,
+    "y": 4713,
+    "z": "f8944603.71553",
+    "wires": [
+      [
+        "5ffa37b0.a29d98",
+        "2e65d2b6.ac2056",
+        "b5462b77.92e368"
+      ]
+    ]
+  },
+  {
+    "id": "2e65d2b6.ac2056",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3734.490966796875,
+    "y": 4690.57421875,
+    "z": "f8944603.71553",
+    "wires": [
+      [
+        "5fe821cf.842878"
+      ]
+    ]
+  },
+  {
+    "id": "b5462b77.92e368",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3723,
+    "y": 4730,
+    "z": "f8944603.71553",
+    "wires": [
+      [
+        "6ea658d1.17df7"
+      ]
+    ]
+  },
+  {
+    "id": "5fe821cf.842878",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
+    "comments": "",
+    "x": 3894.0625,
+    "y": 4688.85986328125,
+    "z": "f8944603.71553",
+    "wires": []
+  },
+  {
+    "id": "6ea658d1.17df7",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+    "comments": "",
+    "x": 3884,
+    "y": 4731,
+    "z": "f8944603.71553",
+    "wires": []
+  },
+  {
+    "id": "4792a0c5.aeb76",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 3886,
+    "y": 4775,
+    "z": "f8944603.71553",
+    "wires": [
+      [
+        "78930237.780be4",
+        "5db121cf.f62b2"
+      ]
+    ]
+  },
+  {
+    "id": "5ffa37b0.a29d98",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3728,
+    "y": 4767,
+    "z": "f8944603.71553",
+    "wires": [
+      [
+        "4792a0c5.aeb76"
+      ]
+    ]
+  },
+  {
+    "id": "78930237.780be4",
+    "type": "set",
+    "name": "set new bw",
+    "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.secondaryrootuni.data-source + $gfp`' />\n",
+    "comments": "",
+    "x": 4047,
+    "y": 4707,
+    "z": "f8944603.71553",
+    "wires": []
+  },
+  {
+    "id": "74408c25.ef5164",
+    "type": "comment",
+    "name": "populate connectivity-C variable in the context map",
+    "info": "",
+    "comments": "",
+    "x": 4413,
+    "y": 5275,
+    "z": "f8944603.71553",
+    "wires": []
+  },
+  {
+    "id": "d1a4e2c9.15ac9",
+    "type": "call",
+    "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn",
+    "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn' mode='sync' >\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4568,
+    "y": 5316,
+    "z": "f8944603.71553",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "748b1299.fd2144",
+    "type": "set",
+    "name": "set prop.connectivity-domainC-uuid",
+    "xml": "<set>\n<!--<parameter name='prop.connectivity-domainB-uuid' value=\"`$tmp.ROOT.uni-p-interface-long`\" />-->\n<!--OR-->\n<parameter name='prop.connectivity-domainC-uuid' value=\"`$tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`\" />\n\n\n",
+    "comments": "",
+    "x": 5011,
+    "y": 5364,
+    "z": "f8944603.71553",
+    "wires": []
+  },
+  {
+    "id": "24040f90.d6a4",
+    "type": "switchNode",
+    "name": "switch found-secondary-root-connectivity",
+    "xml": "\n<switch test=\"`$found-secondary-root-connectivity`\">\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4384,
+    "y": 5374,
+    "z": "f8944603.71553",
+    "wires": [
+      [
+        "f8d36d32.9ac71",
+        "9cd0c03a.a311a"
+      ]
+    ]
+  },
+  {
+    "id": "f8d36d32.9ac71",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4620,
+    "y": 5358,
+    "z": "f8944603.71553",
+    "wires": [
+      [
+        "d753b8f.12e03c8"
+      ]
+    ]
+  },
+  {
+    "id": "d753b8f.12e03c8",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic='true'>",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 4764,
+    "y": 5360,
+    "z": "f8944603.71553",
+    "wires": [
+      [
+        "748b1299.fd2144",
+        "9643625b.90e238",
+        "c3f4caa.3b73cb8"
+      ]
+    ]
+  },
+  {
+    "id": "9cd0c03a.a311a",
+    "type": "outcomeFalse",
+    "name": "false",
+    "xml": "<outcome value='false'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4619,
+    "y": 5406,
+    "z": "f8944603.71553",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "9643625b.90e238",
+    "type": "save",
+    "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
+    "comments": "",
+    "outputs": 1,
+    "x": 5132,
+    "y": 5411,
+    "z": "f8944603.71553",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "c3f4caa.3b73cb8",
+    "type": "save",
+    "name": "update connectivity resource in AAI",
+    "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainC-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainC-uuid`' />\n<parameter name='operational-status' value='Modified' />\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5013.6669921875,
+    "y": 5496.08349609375,
+    "z": "f8944603.71553",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "433011d7.349ae8",
+    "type": "comment",
+    "name": "Update connectivity status to modified",
+    "info": "",
+    "comments": "",
+    "x": 5014.8837890625,
+    "y": 5454.88330078125,
+    "z": "f8944603.71553",
+    "wires": []
+  },
+  {
+    "id": "e2691c6e.49966",
+    "type": "set",
+    "name": "set prop.connectivity-domainC-uuid",
+    "xml": "<set>\n<!--<parameter name='prop.connectivity-domainB-uuid' value=\"`$tmp.ROOT.uni-p-interface-long`\" />-->\n<!--OR-->\n<parameter name='prop.connectivity-domainC-uuid' value=\"`$tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`\" />\n\n\n",
+    "comments": "",
+    "x": 5546,
+    "y": 5843,
+    "z": "f8944603.71553",
+    "wires": []
+  },
+  {
+    "id": "7492e58a.da53dc",
+    "type": "switchNode",
+    "name": "switch found-secondary-root-connectivity",
+    "xml": "\n<switch test=\"`$found-secondary-root-connectivity`\">\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4919,
+    "y": 5853,
+    "z": "f8944603.71553",
+    "wires": [
+      [
+        "7d7daf2e.06b168",
+        "1dddd00a.b82ef8"
+      ]
+    ]
+  },
+  {
+    "id": "7d7daf2e.06b168",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5152,
+    "y": 5847,
+    "z": "f8944603.71553",
+    "wires": [
+      [
+        "51e74c47.c309bc"
+      ]
+    ]
+  },
+  {
+    "id": "51e74c47.c309bc",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic='true'>",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 5299,
+    "y": 5855,
+    "z": "f8944603.71553",
+    "wires": [
+      [
+        "e2691c6e.49966",
+        "f2071b27.722968",
+        "ce8449a1.6c0af8"
+      ]
+    ]
+  },
+  {
+    "id": "1dddd00a.b82ef8",
+    "type": "outcomeFalse",
+    "name": "false",
+    "xml": "<outcome value='false'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5153,
+    "y": 5897,
+    "z": "f8944603.71553",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "f2071b27.722968",
+    "type": "save",
+    "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
+    "comments": "",
+    "outputs": 1,
+    "x": 5667,
+    "y": 5890,
+    "z": "f8944603.71553",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "ce8449a1.6c0af8",
+    "type": "save",
+    "name": "update connectivity resource in AAI",
+    "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainC-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainC-uuid`' />\n<parameter name='operational-status' value='Modified' />\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5548.6669921875,
+    "y": 5975.08349609375,
+    "z": "f8944603.71553",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "6cf05b70.9ecfd4",
+    "type": "comment",
+    "name": "Update connectivity status to modified",
+    "info": "",
+    "comments": "",
+    "x": 5549.8837890625,
+    "y": 5933.88330078125,
+    "z": "f8944603.71553",
+    "wires": []
+  },
+  {
+    "id": "b08c7802.5d204",
+    "type": "call",
+    "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn",
+    "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn' mode='sync' >\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5080,
+    "y": 5803,
+    "z": "f8944603.71553",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "e97fbec2.db6de",
+    "type": "comment",
+    "name": "populate connectivity-C variable in the context map",
+    "info": "",
+    "comments": "",
+    "x": 4914,
+    "y": 5764,
+    "z": "f8944603.71553",
+    "wires": []
+  },
+  {
+    "id": "651a17c0.63b678",
+    "type": "switchNode",
+    "name": "switch $hasSecondary",
+    "xml": "<switch test='`$hasSecondary`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3241.25,
+    "y": 6373.25,
+    "z": "f8944603.71553",
+    "wires": [
+      [
+        "74077cd7.2a1a94",
+        "f3174188.6084b"
+      ]
+    ]
+  },
+  {
+    "id": "74077cd7.2a1a94",
+    "type": "outcomeTrue",
+    "name": "false",
+    "xml": "<outcome value='false'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3432.25,
+    "y": 6377.25,
+    "z": "f8944603.71553",
+    "wires": [
+      [
+        "f2351c78.3536d"
+      ]
+    ]
+  },
+  {
+    "id": "f2351c78.3536d",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 3559.25,
+    "y": 6376.25,
+    "z": "f8944603.71553",
+    "wires": [
+      [
+        "9d7f2116.baeda"
+      ]
+    ]
+  },
+  {
+    "id": "f3174188.6084b",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3428.25,
+    "y": 6447.25,
+    "z": "f8944603.71553",
+    "wires": [
+      [
+        "84ee4e22.34786"
+      ]
+    ]
+  },
+  {
+    "id": "bf4fd4bd.d3efb",
+    "type": "call",
+    "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-F1-activate-w-Protection",
+    "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-F1-activate-w-Protection' mode='sync' >\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3977.75,
+    "y": 6446.33349609375,
+    "z": "f8944603.71553",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "84ee4e22.34786",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 3561.75,
+    "y": 6449.33349609375,
+    "z": "f8944603.71553",
+    "wires": [
+      [
+        "bf4fd4bd.d3efb"
+      ]
+    ]
   }
 ]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete.json b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete.json
index 50f87f43..2a4ee233 100644
--- a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete.json
+++ b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "4eba0592.d8f9ec",
+        "id": "a85fdd45.18532",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
         "x": 171.88333129882812,
-        "y": 174,
-        "z": "d1eceead.adafe",
+        "y": 177,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "2ad94242.d34e8e"
+                "2eaf78b5.ba0318"
             ]
         ]
     },
     {
-        "id": "2ad94242.d34e8e",
+        "id": "2eaf78b5.ba0318",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -23,221 +23,221 @@
         "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": 456.1690216064453,
-        "y": 235.23810863494873,
-        "z": "d1eceead.adafe",
+        "y": 238.23810863494873,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "86bffa6e.8633f8"
+                "28e9741c.d81dfc"
             ]
         ]
     },
     {
-        "id": "86bffa6e.8633f8",
+        "id": "28e9741c.d81dfc",
         "type": "method",
         "name": "method cll-vnf-topology-operation-cll-delete",
         "xml": "<method rpc='cll-vnf-topology-operation-cll-delete' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
         "x": 462.3119354248047,
-        "y": 320.0000305175781,
-        "z": "d1eceead.adafe",
+        "y": 323.0000305175781,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "47cd43dd.6a0c84"
+                "df14e360.a098e8"
             ]
         ]
     },
     {
-        "id": "47cd43dd.6a0c84",
+        "id": "df14e360.a098e8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 811.8833312988281,
-        "y": 379,
-        "z": "d1eceead.adafe",
+        "y": 382,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "17095ff1.ceb8e",
-                "f2cac95d.2dd4f",
-                "41a5db6f.16b124"
+                "e87fcff0.55123",
+                "b8bbed17.73d098",
+                "ed2f6b65.8be208"
             ]
         ]
     },
     {
-        "id": "17095ff1.ceb8e",
+        "id": "e87fcff0.55123",
         "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": 1113.2168273925781,
-        "y": 649.9302978515625,
-        "z": "d1eceead.adafe",
+        "y": 652.9302978515625,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "f2cac95d.2dd4f",
+        "id": "b8bbed17.73d098",
         "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": 1134.6452941894531,
-        "y": 352.33331298828125,
-        "z": "d1eceead.adafe",
+        "y": 355.33331298828125,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "d39ef031.51bcf8",
-                "d0a14c94.f617f8",
-                "66ff38b5.215e28"
+                "c5539326.dc2ce",
+                "9370873a.5ec85",
+                "3f911b4d.a21904"
             ]
         ]
     },
     {
-        "id": "d39ef031.51bcf8",
+        "id": "c5539326.dc2ce",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1359.6452941894531,
-        "y": 210.33331298828125,
-        "z": "d1eceead.adafe",
+        "y": 213.33331298828125,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "6bec9327.9503c4"
+                "a5dbcf8a.fe1748"
             ]
         ]
     },
     {
-        "id": "d0a14c94.f617f8",
+        "id": "9370873a.5ec85",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1355.1362609863281,
-        "y": 279.9073486328125,
-        "z": "d1eceead.adafe",
+        "y": 282.9073486328125,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "73227915.55ca3"
+                "49f0af9f.5fedb8"
             ]
         ]
     },
     {
-        "id": "66ff38b5.215e28",
+        "id": "3f911b4d.a21904",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1343.6452941894531,
-        "y": 326.33331298828125,
-        "z": "d1eceead.adafe",
+        "y": 329.33331298828125,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "5c121a7a.2c527c"
+                "61830ec6.dfc06"
             ]
         ]
     },
     {
-        "id": "dcc088f.fb3b378",
+        "id": "f78d475.109eab8",
         "type": "comment",
         "name": "new for TransportSlicing",
         "info": "",
         "comments": "",
         "x": 1113.6452941894531,
-        "y": 240.33331298828125,
-        "z": "d1eceead.adafe",
+        "y": 243.33331298828125,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "41a5db6f.16b124",
+        "id": "ed2f6b65.8be208",
         "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": 1101.6452941894531,
-        "y": 292.33331298828125,
-        "z": "d1eceead.adafe",
+        "y": 295.33331298828125,
+        "z": "8bd89607.6248d8",
         "wires": [
             []
         ]
     },
     {
-        "id": "6bec9327.9503c4",
+        "id": "a5dbcf8a.fe1748",
         "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": 1599.8833312988281,
-        "y": 207,
-        "z": "d1eceead.adafe",
+        "y": 210,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "52c7d728.b872f8",
-                "31624b25.4a6dec"
+                "b303ce6.b126d3",
+                "55aeefb2.59b1e8"
             ]
         ]
     },
     {
-        "id": "73227915.55ca3",
+        "id": "49f0af9f.5fedb8",
         "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": 1509.9457092285156,
-        "y": 282.8597717285156,
-        "z": "d1eceead.adafe",
+        "y": 285.8597717285156,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "5c121a7a.2c527c",
+        "id": "61830ec6.dfc06",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
         "x": 1513.8833312988281,
-        "y": 327,
-        "z": "d1eceead.adafe",
+        "y": 330,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "52c7d728.b872f8",
+        "id": "b303ce6.b126d3",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1804.8833312988281,
-        "y": 244,
-        "z": "d1eceead.adafe",
+        "y": 247,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "b08352cf.6ac34"
+                "f1542288.012e3"
             ]
         ]
     },
     {
-        "id": "31624b25.4a6dec",
+        "id": "55aeefb2.59b1e8",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1814.8833312988281,
-        "y": 171,
-        "z": "d1eceead.adafe",
+        "y": 174,
+        "z": "8bd89607.6248d8",
         "wires": [
             []
         ]
     },
     {
-        "id": "b08352cf.6ac34",
+        "id": "f1542288.012e3",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -245,751 +245,751 @@
         "comments": "",
         "outputs": 1,
         "x": 1797.8833312988281,
-        "y": 319,
-        "z": "d1eceead.adafe",
+        "y": 322,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "bdd428b9.6fddd",
-                "8710bcb7.6e657",
-                "6f728611.a8a3e",
-                "6d42412e.61e8d",
-                "e22daf3c.82e7c8"
+                "abe13a08.545e98",
+                "7178c36c.cf3274",
+                "ac38a7a3.b352e8",
+                "d727f01e.ad9c98",
+                "8cb68ccc.e851f8"
             ]
         ]
     },
     {
-        "id": "50e447ae.0fde38",
+        "id": "66649512.c7d5bc",
         "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": 2283.883331298828,
-        "y": 370,
-        "z": "d1eceead.adafe",
+        "y": 373,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "27d61e5e.f12fe2",
-                "2c908c8d.59c394",
-                "32fadd2c.e0a1c2"
+                "b9d85c6f.27205",
+                "376ece8a.ca776a",
+                "b6dfab0d.b44bd8"
             ]
         ]
     },
     {
-        "id": "27d61e5e.f12fe2",
+        "id": "b9d85c6f.27205",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2499.883331298828,
-        "y": 437,
-        "z": "d1eceead.adafe",
+        "y": 440,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "4e35bc34.a92d94"
+                "c1b489c1.9564e8"
             ]
         ]
     },
     {
-        "id": "2c908c8d.59c394",
+        "id": "376ece8a.ca776a",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2500.374298095703,
-        "y": 336.573974609375,
-        "z": "d1eceead.adafe",
+        "y": 339.573974609375,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "6fdcac69.b07bec"
+                "742662fc.5de6dc"
             ]
         ]
     },
     {
-        "id": "32fadd2c.e0a1c2",
+        "id": "b6dfab0d.b44bd8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2495.883331298828,
-        "y": 386,
-        "z": "d1eceead.adafe",
+        "y": 389,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "71176ed6.70694"
+                "b4af8420.603268"
             ]
         ]
     },
     {
-        "id": "bdd428b9.6fddd",
+        "id": "abe13a08.545e98",
         "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": 2000.8833312988281,
-        "y": 351,
-        "z": "d1eceead.adafe",
+        "y": 354,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "7043f926.26b93",
-                "50e447ae.0fde38",
-                "8af2638e.140428",
-                "b2d6bb83.745318"
+                "7d659bd1.1ff4ec",
+                "66649512.c7d5bc",
+                "cfd6a168.75b7d8",
+                "fe93cfa.921edb"
             ]
         ]
     },
     {
-        "id": "7043f926.26b93",
+        "id": "7d659bd1.1ff4ec",
         "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": 2280.883331298828,
-        "y": 289,
-        "z": "d1eceead.adafe",
+        "y": 292,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "6d42412e.61e8d",
+        "id": "d727f01e.ad9c98",
         "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": 1974.8833312988281,
-        "y": 301,
-        "z": "d1eceead.adafe",
+        "y": 304,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "8710bcb7.6e657",
+        "id": "7178c36c.cf3274",
         "type": "get-resource",
         "name": "get-resource pnfs-list",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"pnfs\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/pnfs?depth=0'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"ccsdkTopopnfs\" >",
         "comments": "",
         "outputs": 1,
         "x": 2017.8833312988281,
-        "y": 160,
-        "z": "d1eceead.adafe",
+        "y": 163,
+        "z": "8bd89607.6248d8",
         "wires": [
             []
         ]
     },
     {
-        "id": "6f728611.a8a3e",
+        "id": "ac38a7a3.b352e8",
         "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": 2029.8833312988281,
-        "y": 201,
-        "z": "d1eceead.adafe",
+        "y": 204,
+        "z": "8bd89607.6248d8",
         "wires": [
             []
         ]
     },
     {
-        "id": "8a5a98d5.6ebb1",
+        "id": "eed8a5a0.afccb8",
         "type": "comment",
         "name": "The following two nodes are for PCE",
         "info": "",
         "comments": "",
         "x": 2054.883331298828,
-        "y": 113,
-        "z": "d1eceead.adafe",
+        "y": 116,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "2303563c.e9131a",
+        "id": "141349a5.fce93e",
         "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": 1974.8833312988281,
-        "y": 247,
-        "z": "d1eceead.adafe",
+        "y": 250,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "6fdcac69.b07bec",
+        "id": "742662fc.5de6dc",
         "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": 2678.883331298828,
-        "y": 339,
-        "z": "d1eceead.adafe",
+        "y": 342,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "71176ed6.70694",
+        "id": "b4af8420.603268",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
         "x": 2678.820831298828,
-        "y": 388.1402587890625,
-        "z": "d1eceead.adafe",
+        "y": 391.1402587890625,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "4e35bc34.a92d94",
+        "id": "c1b489c1.9564e8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 2680.820831298828,
-        "y": 439.1402587890625,
-        "z": "d1eceead.adafe",
+        "y": 442.1402587890625,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "6a0085f3.85f3dc"
+                "fcfb8da2.5eaaf8"
             ]
         ]
     },
     {
-        "id": "6a0085f3.85f3dc",
+        "id": "fcfb8da2.5eaaf8",
         "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": 2973.820831298828,
-        "y": 386.1402587890625,
-        "z": "d1eceead.adafe",
+        "y": 389.1402587890625,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "47170bd3.47cd24",
-                "41231d4a.3c5914",
-                "413cb45a.a52f94"
+                "c3da29e4.d4aec",
+                "5d798b7c.bb38bc",
+                "f79e6540.82af6"
             ]
         ]
     },
     {
-        "id": "41231d4a.3c5914",
+        "id": "5d798b7c.bb38bc",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3247.311798095703,
-        "y": 278.7142333984375,
-        "z": "d1eceead.adafe",
+        "x": 3277.311767578125,
+        "y": 45.7142333984375,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "ddcd6972.1cc26"
+                "90e8e37d.ca8e98"
             ]
         ]
     },
     {
-        "id": "ddcd6972.1cc26",
+        "id": "90e8e37d.ca8e98",
         "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": 3424.883331298828,
-        "y": 279,
-        "z": "d1eceead.adafe",
+        "x": 3454.88330078125,
+        "y": 46,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "413cb45a.a52f94",
+        "id": "f79e6540.82af6",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3242.820831298828,
-        "y": 328.1402587890625,
-        "z": "d1eceead.adafe",
+        "x": 3272.82080078125,
+        "y": 95.1402587890625,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "29789682.9a5ca2"
+                "9bf9393a.ada1c"
             ]
         ]
     },
     {
-        "id": "29789682.9a5ca2",
+        "id": "9bf9393a.ada1c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3424.820831298828,
-        "y": 328.1402587890625,
-        "z": "d1eceead.adafe",
+        "x": 3454.82080078125,
+        "y": 95.1402587890625,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "47170bd3.47cd24",
+        "id": "c3da29e4.d4aec",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3246.820831298828,
-        "y": 379.1402587890625,
-        "z": "d1eceead.adafe",
+        "x": 3276.82080078125,
+        "y": 146.1402587890625,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "5d602163.27f0b"
+                "614d711.ad6151"
             ]
         ]
     },
     {
-        "id": "5d602163.27f0b",
+        "id": "614d711.ad6151",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3426.820831298828,
-        "y": 379.1402587890625,
-        "z": "d1eceead.adafe",
+        "x": 3456.82080078125,
+        "y": 146.1402587890625,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "dd9e7161.bb7c"
+                "6f9dfac6.7f7acc"
             ]
         ]
     },
     {
-        "id": "dd9e7161.bb7c",
+        "id": "6f9dfac6.7f7acc",
         "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": 2992.883331298828,
-        "y": 514,
-        "z": "d1eceead.adafe",
+        "y": 517,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "e567be5f.46cf",
-                "117d3c85.14baf3"
+                "cc5d43a6.52dac",
+                "df06d31e.f926b8"
             ]
         ]
     },
     {
-        "id": "117d3c85.14baf3",
+        "id": "df06d31e.f926b8",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3302.883331298828,
-        "y": 521,
-        "z": "d1eceead.adafe",
+        "x": 3332.88330078125,
+        "y": 288,
+        "z": "8bd89607.6248d8",
         "wires": [
             []
         ]
     },
     {
-        "id": "e567be5f.46cf",
+        "id": "cc5d43a6.52dac",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3301.883331298828,
-        "y": 575,
-        "z": "d1eceead.adafe",
+        "x": 3331.88330078125,
+        "y": 342,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "1aa53c9a.ee4c73"
+                "9005c08e.45bff"
             ]
         ]
     },
     {
-        "id": "16e58d5c.45543b",
+        "id": "7cc4c3ab.96110c",
         "type": "outcome",
         "name": "network-policy",
         "xml": "<outcome value='network-policy'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4046.883331298828,
-        "y": 529,
-        "z": "d1eceead.adafe",
+        "x": 4076.88330078125,
+        "y": 296,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "e0a75ebb.a4e0a"
+                "e1ccec43.b4b718"
             ]
         ]
     },
     {
-        "id": "e0a75ebb.a4e0a",
+        "id": "e1ccec43.b4b718",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4223.883209228516,
-        "y": 521.9998779296875,
-        "z": "d1eceead.adafe",
+        "x": 4253.8831787109375,
+        "y": 288.9998779296875,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "64783b1d.9ea984",
-                "aa6dd372.e093d"
+                "6a0eff2d.7a17d8",
+                "c12539fb.18b098"
             ]
         ]
     },
     {
-        "id": "1aa53c9a.ee4c73",
+        "id": "9005c08e.45bff",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3465.883331298828,
-        "y": 501,
-        "z": "d1eceead.adafe",
+        "x": 3495.88330078125,
+        "y": 268,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "9d9386aa.4ba0f",
-                "a5c7d0d0.70a6f8"
+                "c7cdd797.5d9c98",
+                "a2ea3a5e.b8028"
             ]
         ]
     },
     {
-        "id": "9d9386aa.4ba0f",
+        "id": "c7cdd797.5d9c98",
         "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": 3746.883331298828,
-        "y": 457,
-        "z": "d1eceead.adafe",
+        "x": 3776.88330078125,
+        "y": 224,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "ac9ffe20.350ab8"
+                "fdc5f0cb.fc2a38"
             ]
         ]
     },
     {
-        "id": "ac9ffe20.350ab8",
+        "id": "fdc5f0cb.fc2a38",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4008.883331298828,
-        "y": 457,
-        "z": "d1eceead.adafe",
+        "x": 4038.88330078125,
+        "y": 224,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "16e58d5c.45543b"
+                "7cc4c3ab.96110c"
             ]
         ]
     },
     {
-        "id": "64783b1d.9ea984",
+        "id": "6a0eff2d.7a17d8",
         "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": 4466.883209228516,
-        "y": 478.9998779296875,
-        "z": "d1eceead.adafe",
+        "x": 4496.8831787109375,
+        "y": 245.9998779296875,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "aa6dd372.e093d",
+        "id": "c12539fb.18b098",
         "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": 4455.883209228516,
-        "y": 533.9998779296875,
-        "z": "d1eceead.adafe",
+        "x": 4485.8831787109375,
+        "y": 300.9998779296875,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "a2aec981.c05928",
-                "c6a2ea9c.683df",
-                "b8928013.256998"
+                "53e90890.b88808",
+                "99815c1a.2d5d9",
+                "ef9ec486.51c458"
             ]
         ]
     },
     {
-        "id": "b8928013.256998",
+        "id": "ef9ec486.51c458",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4708.883331298828,
-        "y": 420,
-        "z": "d1eceead.adafe",
+        "x": 4738.88330078125,
+        "y": 187,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "83be4f6.3f006b"
+                "928a2f6e.9dcef"
             ]
         ]
     },
     {
-        "id": "83be4f6.3f006b",
+        "id": "928a2f6e.9dcef",
         "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": 4857.454864501953,
-        "y": 420.2857666015625,
-        "z": "d1eceead.adafe",
+        "x": 4887.454833984375,
+        "y": 187.2857666015625,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "586d6db7.c2d804",
+        "id": "5f26f831.604e6",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 4856.392364501953,
-        "y": 464.426025390625,
-        "z": "d1eceead.adafe",
+        "x": 4886.392333984375,
+        "y": 231.426025390625,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "c6a2ea9c.683df",
+        "id": "99815c1a.2d5d9",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4697.392364501953,
-        "y": 464.426025390625,
-        "z": "d1eceead.adafe",
+        "x": 4727.392333984375,
+        "y": 231.426025390625,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "586d6db7.c2d804"
+                "5f26f831.604e6"
             ]
         ]
     },
     {
-        "id": "a2aec981.c05928",
+        "id": "53e90890.b88808",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4704.392364501953,
-        "y": 543.426025390625,
-        "z": "d1eceead.adafe",
+        "x": 4734.392333984375,
+        "y": 310.426025390625,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "4d4b39ee.fece78"
+                "c7f5e24b.264e08"
             ]
         ]
     },
     {
-        "id": "4d4b39ee.fece78",
+        "id": "c7f5e24b.264e08",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4843.392364501953,
-        "y": 543.426025390625,
-        "z": "d1eceead.adafe",
+        "x": 4873.392333984375,
+        "y": 310.426025390625,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "68714312.362fe4",
-                "860808d4.582b4"
+                "bd533599.870598",
+                "5b846fca.358228"
             ]
         ]
     },
     {
-        "id": "68714312.362fe4",
+        "id": "bd533599.870598",
         "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": 5048.883331298828,
-        "y": 541,
-        "z": "d1eceead.adafe",
+        "x": 5078.88330078125,
+        "y": 308,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "860808d4.582b4",
+        "id": "5b846fca.358228",
         "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": 5047.883331298828,
-        "y": 587,
-        "z": "d1eceead.adafe",
+        "x": 5077.88330078125,
+        "y": 354,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "a5c7d0d0.70a6f8",
+        "id": "a2ea3a5e.b8028",
         "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": 3563.883331298828,
-        "y": 573,
-        "z": "d1eceead.adafe",
+        "x": 3593.88330078125,
+        "y": 340,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "91204981.e8b1c8"
+                "25258bcb.d218b4"
             ]
         ]
     },
     {
-        "id": "91204981.e8b1c8",
+        "id": "25258bcb.d218b4",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3843.883331298828,
-        "y": 573,
-        "z": "d1eceead.adafe",
+        "x": 3873.88330078125,
+        "y": 340,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "815c7496.5664a8"
+                "f26cca47.0cf8c8"
             ]
         ]
     },
     {
-        "id": "815c7496.5664a8",
+        "id": "f26cca47.0cf8c8",
         "type": "outcome",
         "name": "logical-link",
         "xml": "<outcome value='logical-link'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2256.8834533691406,
-        "y": 826.0001220703125,
-        "z": "d1eceead.adafe",
+        "y": 829.0001220703125,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "2e1a5e6a.390622"
+                "d5f97832.254d88"
             ]
         ]
     },
     {
-        "id": "2e1a5e6a.390622",
+        "id": "d5f97832.254d88",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 2433.883331298828,
-        "y": 819,
-        "z": "d1eceead.adafe",
+        "y": 822,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "fda12a63.354948",
-                "9acb494f.3c831"
+                "ae5af3.3e9a4d1",
+                "12544593.6754f2"
             ]
         ]
     },
     {
-        "id": "fda12a63.354948",
+        "id": "ae5af3.3e9a4d1",
         "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": 2676.883331298828,
-        "y": 776,
-        "z": "d1eceead.adafe",
+        "y": 779,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "9acb494f.3c831",
+        "id": "12544593.6754f2",
         "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": 2665.883331298828,
-        "y": 831,
-        "z": "d1eceead.adafe",
+        "y": 834,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "2cf3e7af.84ed7",
-                "7720ff91.14ecb8",
-                "6208751c.cb4214"
+                "79a8fecf.d1f59",
+                "b24729e3.47e65",
+                "4a9529bf.26c65"
             ]
         ]
     },
     {
-        "id": "2cf3e7af.84ed7",
+        "id": "79a8fecf.d1f59",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2957.374298095703,
-        "y": 809.573974609375,
-        "z": "d1eceead.adafe",
+        "y": 812.573974609375,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "644aada5.da5074"
+                "d25941f1.946b68"
             ]
         ]
     },
     {
-        "id": "7720ff91.14ecb8",
+        "id": "b24729e3.47e65",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2945.883331298828,
-        "y": 854,
-        "z": "d1eceead.adafe",
+        "y": 857,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "b4b18b88.8b8778"
+                "11547725.a203f9"
             ]
         ]
     },
     {
-        "id": "644aada5.da5074",
+        "id": "d25941f1.946b68",
         "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": 3105.945831298828,
-        "y": 809.8597412109375,
-        "z": "d1eceead.adafe",
+        "y": 812.8597412109375,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "b4b18b88.8b8778",
+        "id": "11547725.a203f9",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
         "x": 3104.883331298828,
-        "y": 854,
-        "z": "d1eceead.adafe",
+        "y": 857,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "6208751c.cb4214",
+        "id": "4a9529bf.26c65",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2952.883331298828,
-        "y": 933,
-        "z": "d1eceead.adafe",
+        "y": 936,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "f4a1f138.8436a"
+                "a4fd9348.176d48"
             ]
         ]
     },
     {
-        "id": "f4a1f138.8436a",
+        "id": "a4fd9348.176d48",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -997,2769 +997,2645 @@
         "comments": "",
         "outputs": 1,
         "x": 3091.883331298828,
-        "y": 933,
-        "z": "d1eceead.adafe",
-        "wires": [
-            [
-                "64b776d1.df13b8",
-                "cf58d1a3.b75bc8",
-                "a4d7ff96.ceb5f8",
-                "4f57fa4.5908a84",
-                "93281de6.9193c8",
-                "279a0c66.95b87c",
-                "2fd6be0.ec30642",
-                "3458f9fd.a9fdce",
-                "b114579a.337d4",
-                "83634982.62f32",
-                "a78c5989.f5207",
-                "dc895d5a.f09ef",
-                "8c6f82a5.234d18",
-                "a984d0c7.8574d",
-                "49347bae.3e2974"
-            ]
-        ]
-    },
-    {
-        "id": "fe79d8e9.168438",
+        "y": 936,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            [
+                "6c4953ff.9536c4",
+                "757555b7.a275b4",
+                "da8313.90b574f",
+                "a53e9db6.011d6",
+                "2b20579c.df8a7",
+                "1abe7496.3f7c9b",
+                "652968a1.d93e88",
+                "f369a6e9.5de548",
+                "fc221d76.582c9",
+                "5fd92a3e.ed6fec",
+                "4a864e6a.471e",
+                "e264db5d.2744d",
+                "afaae138.bb9798",
+                "121ba89c.f4d387",
+                "e7a924f9.c6032",
+                "e3b4a4d3.b60598",
+                "22dcd918.a9e88e",
+                "1743864d.d3d2f2",
+                "898efbe9.b7aab8",
+                "3ddfa25a.4bc3f6",
+                "f7bdbced.e4e6e",
+                "b2f7d29a.c36bc8"
+            ]
+        ]
+    },
+    {
+        "id": "3c4bd54a.0e1cfa",
         "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": 3405.883331298828,
-        "y": 739,
-        "z": "d1eceead.adafe",
+        "x": 3435.883270263672,
+        "y": 410,
+        "z": "8bd89607.6248d8",
         "wires": [
             []
         ]
     },
     {
-        "id": "64b776d1.df13b8",
+        "id": "6c4953ff.9536c4",
         "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": 3386.883331298828,
-        "y": 789,
-        "z": "d1eceead.adafe",
+        "x": 3416.883270263672,
+        "y": 510,
+        "z": "8bd89607.6248d8",
         "wires": [
             []
         ]
     },
     {
-        "id": "dc895d5a.f09ef",
+        "id": "e264db5d.2744d",
         "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": 3343.883331298828,
-        "y": 834,
-        "z": "d1eceead.adafe",
+        "x": 3370.883270263672,
+        "y": 561,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "cf58d1a3.b75bc8",
+        "id": "757555b7.a275b4",
         "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": 3318.883331298828,
-        "y": 897,
-        "z": "d1eceead.adafe",
+        "x": 3344.883270263672,
+        "y": 610,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "a4d7ff96.ceb5f8",
+        "id": "da8313.90b574f",
         "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": 3319.883331298828,
-        "y": 952,
-        "z": "d1eceead.adafe",
+        "x": 3343.883270263672,
+        "y": 659,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "4f57fa4.5908a84",
+        "id": "a53e9db6.011d6",
         "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": 3335.883331298828,
-        "y": 1000,
-        "z": "d1eceead.adafe",
+        "x": 3352.883270263672,
+        "y": 797,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "722a434e.2a3adc",
-                "e8fe3cd4.c3586",
-                "fdbfe007.1ea3b"
+                "cca9aa9c.5b4b58",
+                "6d66b175.a27548",
+                "6cf4995a.fab31"
             ]
         ]
     },
     {
-        "id": "93281de6.9193c8",
+        "id": "2b20579c.df8a7",
         "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": 3324.883331298828,
-        "y": 1086.9998779296875,
-        "z": "d1eceead.adafe",
+        "x": 3345.883270263672,
+        "y": 857.9998779296875,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "b372ac3d.0a4b1",
-                "d24aa16b.e47da",
-                "419032bc.a4963c"
+                "a115586d.1910d8",
+                "61de0330.a424c4",
+                "89e5a0b3.03b87"
             ]
         ]
     },
     {
-        "id": "722a434e.2a3adc",
+        "id": "cca9aa9c.5b4b58",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3536.883331298828,
-        "y": 884,
-        "z": "d1eceead.adafe",
+        "x": 3601.883026123047,
+        "y": 692,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "aae0d761.ec3158"
+                "294610ae.745698"
             ]
         ]
     },
     {
-        "id": "e8fe3cd4.c3586",
+        "id": "6d66b175.a27548",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3532.392364501953,
-        "y": 933.426025390625,
-        "z": "d1eceead.adafe",
+        "x": 3595.392059326172,
+        "y": 733.426025390625,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "af62b91c.6bf638"
+                "61b00039.d9b688"
             ]
         ]
     },
     {
-        "id": "fdbfe007.1ea3b",
+        "id": "6cf4995a.fab31",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3536.392364501953,
-        "y": 986.426025390625,
-        "z": "d1eceead.adafe",
+        "x": 3590.392059326172,
+        "y": 783.426025390625,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "72360610.10f7e"
+                "1fe35696.f7e9f9"
             ]
         ]
     },
     {
-        "id": "aae0d761.ec3158",
+        "id": "294610ae.745698",
         "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": 3685.454864501953,
-        "y": 883.2857666015625,
-        "z": "d1eceead.adafe",
+        "x": 3750.454559326172,
+        "y": 691.2857666015625,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "af62b91c.6bf638",
+        "id": "61b00039.d9b688",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3675.392364501953,
-        "y": 933.426025390625,
-        "z": "d1eceead.adafe",
+        "x": 3740.392059326172,
+        "y": 741.426025390625,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "b372ac3d.0a4b1",
+        "id": "a115586d.1910d8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3547.883331298828,
-        "y": 1056.9998779296875,
-        "z": "d1eceead.adafe",
+        "x": 3566.883270263672,
+        "y": 843.9998779296875,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "3bdfccb0.f2d08c"
+                "807fba07.07f6d"
             ]
         ]
     },
     {
-        "id": "d24aa16b.e47da",
+        "id": "61de0330.a424c4",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3543.392364501953,
-        "y": 1106.4259033203125,
-        "z": "d1eceead.adafe",
+        "x": 3562.392303466797,
+        "y": 893.4259033203125,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "57f2def1.81f4e"
+                "9f751353.b361d"
             ]
         ]
     },
     {
-        "id": "419032bc.a4963c",
+        "id": "89e5a0b3.03b87",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3544.392364501953,
-        "y": 1159.4259033203125,
-        "z": "d1eceead.adafe",
+        "x": 3563.392303466797,
+        "y": 946.4259033203125,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "91fe26d2.5b80d"
+                "17e5ea49.0fe58e"
             ]
         ]
     },
     {
-        "id": "3bdfccb0.f2d08c",
+        "id": "807fba07.07f6d",
         "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": 3696.454864501953,
-        "y": 1056.28564453125,
-        "z": "d1eceead.adafe",
+        "x": 3719.4546508789062,
+        "y": 849.28564453125,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "57f2def1.81f4e",
+        "id": "9f751353.b361d",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3686.392364501953,
-        "y": 1106.4259033203125,
-        "z": "d1eceead.adafe",
+        "x": 3705.392303466797,
+        "y": 893.4259033203125,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "72360610.10f7e",
+        "id": "1fe35696.f7e9f9",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3697.883331298828,
-        "y": 986,
-        "z": "d1eceead.adafe",
+        "x": 3762.883026123047,
+        "y": 794,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "21ff581a.7d3f68"
+                "6a90f954.4bce88"
             ]
         ]
     },
     {
-        "id": "91fe26d2.5b80d",
+        "id": "17e5ea49.0fe58e",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3697.883331298828,
-        "y": 1158.9998779296875,
-        "z": "d1eceead.adafe",
+        "x": 3716.883270263672,
+        "y": 945.9998779296875,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "f4949055.0aa838"
+                "f51128b5.0b454"
             ]
         ]
     },
     {
-        "id": "21ff581a.7d3f68",
+        "id": "6a90f954.4bce88",
         "type": "switchNode",
         "name": "switch nr type",
         "xml": "<switch test='`$tmp.aai.network-route-one.type`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3869.883331298828,
-        "y": 986,
-        "z": "d1eceead.adafe",
+        "x": 3923.883270263672,
+        "y": 681,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "d771576e.5459b",
-                "743ce77.86c2e98"
+                "d28de3c8.def278",
+                "32596d77.fd201a",
+                "c2039341.ed7fe"
             ]
         ]
     },
     {
-        "id": "f4949055.0aa838",
+        "id": "f51128b5.0b454",
         "type": "switchNode",
         "name": "switch nr type",
         "xml": "<switch test='`$tmp.aai.network-route-two.type`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3870.883331298828,
-        "y": 1159,
-        "z": "d1eceead.adafe",
+        "x": 3915.883270263672,
+        "y": 866,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "854204ac.64311",
-                "5401ccd6.c2c2e4"
+                "6179a2a6.c7a764",
+                "6a08da95.c46784",
+                "49cd1e6.2c21e6"
             ]
         ]
     },
     {
-        "id": "d771576e.5459b",
+        "id": "d28de3c8.def278",
         "type": "outcome",
         "name": "ROOT",
         "xml": "<outcome value='ROOT'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4045.883331298828,
-        "y": 965,
-        "z": "d1eceead.adafe",
+        "x": 4147.883758544922,
+        "y": 384.99993896484375,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "2e04d27d.5faff6"
+                "af392071.289a38"
             ]
         ]
     },
     {
-        "id": "743ce77.86c2e98",
+        "id": "32596d77.fd201a",
         "type": "outcome",
         "name": "LEAF",
         "xml": "<outcome value='LEAF'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4047.883331298828,
-        "y": 1019,
-        "z": "d1eceead.adafe",
+        "x": 4149.883758544922,
+        "y": 438.99993896484375,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "12c64a9b.27d615"
+                "7fbb2a1.f3ae954"
             ]
         ]
     },
     {
-        "id": "854204ac.64311",
+        "id": "6179a2a6.c7a764",
         "type": "outcome",
         "name": "ROOT",
         "xml": "<outcome value='ROOT'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4046.883331298828,
-        "y": 1129,
-        "z": "d1eceead.adafe",
+        "x": 4113.883758544922,
+        "y": 645,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "a8347389.2ab3b"
+                "92f10d9d.0be95"
             ]
         ]
     },
     {
-        "id": "5401ccd6.c2c2e4",
+        "id": "6a08da95.c46784",
         "type": "outcome",
         "name": "LEAF",
         "xml": "<outcome value='LEAF'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4048.883331298828,
-        "y": 1183,
-        "z": "d1eceead.adafe",
+        "x": 4115.883758544922,
+        "y": 699,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "49b6f3ad.a55ac4"
+                "bbb0db7f.fd9908"
             ]
         ]
     },
     {
-        "id": "20ddeea0.a0e9ea",
+        "id": "892e5669.1ea2b",
         "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": 4355.883331298828,
-        "y": 917,
-        "z": "d1eceead.adafe",
+        "x": 4457.883758544922,
+        "y": 336.99993896484375,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "a4916484.b95cf",
+        "id": "6a564e86.c1193",
         "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": 4348.883331298828,
-        "y": 1015,
-        "z": "d1eceead.adafe",
+        "x": 4450.883758544922,
+        "y": 434.99993896484375,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "2f347429.e690cc",
+        "id": "a3abd24c.7a5ec",
         "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": 4348.883331298828,
-        "y": 1102,
-        "z": "d1eceead.adafe",
+        "x": 4429.883758544922,
+        "y": 618,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "cad2e783.60fc68",
+        "id": "dc9fae61.a17b2",
         "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": 4352.883331298828,
-        "y": 1195,
-        "z": "d1eceead.adafe",
+        "x": 4433.883758544922,
+        "y": 711,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "b1d86e33.3aa378",
+        "id": "50eeb433.a27fd4",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3579.883331298828,
-        "y": 1604,
-        "z": "d1eceead.adafe",
+        "x": 3609.88330078125,
+        "y": 1371,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "a5f9a85c.99ac48"
+                "c94a30c2.a398b"
             ]
         ]
     },
     {
-        "id": "a4982a5c.ee1f08",
+        "id": "a408ed17.7674d",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3589.374298095703,
-        "y": 1646.5740356445312,
-        "z": "d1eceead.adafe",
+        "x": 3619.374267578125,
+        "y": 1413.5740356445312,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "bbb83480.f4afb8"
+                "82ef970c.862378"
             ]
         ]
     },
     {
-        "id": "9afba595.5831a",
+        "id": "3bc8671c.26c7e",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3577.883331298828,
-        "y": 1693,
-        "z": "d1eceead.adafe",
+        "x": 3607.88330078125,
+        "y": 1460,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "eeac5d42.037ff"
+                "5a6a5226.7899ec"
             ]
         ]
     },
     {
-        "id": "a9f44662.0eb94",
+        "id": "246e8fda.9e3d88",
         "type": "comment",
         "name": "Question?",
         "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
         "comments": "",
-        "x": 3279.883331298828,
-        "y": 1566,
-        "z": "d1eceead.adafe",
+        "x": 3309.88330078125,
+        "y": 1333,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "2fd6be0.ec30642",
+        "id": "652968a1.d93e88",
         "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": 3322.883331298828,
-        "y": 1631,
-        "z": "d1eceead.adafe",
+        "x": 3352.88330078125,
+        "y": 1398,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "b1d86e33.3aa378",
-                "a4982a5c.ee1f08",
-                "9afba595.5831a"
+                "50eeb433.a27fd4",
+                "a408ed17.7674d",
+                "3bc8671c.26c7e"
             ]
         ]
     },
     {
-        "id": "279a0c66.95b87c",
+        "id": "1abe7496.3f7c9b",
         "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": 3323.883331298828,
-        "y": 1301,
-        "z": "d1eceead.adafe",
+        "x": 3353.883270263672,
+        "y": 1150,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "ab7f6387.a06298",
-                "178d0fab.57c17"
+                "56f8321f.20ee54",
+                "27baf83a.a648a"
             ]
         ]
     },
     {
-        "id": "178d0fab.57c17",
+        "id": "27baf83a.a648a",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3546.883331298828,
-        "y": 1287,
-        "z": "d1eceead.adafe",
+        "x": 3576.883270263672,
+        "y": 1136,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "174b650f.6f4cdb"
+                "89fdb9b4.3821e8"
             ]
         ]
     },
     {
-        "id": "ab7f6387.a06298",
+        "id": "56f8321f.20ee54",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3548.883331298828,
-        "y": 1320,
-        "z": "d1eceead.adafe",
+        "x": 3578.883270263672,
+        "y": 1169,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "109222da.cab295"
+                "bd796d50.897138"
             ]
         ]
     },
     {
-        "id": "a5f9a85c.99ac48",
+        "id": "c94a30c2.a398b",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3752.549835205078,
-        "y": 1603,
-        "z": "d1eceead.adafe",
+        "x": 3782.5498046875,
+        "y": 1370,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "f0dfffc5.29d178",
-                "acd2704e.4ae308"
+                "5b1520ee.c993d8",
+                "92906f1e.302de8"
             ]
         ]
     },
     {
-        "id": "bbb83480.f4afb8",
+        "id": "82ef970c.862378",
         "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": 3742.9457092285156,
-        "y": 1649.8597717285156,
-        "z": "d1eceead.adafe",
+        "x": 3772.9456787109375,
+        "y": 1416.8597717285156,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "eeac5d42.037ff",
+        "id": "5a6a5226.7899ec",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3746.883331298828,
-        "y": 1694,
-        "z": "d1eceead.adafe",
+        "x": 3776.88330078125,
+        "y": 1461,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "f0dfffc5.29d178",
+        "id": "5b1520ee.c993d8",
         "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": 4016.883331298828,
-        "y": 1587,
-        "z": "d1eceead.adafe",
+        "x": 4046.88330078125,
+        "y": 1354,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "11bdf0f4.508487",
-                "23d1e1ad.23f75e"
+                "40f95927.3e48a8",
+                "155b2019.4d901"
             ]
         ]
     },
     {
-        "id": "23d1e1ad.23f75e",
+        "id": "155b2019.4d901",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4239.883331298828,
-        "y": 1542,
-        "z": "d1eceead.adafe",
+        "x": 4269.88330078125,
+        "y": 1309,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "3fc7a366.f1683c"
+                "8cff212e.fd093"
             ]
         ]
     },
     {
-        "id": "11bdf0f4.508487",
+        "id": "40f95927.3e48a8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4241.883331298828,
-        "y": 1606,
-        "z": "d1eceead.adafe",
+        "x": 4271.88330078125,
+        "y": 1373,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "d6cac3a3.d1f4"
+                "9ea2b228.156828"
             ]
         ]
     },
     {
-        "id": "d6cac3a3.d1f4",
+        "id": "9ea2b228.156828",
         "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": 4403.883331298828,
-        "y": 1602,
-        "z": "d1eceead.adafe",
+        "x": 4433.88330078125,
+        "y": 1369,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "3fc7a366.f1683c",
+        "id": "8cff212e.fd093",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4404.883331298828,
-        "y": 1539,
-        "z": "d1eceead.adafe",
+        "x": 4434.88330078125,
+        "y": 1306,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "d54289dc.18d288",
-                "cc99bc89.a9c058"
+                "ea39175a.08155",
+                "81bb5906.bb1848"
             ]
         ]
     },
     {
-        "id": "17e0fd07.b5de8b",
-        "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\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='vpn-type' value='`$prop.sotn.vpnType`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 4018.883331298828,
-        "y": 1746,
-        "z": "d1eceead.adafe",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "f1afd056.64d73",
-        "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": 4063.883331298828,
-        "y": 1656,
-        "z": "d1eceead.adafe",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "50d51c8c.dc95ac",
-        "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": 4146.883331298828,
-        "y": 1794,
-        "z": "d1eceead.adafe",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "109222da.cab295",
+        "id": "bd796d50.897138",
         "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": 3691.883331298828,
-        "y": 1317,
-        "z": "d1eceead.adafe",
+        "x": 3721.883270263672,
+        "y": 1166,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "174b650f.6f4cdb",
+        "id": "89fdb9b4.3821e8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3694.883331298828,
-        "y": 1280,
-        "z": "d1eceead.adafe",
+        "x": 3724.883270263672,
+        "y": 1129,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "6b9c6245.ea050c",
-                "ab33cb14.ff6cc8"
+                "242e596.6a45da6",
+                "c522f465.9b1b48"
             ]
         ]
     },
     {
-        "id": "6b9c6245.ea050c",
+        "id": "242e596.6a45da6",
         "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": 3868.883331298828,
-        "y": 1236,
-        "z": "d1eceead.adafe",
+        "x": 3916.883270263672,
+        "y": 1131,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "acd2704e.4ae308",
+        "id": "92906f1e.302de8",
         "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": 3970.883331298828,
-        "y": 1871,
-        "z": "d1eceead.adafe",
+        "x": 4006.88330078125,
+        "y": 1486,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "73a0105b.ac0e58"
+                "9d7e97d1.f3da4"
             ]
         ]
     },
     {
-        "id": "73a0105b.ac0e58",
+        "id": "9d7e97d1.f3da4",
         "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": 4176.883331298828,
-        "y": 1871,
-        "z": "d1eceead.adafe",
+        "x": 4212.88330078125,
+        "y": 1486,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "6dbfb157.d8359"
+                "39469ddd.cce81a"
             ]
         ]
     },
     {
-        "id": "6dbfb157.d8359",
+        "id": "39469ddd.cce81a",
         "type": "outcome",
         "name": "tunnel-termination-point",
         "xml": "<outcome value='tunnel-termination-point'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4392.168975830078,
-        "y": 1870.82177734375,
-        "z": "d1eceead.adafe",
+        "x": 4428.1689453125,
+        "y": 1485.82177734375,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "616def67.e5a25"
+                "286435fd.520a92"
             ]
         ]
     },
     {
-        "id": "ab33cb14.ff6cc8",
+        "id": "c522f465.9b1b48",
         "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": 3883.883331298828,
-        "y": 1347,
-        "z": "d1eceead.adafe",
+        "x": 3913.883270263672,
+        "y": 1196,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "e7bde0a4.3a223",
-                "856b3a3e.33dd18",
-                "ec1837c2.7e65e8"
+                "9a817681.2b7108",
+                "845c0857.7834f8",
+                "aae3c73d.eac74"
             ]
         ]
     },
     {
-        "id": "e7bde0a4.3a223",
+        "id": "9a817681.2b7108",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4079.3834533691406,
-        "y": 1299,
-        "z": "d1eceead.adafe",
+        "x": 4109.383392333984,
+        "y": 1148,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "a049038b.508d4"
+                "d82b3eae.4c278"
             ]
         ]
     },
     {
-        "id": "856b3a3e.33dd18",
+        "id": "845c0857.7834f8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4071.3834533691406,
-        "y": 1354,
-        "z": "d1eceead.adafe",
+        "x": 4101.383392333984,
+        "y": 1203,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "f843f7f2.8c64b8"
+                "c5b5dd85.a284c8"
             ]
         ]
     },
     {
-        "id": "ec1837c2.7e65e8",
+        "id": "aae3c73d.eac74",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4076.3834533691406,
-        "y": 1411,
-        "z": "d1eceead.adafe",
+        "x": 4106.383392333984,
+        "y": 1260,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "47e459e1.2a9ce"
+                "535d5ed7.3fd4e"
             ]
         ]
     },
     {
-        "id": "47e459e1.2a9ce",
+        "id": "535d5ed7.3fd4e",
         "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": 4228.383453369141,
-        "y": 1412,
-        "z": "d1eceead.adafe",
+        "x": 4258.383392333984,
+        "y": 1261,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "f843f7f2.8c64b8",
+        "id": "c5b5dd85.a284c8",
         "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": 4239.383453369141,
-        "y": 1357,
-        "z": "d1eceead.adafe",
+        "x": 4269.383392333984,
+        "y": 1206,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "a049038b.508d4",
+        "id": "d82b3eae.4c278",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4223.765777587891,
-        "y": 1296.6556701660156,
-        "z": "d1eceead.adafe",
+        "x": 4253.765716552734,
+        "y": 1145.6556701660156,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "b2d1999f.753708"
+                "5176f492.5f7e8c"
             ]
         ]
     },
     {
-        "id": "b2d1999f.753708",
+        "id": "5176f492.5f7e8c",
         "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": 4407.883331298828,
-        "y": 1311,
-        "z": "d1eceead.adafe",
+        "x": 4447.883270263672,
+        "y": 1189.9999389648438,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "9b22416d.9cdac8"
+                "1d42fe6d.851b3a"
             ]
         ]
     },
     {
-        "id": "cc99bc89.a9c058",
+        "id": "81bb5906.bb1848",
         "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": 4574.883331298828,
-        "y": 1497,
-        "z": "d1eceead.adafe",
+        "x": 4604.88330078125,
+        "y": 1264,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "d54289dc.18d288",
+        "id": "ea39175a.08155",
         "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": 4575.883331298828,
-        "y": 1605,
-        "z": "d1eceead.adafe",
+        "x": 4605.88330078125,
+        "y": 1372,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "46e18359.07aad4",
+        "id": "ea0872ed.58cfa",
         "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": 4576.883331298828,
-        "y": 1554,
-        "z": "d1eceead.adafe",
+        "x": 4606.88330078125,
+        "y": 1321,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "616def67.e5a25",
+        "id": "286435fd.520a92",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4599.000518798828,
-        "y": 1871.34033203125,
-        "z": "d1eceead.adafe",
+        "x": 4635.00048828125,
+        "y": 1486.34033203125,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "6d0c5fcb.438328",
-                "40a1c35d.17991c",
-                "6c800e67.6aa9c8"
+                "b0e3cfe1.6d40f",
+                "7126b880.f67e48",
+                "ad3a7086.abf6b"
             ]
         ]
     },
     {
-        "id": "6d0c5fcb.438328",
+        "id": "b0e3cfe1.6d40f",
         "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": 4814.000518798828,
-        "y": 1833.34033203125,
-        "z": "d1eceead.adafe",
+        "x": 4850.00048828125,
+        "y": 1448.34033203125,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "40a1c35d.17991c",
+        "id": "7126b880.f67e48",
         "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": 4811.000518798828,
-        "y": 1872.34033203125,
-        "z": "d1eceead.adafe",
+        "x": 4847.00048828125,
+        "y": 1487.34033203125,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "9de28790.cf8c7"
+                "7a65c420.1080dc"
             ]
         ]
     },
     {
-        "id": "6c800e67.6aa9c8",
+        "id": "ad3a7086.abf6b",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 4766.500518798828,
-        "y": 1914.34033203125,
-        "z": "d1eceead.adafe",
+        "x": 4802.50048828125,
+        "y": 1529.34033203125,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "9de28790.cf8c7",
+        "id": "7a65c420.1080dc",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4991.500518798828,
-        "y": 1871.34033203125,
-        "z": "d1eceead.adafe",
+        "x": 5027.50048828125,
+        "y": 1486.34033203125,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "e5173d49.fc3368"
+                "96c8a7ed.e41958"
             ]
         ]
     },
     {
-        "id": "376d58a4.adb2a",
+        "id": "90470a6f.8ef5f8",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4805.883331298828,
-        "y": 1315,
-        "z": "d1eceead.adafe",
+        "x": 4835.88330078125,
+        "y": 1082,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "60247fbe.4b6c2"
+                "e5efb625.18037"
             ]
         ]
     },
     {
-        "id": "60247fbe.4b6c2",
+        "id": "e5efb625.18037",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4982.883331298828,
-        "y": 1307,
-        "z": "d1eceead.adafe",
+        "x": 5012.88330078125,
+        "y": 1074,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "4270b940.4f6ac",
-                "65b48891.d54c3"
+                "732587d3.ab7a9",
+                "4baffabc.103f3c"
             ]
         ]
     },
     {
-        "id": "9b22416d.9cdac8",
+        "id": "1d42fe6d.851b3a",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4602.883331298828,
-        "y": 1311,
-        "z": "d1eceead.adafe",
+        "x": 4638.883270263672,
+        "y": 1179.9999389648438,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "376d58a4.adb2a",
-                "59d37917.573538"
+                "90470a6f.8ef5f8",
+                "6cae07e7.8ff81"
             ]
         ]
     },
     {
-        "id": "59d37917.573538",
+        "id": "6cae07e7.8ff81",
         "type": "outcome",
         "name": "network-resource",
         "xml": "<outcome value='network-resource'>",
         "comments": "",
         "outputs": 1,
-        "x": 4808.883331298828,
-        "y": 1389,
-        "z": "d1eceead.adafe",
+        "x": 4838.88330078125,
+        "y": 1156,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "b8751b8b.fb4f58"
+                "8681155.73991e8"
             ]
         ]
     },
     {
-        "id": "b8751b8b.fb4f58",
+        "id": "8681155.73991e8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4985.883331298828,
-        "y": 1381,
-        "z": "d1eceead.adafe",
+        "x": 5015.88330078125,
+        "y": 1148,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "673e159e.9038cc"
+                "c2e2c331.f24d7"
             ]
         ]
     },
     {
-        "id": "e5173d49.fc3368",
+        "id": "96c8a7ed.e41958",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5149.500518798828,
-        "y": 1871.34033203125,
-        "z": "d1eceead.adafe",
+        "x": 5185.50048828125,
+        "y": 1486.34033203125,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "e816a090.0c423"
+                "d73ce805.51d21"
             ]
         ]
     },
     {
-        "id": "e816a090.0c423",
+        "id": "d73ce805.51d21",
         "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": 5356.500518798828,
-        "y": 1871.34033203125,
-        "z": "d1eceead.adafe",
+        "x": 5392.50048828125,
+        "y": 1486.34033203125,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "65b48891.d54c3",
+        "id": "4baffabc.103f3c",
         "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": 5190.883331298828,
-        "y": 1314,
-        "z": "d1eceead.adafe",
+        "x": 5220.88330078125,
+        "y": 1081,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "12ca2f18.a3fcb1",
-                "2eff6a6f.1256be",
-                "ae932fb7.b2f368"
+                "276c589.f8898a8",
+                "b6b78749.64c52",
+                "710e31ca.f7c328"
             ]
         ]
     },
     {
-        "id": "4270b940.4f6ac",
+        "id": "732587d3.ab7a9",
         "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": 5220.883331298828,
-        "y": 1262,
-        "z": "d1eceead.adafe",
+        "x": 5250.88330078125,
+        "y": 1029,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "12ca2f18.a3fcb1",
+        "id": "276c589.f8898a8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5400.883331298828,
-        "y": 1305,
-        "z": "d1eceead.adafe",
+        "x": 5430.88330078125,
+        "y": 1072,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "19df6125.66c90f"
+                "6595904d.14fc"
             ]
         ]
     },
     {
-        "id": "2eff6a6f.1256be",
+        "id": "b6b78749.64c52",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5392.883331298828,
-        "y": 1360,
-        "z": "d1eceead.adafe",
+        "x": 5422.88330078125,
+        "y": 1127,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "5900b30a.9db0cc"
+                "870ff6d4.3b5618"
             ]
         ]
     },
     {
-        "id": "ae932fb7.b2f368",
+        "id": "710e31ca.f7c328",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5397.883331298828,
-        "y": 1417,
-        "z": "d1eceead.adafe",
+        "x": 5427.88330078125,
+        "y": 1184,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "abcfe080.ae7e7"
+                "14dafdf8.cfb5c2"
             ]
         ]
     },
     {
-        "id": "abcfe080.ae7e7",
+        "id": "14dafdf8.cfb5c2",
         "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": 5549.883331298828,
-        "y": 1418,
-        "z": "d1eceead.adafe",
+        "x": 5579.88330078125,
+        "y": 1185,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "5900b30a.9db0cc",
+        "id": "870ff6d4.3b5618",
         "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": 5560.883331298828,
-        "y": 1363,
-        "z": "d1eceead.adafe",
+        "x": 5590.88330078125,
+        "y": 1130,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "19df6125.66c90f",
+        "id": "6595904d.14fc",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5545.265655517578,
-        "y": 1302.6556701660156,
-        "z": "d1eceead.adafe",
+        "x": 5575.265625,
+        "y": 1069.6556701660156,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "db94bf6b.c81da8"
+                "4578d3b4.cc9aac"
             ]
         ]
     },
     {
-        "id": "673e159e.9038cc",
+        "id": "c2e2c331.f24d7",
         "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": 5220.883331298828,
-        "y": 1505,
-        "z": "d1eceead.adafe",
+        "x": 5250.88330078125,
+        "y": 1272,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "db94bf6b.c81da8",
+        "id": "4578d3b4.cc9aac",
         "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": 5759.883331298828,
-        "y": 1299,
-        "z": "d1eceead.adafe",
+        "x": 5789.88330078125,
+        "y": 1066,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "653ea460.331594",
+        "id": "d9f780b3.339398",
         "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": 4343.883331298828,
-        "y": 953,
-        "z": "d1eceead.adafe",
+        "x": 4445.883758544922,
+        "y": 372.99993896484375,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "3ff377ce.541508",
+        "id": "eeaf4d12.9621",
         "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": 4334.883331298828,
-        "y": 1051,
-        "z": "d1eceead.adafe",
+        "x": 4446.883728027344,
+        "y": 476.99993896484375,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "2e04d27d.5faff6",
+        "id": "af392071.289a38",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4168.883331298828,
-        "y": 959,
-        "z": "d1eceead.adafe",
+        "x": 4270.883758544922,
+        "y": 378.99993896484375,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "20ddeea0.a0e9ea",
-                "653ea460.331594"
+                "892e5669.1ea2b",
+                "d9f780b3.339398"
             ]
         ]
     },
     {
-        "id": "12c64a9b.27d615",
+        "id": "7fbb2a1.f3ae954",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4174.883331298828,
-        "y": 1023,
-        "z": "d1eceead.adafe",
+        "x": 4276.883758544922,
+        "y": 442.99993896484375,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "a4916484.b95cf",
-                "3ff377ce.541508"
+                "6a564e86.c1193",
+                "eeaf4d12.9621"
             ]
         ]
     },
     {
-        "id": "a8347389.2ab3b",
+        "id": "92f10d9d.0be95",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4174.883331298828,
-        "y": 1129,
-        "z": "d1eceead.adafe",
+        "x": 4241.883758544922,
+        "y": 645,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "2f347429.e690cc",
-                "64f47a9a.5541ec"
+                "a3abd24c.7a5ec",
+                "d4111de3.168d5"
             ]
         ]
     },
     {
-        "id": "49b6f3ad.a55ac4",
+        "id": "bbb0db7f.fd9908",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4177.883331298828,
-        "y": 1182,
-        "z": "d1eceead.adafe",
+        "x": 4244.883758544922,
+        "y": 698,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "cad2e783.60fc68",
-                "93b1477b.b7ce28"
+                "dc9fae61.a17b2",
+                "daba5f73.79ab3"
             ]
         ]
     },
     {
-        "id": "64f47a9a.5541ec",
+        "id": "d4111de3.168d5",
         "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": 4334.883331298828,
-        "y": 1142,
-        "z": "d1eceead.adafe",
+        "x": 4415.883758544922,
+        "y": 658,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "93b1477b.b7ce28",
+        "id": "daba5f73.79ab3",
         "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": 4337.883331298828,
-        "y": 1233,
-        "z": "d1eceead.adafe",
+        "x": 4418.883758544922,
+        "y": 749,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "bcceae66.215ea8",
+        "id": "f11652ec.f5ecc",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3709.883331298828,
-        "y": 2443,
-        "z": "d1eceead.adafe",
+        "x": 3741.88330078125,
+        "y": 1828.0001220703125,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "fa55cad.2f0ddb8",
-                "341eac77.d5f56c"
+                "2518ba78.6d21ae",
+                "ca887fb4.4fa748"
             ]
         ]
     },
     {
-        "id": "e6e2e92d.d49f8",
+        "id": "5d22eff5.ad4738",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3537.216827392578,
-        "y": 2444,
-        "z": "d1eceead.adafe",
+        "x": 3569.216796875,
+        "y": 1829.0001220703125,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "bcceae66.215ea8"
+                "f11652ec.f5ecc"
             ]
         ]
     },
     {
-        "id": "15d49e8e.f5c6d1",
+        "id": "f62aa8b7.81c7a8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3546.707794189453,
-        "y": 2486.5740356445312,
-        "z": "d1eceead.adafe",
+        "x": 3578.707763671875,
+        "y": 1871.5741577148438,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "b6575c89.a4dbd8"
+                "3ccb36a1.cd58ba"
             ]
         ]
     },
     {
-        "id": "456db0bd.6c4e5",
+        "id": "949b65da.c62778",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3535.216827392578,
-        "y": 2533,
-        "z": "d1eceead.adafe",
+        "x": 3567.216796875,
+        "y": 1918.0001220703125,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "f1a4c78.c749938"
+                "b3008d52.d5dec"
             ]
         ]
     },
     {
-        "id": "b6575c89.a4dbd8",
+        "id": "3ccb36a1.cd58ba",
         "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.2792053222656,
-        "y": 2489.8597717285156,
-        "z": "d1eceead.adafe",
+        "x": 3732.2791748046875,
+        "y": 1874.8598937988281,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "f1a4c78.c749938",
+        "id": "b3008d52.d5dec",
         "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.216827392578,
-        "y": 2534,
-        "z": "d1eceead.adafe",
+        "x": 3736.216796875,
+        "y": 1919.0001220703125,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "fa55cad.2f0ddb8",
+        "id": "2518ba78.6d21ae",
         "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.216827392578,
-        "y": 2447.0001220703125,
-        "z": "d1eceead.adafe",
+        "x": 4028.216796875,
+        "y": 1832.000244140625,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "2a55ff3d.a63f58",
-                "a4fedadd.ffdcf"
+                "2fdbf5bd.c09292",
+                "9a5de981.0de7c"
             ]
         ]
     },
     {
-        "id": "a4fedadd.ffdcf",
+        "id": "9a5de981.0de7c",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4219.216827392578,
-        "y": 2402.0001220703125,
-        "z": "d1eceead.adafe",
+        "x": 4251.216796875,
+        "y": 1787.000244140625,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "2cf5b91c.330536"
+                "82242071.f4a9f"
             ]
         ]
     },
     {
-        "id": "2a55ff3d.a63f58",
+        "id": "2fdbf5bd.c09292",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4221.216827392578,
-        "y": 2466.0001220703125,
-        "z": "d1eceead.adafe",
+        "x": 4253.216796875,
+        "y": 1851.000244140625,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "f4cfd006.4df4a"
+                "56361c44.c984a4"
             ]
         ]
     },
     {
-        "id": "f4cfd006.4df4a",
+        "id": "56361c44.c984a4",
         "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.216827392578,
-        "y": 2485.0001220703125,
-        "z": "d1eceead.adafe",
+        "x": 4412.216796875,
+        "y": 1870.000244140625,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "2cf5b91c.330536",
+        "id": "82242071.f4a9f",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4384.216827392578,
-        "y": 2399.0001220703125,
-        "z": "d1eceead.adafe",
+        "x": 4416.216796875,
+        "y": 1784.000244140625,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "60521985.bf9fa8",
-                "1b11d7f2.c04e4"
+                "10610dd4.f6c112",
+                "ddf5e2c4.67d9f8"
             ]
         ]
     },
     {
-        "id": "3e3a2fcb.29b168",
-        "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<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\n\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='vpn-type' value='`$prop.sotn.vpnType`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3998.216827392578,
-        "y": 2606.0001220703125,
-        "z": "d1eceead.adafe",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "a24d2064.f8a7c",
-        "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": 4043.216827392578,
-        "y": 2516.0001220703125,
-        "z": "d1eceead.adafe",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "7f1c08c8.8cc28",
-        "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": 4125.216827392578,
-        "y": 2671.0001220703125,
-        "z": "d1eceead.adafe",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "b114579a.337d4",
+        "id": "fc221d76.582c9",
         "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.216827392578,
-        "y": 2479,
-        "z": "d1eceead.adafe",
+        "x": 3341.216796875,
+        "y": 1864.0001220703125,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "e6e2e92d.d49f8",
-                "15d49e8e.f5c6d1",
-                "456db0bd.6c4e5"
+                "5d22eff5.ad4738",
+                "f62aa8b7.81c7a8",
+                "949b65da.c62778"
             ]
         ]
     },
     {
-        "id": "8e0a6f3b.01feb",
+        "id": "322a186d.549ed",
         "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.216827392578,
-        "y": 2423,
-        "z": "d1eceead.adafe",
+        "x": 3302.216796875,
+        "y": 1808.0001220703125,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "3458f9fd.a9fdce",
+        "id": "f369a6e9.5de548",
         "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": 3327.216827392578,
-        "y": 2141.9998779296875,
-        "z": "d1eceead.adafe",
+        "x": 3353.216796875,
+        "y": 1603,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "c48f1e5.b50d76",
-                "40db2833.3d6058"
+                "cb8e448.206bab8",
+                "778779f6.be6098"
             ]
         ]
     },
     {
-        "id": "40db2833.3d6058",
+        "id": "778779f6.be6098",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3550.216827392578,
-        "y": 2127.9998779296875,
-        "z": "d1eceead.adafe",
+        "x": 3576.216796875,
+        "y": 1589,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "57ecc3e9.705994"
+                "4c771f34.9e70b8"
             ]
         ]
     },
     {
-        "id": "c48f1e5.b50d76",
+        "id": "cb8e448.206bab8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3552.216827392578,
-        "y": 2160.9998779296875,
-        "z": "d1eceead.adafe",
+        "x": 3578.216796875,
+        "y": 1622,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "6a189760.03fff"
+                "7c64438a.ff9f5c"
             ]
         ]
     },
     {
-        "id": "6a189760.03fff",
+        "id": "7c64438a.ff9f5c",
         "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": 3695.216827392578,
-        "y": 2157.9998779296875,
-        "z": "d1eceead.adafe",
+        "x": 3721.216796875,
+        "y": 1619,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "57ecc3e9.705994",
+        "id": "4c771f34.9e70b8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3698.216827392578,
-        "y": 2120.9998779296875,
-        "z": "d1eceead.adafe",
+        "x": 3724.216796875,
+        "y": 1582,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "7ef10f50.4a98b",
-                "d3e48892.7c0638"
+                "8b5ae92b.18937",
+                "acd78677.da7398"
             ]
         ]
     },
     {
-        "id": "7ef10f50.4a98b",
+        "id": "8b5ae92b.18937",
         "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": 3892.216827392578,
-        "y": 2124,
-        "z": "d1eceead.adafe",
+        "x": 3918.216796875,
+        "y": 1585.0001220703125,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "341eac77.d5f56c",
+        "id": "ca887fb4.4fa748",
         "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": 3955.216827392578,
-        "y": 2756,
-        "z": "d1eceead.adafe",
+        "x": 3969.216766357422,
+        "y": 1965,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "1d1b2999.e8eaf6"
+                "d3ca912e.f0454"
             ]
         ]
     },
     {
-        "id": "1d1b2999.e8eaf6",
+        "id": "d3ca912e.f0454",
         "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": 4161.216827392578,
-        "y": 2756,
-        "z": "d1eceead.adafe",
+        "x": 4175.216766357422,
+        "y": 1965,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "2587a419.edf304"
+                "e775983e.c87c6"
             ]
         ]
     },
     {
-        "id": "2587a419.edf304",
+        "id": "e775983e.c87c6",
         "type": "outcome",
         "name": "tunnel-termination-point",
         "xml": "<outcome value='tunnel-termination-point'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4378.502471923828,
-        "y": 2754.82177734375,
-        "z": "d1eceead.adafe",
+        "x": 4392.502410888672,
+        "y": 1963.82177734375,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "596e064d.3e4868"
+                "8510e412.3775c"
             ]
         ]
     },
     {
-        "id": "d3e48892.7c0638",
+        "id": "acd78677.da7398",
         "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": 3914.216827392578,
-        "y": 2192,
-        "z": "d1eceead.adafe",
+        "x": 3940.216796875,
+        "y": 1653.0001220703125,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "5d04022c.52094c",
-                "4363a204.88356c",
-                "d1632f49.e8bfd8"
+                "e413099e.5580f8",
+                "73fbbbe6.41f3fc",
+                "be84a2f7.e2d8"
             ]
         ]
     },
     {
-        "id": "5d04022c.52094c",
+        "id": "e413099e.5580f8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4109.716949462891,
-        "y": 2144,
-        "z": "d1eceead.adafe",
+        "x": 4135.7169189453125,
+        "y": 1605.0001220703125,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "16d6f161.b988af"
+                "6607b5e0.cc2a14"
             ]
         ]
     },
     {
-        "id": "4363a204.88356c",
+        "id": "73fbbbe6.41f3fc",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4101.716949462891,
-        "y": 2199,
-        "z": "d1eceead.adafe",
+        "x": 4127.7169189453125,
+        "y": 1660.0001220703125,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "5ac71d3b.31ff94"
+                "c946d76.aa97f28"
             ]
         ]
     },
     {
-        "id": "d1632f49.e8bfd8",
+        "id": "be84a2f7.e2d8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4106.716949462891,
-        "y": 2256,
-        "z": "d1eceead.adafe",
+        "x": 4132.7169189453125,
+        "y": 1717.0001220703125,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "8e2e62d9.6dcb8"
+                "55c1c0e2.5aae38"
             ]
         ]
     },
     {
-        "id": "8e2e62d9.6dcb8",
+        "id": "55c1c0e2.5aae38",
         "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": 4258.716949462891,
-        "y": 2257,
-        "z": "d1eceead.adafe",
+        "x": 4284.7169189453125,
+        "y": 1718.0001220703125,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "5ac71d3b.31ff94",
+        "id": "c946d76.aa97f28",
         "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": 4269.716949462891,
-        "y": 2202,
-        "z": "d1eceead.adafe",
+        "x": 4295.7169189453125,
+        "y": 1663.0001220703125,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "16d6f161.b988af",
+        "id": "6607b5e0.cc2a14",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4254.099273681641,
-        "y": 2141.6556701660156,
-        "z": "d1eceead.adafe",
+        "x": 4280.0992431640625,
+        "y": 1602.6557922363281,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "7d886bfd.e9ca4c"
+                "eb6f70d5.e0fd88"
             ]
         ]
     },
     {
-        "id": "60521985.bf9fa8",
+        "id": "10610dd4.f6c112",
         "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.216827392578,
-        "y": 2360.0001220703125,
-        "z": "d1eceead.adafe",
+        "x": 4586.216796875,
+        "y": 1745.000244140625,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "1b11d7f2.c04e4",
+        "id": "ddf5e2c4.67d9f8",
         "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.216827392578,
-        "y": 2465.0001220703125,
-        "z": "d1eceead.adafe",
+        "x": 4587.216796875,
+        "y": 1850.000244140625,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "f5d8e7ee.5dd5b8",
+        "id": "f866aa99.a64d6",
         "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.216827392578,
-        "y": 2414.0001220703125,
-        "z": "d1eceead.adafe",
+        "x": 4582.216796875,
+        "y": 1799.000244140625,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "596e064d.3e4868",
+        "id": "8510e412.3775c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4585.334014892578,
-        "y": 2744.3404541015625,
-        "z": "d1eceead.adafe",
+        "x": 4599.333953857422,
+        "y": 1953.3404541015625,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "1d1ef4b9.b52cc3",
-                "aa09325d.47c72",
-                "f212860e.85526"
+                "3eb610b6.e19958",
+                "2b4d2f26.4fc18",
+                "56b44513.ed17bc"
             ]
         ]
     },
     {
-        "id": "1d1ef4b9.b52cc3",
+        "id": "3eb610b6.e19958",
         "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": 4800.334014892578,
-        "y": 2706.3404541015625,
-        "z": "d1eceead.adafe",
+        "x": 4814.333953857422,
+        "y": 1915.3404541015625,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "aa09325d.47c72",
+        "id": "2b4d2f26.4fc18",
         "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": 4797.334014892578,
-        "y": 2745.3404541015625,
-        "z": "d1eceead.adafe",
+        "x": 4811.333953857422,
+        "y": 1954.3404541015625,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "391393be.95d72c"
+                "b7623c50.89af3"
             ]
         ]
     },
     {
-        "id": "f212860e.85526",
+        "id": "56b44513.ed17bc",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 4752.834014892578,
-        "y": 2787.3404541015625,
-        "z": "d1eceead.adafe",
+        "x": 4766.833953857422,
+        "y": 1996.3404541015625,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "391393be.95d72c",
+        "id": "b7623c50.89af3",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4977.834014892578,
-        "y": 2744.3404541015625,
-        "z": "d1eceead.adafe",
+        "x": 4991.833953857422,
+        "y": 1953.3404541015625,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "520819a9.ab1618"
+                "e2420b84.cbf938"
             ]
         ]
     },
     {
-        "id": "520819a9.ab1618",
+        "id": "e2420b84.cbf938",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5135.834014892578,
-        "y": 2744.3404541015625,
-        "z": "d1eceead.adafe",
+        "x": 5149.833953857422,
+        "y": 1953.3404541015625,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "3a6f0d92.f64ee2"
+                "d3754257.cdbb9"
             ]
         ]
     },
     {
-        "id": "3a6f0d92.f64ee2",
+        "id": "d3754257.cdbb9",
         "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": 5342.834014892578,
-        "y": 2744.3404541015625,
-        "z": "d1eceead.adafe",
+        "x": 5356.833953857422,
+        "y": 1953.3404541015625,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "35d3101c.ddb4c",
+        "id": "303b1a28.56bd56",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4836.216827392578,
-        "y": 2160,
-        "z": "d1eceead.adafe",
+        "x": 4862.216796875,
+        "y": 1621.0001220703125,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "461a66b2.13a6c8"
+                "8f6cdb8f.90967"
             ]
         ]
     },
     {
-        "id": "461a66b2.13a6c8",
+        "id": "8f6cdb8f.90967",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5013.216827392578,
-        "y": 2152,
-        "z": "d1eceead.adafe",
+        "x": 5039.216796875,
+        "y": 1613.0001220703125,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "6cbb0705.4a3c5",
-                "670f0182.9fd968"
+                "5fcf484f.8e6e78",
+                "f4e9d00a.c60c9"
             ]
         ]
     },
     {
-        "id": "7d886bfd.e9ca4c",
+        "id": "eb6f70d5.e0fd88",
         "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": 4438.216827392578,
-        "y": 2156,
-        "z": "d1eceead.adafe",
+        "x": 4464.216796875,
+        "y": 1617.0001220703125,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "e2222250.60ef7"
+                "93bac5db.c9063"
             ]
         ]
     },
     {
-        "id": "e2222250.60ef7",
+        "id": "93bac5db.c9063",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4633.216827392578,
-        "y": 2156,
-        "z": "d1eceead.adafe",
+        "x": 4659.216796875,
+        "y": 1617.0001220703125,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "35d3101c.ddb4c",
-                "768c39b6.117ae"
+                "303b1a28.56bd56",
+                "6dd697d7.ade42"
             ]
         ]
     },
     {
-        "id": "670f0182.9fd968",
+        "id": "f4e9d00a.c60c9",
         "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": 5221.216827392578,
-        "y": 2159,
-        "z": "d1eceead.adafe",
+        "x": 5247.216796875,
+        "y": 1620.0001220703125,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "4e714dda.e8064c",
-                "6d43e638.f020f8",
-                "33cdbe70.d704f2"
+                "af18531c.f561e8",
+                "6d4f9387.cdc244",
+                "7f999aa.ecc8a64"
             ]
         ]
     },
     {
-        "id": "9bab22e5.a35978",
+        "id": "6e464f44.674b68",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5015.216827392578,
-        "y": 2225,
-        "z": "d1eceead.adafe",
+        "x": 5041.216796875,
+        "y": 1686.0001220703125,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "3c5a22cd.c5b5a6"
+                "c6202cfd.8bcb4"
             ]
         ]
     },
     {
-        "id": "768c39b6.117ae",
+        "id": "6dd697d7.ade42",
         "type": "outcome",
         "name": "network-resource",
         "xml": "<outcome value='network-resource'>",
         "comments": "",
         "outputs": 1,
-        "x": 4838.216827392578,
-        "y": 2233,
-        "z": "d1eceead.adafe",
+        "x": 4864.216796875,
+        "y": 1694.0001220703125,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "9bab22e5.a35978"
+                "6e464f44.674b68"
             ]
         ]
     },
     {
-        "id": "6cbb0705.4a3c5",
+        "id": "5fcf484f.8e6e78",
         "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": 5251.216827392578,
-        "y": 2107,
-        "z": "d1eceead.adafe",
+        "x": 5277.216796875,
+        "y": 1568.0001220703125,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "3c5a22cd.c5b5a6",
+        "id": "c6202cfd.8bcb4",
         "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": 5250.216827392578,
-        "y": 2349,
-        "z": "d1eceead.adafe",
+        "x": 5254.216796875,
+        "y": 1752.0001220703125,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "4e714dda.e8064c",
+        "id": "af18531c.f561e8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5431.216827392578,
-        "y": 2150,
-        "z": "d1eceead.adafe",
+        "x": 5457.216796875,
+        "y": 1611.0001220703125,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "c3b341d5.27524"
+                "5e16aade.ea368c"
             ]
         ]
     },
     {
-        "id": "6d43e638.f020f8",
+        "id": "6d4f9387.cdc244",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5423.216827392578,
-        "y": 2205,
-        "z": "d1eceead.adafe",
+        "x": 5449.216796875,
+        "y": 1666.0001220703125,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "5319e635.03496"
+                "77d34b30.5fb23c"
             ]
         ]
     },
     {
-        "id": "33cdbe70.d704f2",
+        "id": "7f999aa.ecc8a64",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5428.216827392578,
-        "y": 2262,
-        "z": "d1eceead.adafe",
+        "x": 5454.216796875,
+        "y": 1723.0001220703125,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "bf85165f.b30b4"
+                "674c6f5c.5f0f88"
             ]
         ]
     },
     {
-        "id": "bf85165f.b30b4",
+        "id": "674c6f5c.5f0f88",
         "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": 5580.216827392578,
-        "y": 2263,
-        "z": "d1eceead.adafe",
+        "x": 5606.216796875,
+        "y": 1724.0001220703125,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "5319e635.03496",
+        "id": "77d34b30.5fb23c",
         "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": 5591.216827392578,
-        "y": 2208,
-        "z": "d1eceead.adafe",
+        "x": 5617.216796875,
+        "y": 1669.0001220703125,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "c3b341d5.27524",
+        "id": "5e16aade.ea368c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5575.599151611328,
-        "y": 2147.6556701660156,
-        "z": "d1eceead.adafe",
+        "x": 5601.59912109375,
+        "y": 1608.6557922363281,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "5a4d43b1.7dbc0c"
+                "4cb5ebab.b25f64"
             ]
         ]
     },
     {
-        "id": "5a4d43b1.7dbc0c",
+        "id": "4cb5ebab.b25f64",
         "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": 5790.216827392578,
-        "y": 2144,
-        "z": "d1eceead.adafe",
+        "x": 5816.216796875,
+        "y": 1605.0001220703125,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "83634982.62f32",
+        "id": "5fd92a3e.ed6fec",
         "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": 3288.883331298828,
-        "y": 1754,
-        "z": "d1eceead.adafe",
-        "wires": []
-    },
-    {
-        "id": "51304efd.d01998",
-        "type": "comment",
-        "name": "This is it (should be)",
-        "info": "",
-        "comments": "",
-        "x": 4510.883331298828,
-        "y": 1037,
-        "z": "d1eceead.adafe",
-        "wires": []
-    },
-    {
-        "id": "8cad1e9f.c00c5",
-        "type": "comment",
-        "name": "This is it (should be)",
-        "info": "",
-        "comments": "",
-        "x": 4502.883331298828,
-        "y": 1127,
-        "z": "d1eceead.adafe",
+        "x": 3314.88330078125,
+        "y": 1475,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "a78c5989.f5207",
+        "id": "4a864e6a.471e",
         "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": 3269.883331298828,
-        "y": 2610,
-        "z": "d1eceead.adafe",
+        "x": 3301.88330078125,
+        "y": 1995.0001220703125,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "5f144ff2.8e6388",
-        "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 = $prop.connectivity-domainA-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.LEAF.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.LEAF.uni-p-interface-long`\" />",
-        "comments": "",
-        "outputs": 1,
-        "x": 3401.883331298828,
-        "y": 1860,
-        "z": "d1eceead.adafe",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "f39161b8.c95518",
-        "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-p-interface-short`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3308.883331298828,
-        "y": 1807,
-        "z": "d1eceead.adafe",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "8af2638e.140428",
+        "id": "cfd6a168.75b7d8",
         "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": 2426.883331298828,
-        "y": 185,
-        "z": "d1eceead.adafe",
+        "y": 188,
+        "z": "8bd89607.6248d8",
         "wires": [
             []
         ]
     },
     {
-        "id": "b2d6bb83.745318",
+        "id": "fe93cfa.921edb",
         "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": 2360.883331298828,
-        "y": 221,
-        "z": "d1eceead.adafe",
+        "y": 224,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "efb9627d.c73688",
+        "id": "85869c3a.24ed3",
         "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": 2545.883331298828,
-        "y": 148,
-        "z": "d1eceead.adafe",
+        "y": 151,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "7954d1dd.93732",
+        "id": "f5ea8856.4eb3f",
         "type": "comment",
         "name": "NOT NEEDED ANYMORE?",
         "info": "",
         "comments": "",
-        "x": 4036.883331298828,
-        "y": 1838,
-        "z": "d1eceead.adafe",
+        "x": 4072.88330078125,
+        "y": 1453,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "48007645.c6e248",
+        "id": "8e941b0d.26d14",
         "type": "comment",
         "name": "NOT NEEDED ANYMORE?",
         "info": "",
         "comments": "",
-        "x": 4014.883331298828,
-        "y": 2708,
-        "z": "d1eceead.adafe",
+        "x": 4028.883270263672,
+        "y": 1917,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "e22daf3c.82e7c8",
+        "id": "8cb68ccc.e851f8",
         "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": 3441.8837890625,
-        "y": 7480.999969482422,
-        "z": "d1eceead.adafe",
+        "y": 7483.999969482422,
+        "z": "8bd89607.6248d8",
         "wires": [
             []
         ]
     },
     {
-        "id": "ba2fa114.256608",
+        "id": "80d49243.ddf01",
         "type": "comment",
         "name": "START OF DELETE OPERATION",
         "info": "",
         "comments": "",
-        "x": 3288.88330078125,
-        "y": 2939.999969482422,
-        "z": "d1eceead.adafe",
+        "x": 3296.88330078125,
+        "y": 2476.999969482422,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "cea904e8.518f5",
+        "id": "8f2ca941.64e03",
         "type": "save",
         "name": "delete LEAF uni resource in AAI",
         "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3874.566650390625,
-        "y": 3129.400115966797,
-        "z": "d1eceead.adafe",
+        "x": 3880.566650390625,
+        "y": 2578.4000854492188,
+        "z": "8bd89607.6248d8",
         "wires": [
             []
         ]
     },
     {
-        "id": "8c6f82a5.234d18",
+        "id": "afaae138.bb9798",
         "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": 3245.566650390625,
-        "y": 3059.400115966797,
-        "z": "d1eceead.adafe",
+        "x": 3251.566650390625,
+        "y": 2558.4000854492188,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "980e282b.21ebf",
-                "62337ab9.8b1c5c",
-                "ac27f627.a68b4"
+                "661c06cc.3908b",
+                "1ca1166.e689c6a",
+                "b5955cba.954b1"
             ]
         ]
     },
     {
-        "id": "62337ab9.8b1c5c",
+        "id": "1ca1166.e689c6a",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3473.0576171875,
-        "y": 3031.974090576172,
-        "z": "d1eceead.adafe",
+        "x": 3479.0576171875,
+        "y": 2530.9740600585938,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "a4aab25a.3920c"
+                "e6c36b4a.f9b0a8"
             ]
         ]
     },
     {
-        "id": "ac27f627.a68b4",
+        "id": "b5955cba.954b1",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3468.566650390625,
-        "y": 3076.4000549316406,
-        "z": "d1eceead.adafe",
+        "x": 3474.566650390625,
+        "y": 2575.4000244140625,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "98b8996.e5a3fe8"
+                "9464bc90.391b5"
             ]
         ]
     },
     {
-        "id": "a4aab25a.3920c",
+        "id": "e6c36b4a.f9b0a8",
         "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": 3635.629150390625,
-        "y": 3031.259796142578,
-        "z": "d1eceead.adafe",
+        "x": 3641.629150390625,
+        "y": 2530.259765625,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "98b8996.e5a3fe8",
+        "id": "9464bc90.391b5",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3636.566650390625,
-        "y": 3076.4000549316406,
-        "z": "d1eceead.adafe",
+        "x": 3642.566650390625,
+        "y": 2575.4000244140625,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "980e282b.21ebf",
+        "id": "661c06cc.3908b",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3480.566650390625,
-        "y": 3126.400115966797,
-        "z": "d1eceead.adafe",
+        "x": 3486.566650390625,
+        "y": 2625.4000854492188,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "50a09dc8.f07414"
+                "8055efb.5ed0c9"
             ]
         ]
     },
     {
-        "id": "50a09dc8.f07414",
+        "id": "8055efb.5ed0c9",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 3632.88330078125,
-        "y": 3129.999969482422,
-        "z": "d1eceead.adafe",
+        "x": 3638.88330078125,
+        "y": 2628.9999389648438,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "839bae2a.5eaff8",
-                "cea904e8.518f5",
-                "8b478b6f.069ff8"
+                "2d855333.ba947c",
+                "8f2ca941.64e03",
+                "7724024e.bb32ec",
+                "b98aea07.4499"
             ]
         ]
     },
     {
-        "id": "839bae2a.5eaff8",
+        "id": "2d855333.ba947c",
         "type": "set",
         "name": "set bwToBeDecreased tpid cvlan",
         "xml": "<set>\n<parameter name='bwToBeDecreased' value=\"`$tmp.aai.leafuni.data-source`\" />\n<parameter name='tpid' value='`$tmp.aai.leafuni.tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.leafuni.cvlan`' />\n\n\n",
         "comments": "",
-        "x": 3877.566650390625,
-        "y": 3072.400115966797,
-        "z": "d1eceead.adafe",
+        "x": 3883.566650390625,
+        "y": 2521.4000854492188,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "5a01c9ff.aa79b8",
+        "id": "a9e99fa6.0d7b7",
         "type": "comment",
         "name": "Update ROOT UNI's bw",
         "info": "",
         "comments": "",
-        "x": 3833.566650390625,
-        "y": 3235.199920654297,
-        "z": "d1eceead.adafe",
+        "x": 3845.566650390625,
+        "y": 2632.199951171875,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "e327e4d5.a4e2b",
+        "id": "d2355b29.347a7",
         "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": 4435.566650390625,
-        "y": 3340.199920654297,
-        "z": "d1eceead.adafe",
+        "x": 4523.566650390625,
+        "y": 2675.199951171875,
+        "z": "8bd89607.6248d8",
         "wires": [
             []
         ]
     },
     {
-        "id": "8b478b6f.069ff8",
+        "id": "7724024e.bb32ec",
         "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": 3825.56640625,
-        "y": 3281.199920654297,
-        "z": "d1eceead.adafe",
+        "x": 3837.56640625,
+        "y": 2678.199951171875,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "b9a017aa.207728",
-                "1cc16855.ddb44",
-                "cca9f79e.b7e85"
+                "7f7b7065.dfb0f",
+                "18f5411.3947abf",
+                "5fedf83d.ca31e8"
             ]
         ]
     },
     {
-        "id": "1cc16855.ddb44",
+        "id": "18f5411.3947abf",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4053.057373046875,
-        "y": 3253.773895263672,
-        "z": "d1eceead.adafe",
+        "x": 4141.057373046875,
+        "y": 2588.77392578125,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "dd7a8720.93a36"
+                "58e0cfbb.eeb22"
             ]
         ]
     },
     {
-        "id": "cca9f79e.b7e85",
+        "id": "5fedf83d.ca31e8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4048.56640625,
-        "y": 3298.1998596191406,
-        "z": "d1eceead.adafe",
+        "x": 4136.56640625,
+        "y": 2633.1998901367188,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "bfa4184f.a70f18"
+                "9a2aec0d.d77f58"
             ]
         ]
     },
     {
-        "id": "dd7a8720.93a36",
+        "id": "58e0cfbb.eeb22",
         "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": 4215.62890625,
-        "y": 3253.059600830078,
-        "z": "d1eceead.adafe",
+        "x": 4303.62890625,
+        "y": 2588.0596313476562,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "bfa4184f.a70f18",
+        "id": "9a2aec0d.d77f58",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 4216.56640625,
-        "y": 3298.1998596191406,
-        "z": "d1eceead.adafe",
+        "x": 4304.56640625,
+        "y": 2633.1998901367188,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "51dfcdd2.a7dd1c",
+        "id": "2175339a.46dd54",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4213.56640625,
-        "y": 3348.199920654297,
-        "z": "d1eceead.adafe",
+        "x": 4301.56640625,
+        "y": 2683.199951171875,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "f4f7b843.eb2a48",
-                "e327e4d5.a4e2b"
+                "9319905e.cf01b",
+                "d2355b29.347a7"
             ]
         ]
     },
     {
-        "id": "b9a017aa.207728",
+        "id": "7f7b7065.dfb0f",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4044.56640625,
-        "y": 3348.199920654297,
-        "z": "d1eceead.adafe",
+        "x": 4132.56640625,
+        "y": 2683.199951171875,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "51dfcdd2.a7dd1c"
+                "2175339a.46dd54"
             ]
         ]
     },
     {
-        "id": "f4f7b843.eb2a48",
+        "id": "9319905e.cf01b",
         "type": "set",
         "name": "set new bw",
         "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.rootuni.data-source - $bwToBeDecreased`' />\n",
         "comments": "",
-        "x": 4395.567138671875,
-        "y": 3290.199920654297,
-        "z": "d1eceead.adafe",
+        "x": 4483.567138671875,
+        "y": 2625.199951171875,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "7302cb88.8e6284",
+        "id": "c9164c42.75d5f8",
         "type": "comment",
         "name": "Delete LEAF UNI",
         "info": "",
         "comments": "",
-        "x": 3825.88330078125,
-        "y": 3013.999969482422,
-        "z": "d1eceead.adafe",
+        "x": 3831.88330078125,
+        "y": 2462.9999389648438,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "5b4e5a5d.18c714",
+        "id": "82a9b10f.cbf938",
         "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": 3311.749969482422,
-        "y": 3792.6000366210938,
-        "z": "d1eceead.adafe",
+        "y": 3795.6000366210938,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "a7a1bb48.b43ec8",
+        "id": "9a0ba695.c13258",
         "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": 3444.749969482422,
-        "y": 3840.6000366210938,
-        "z": "d1eceead.adafe",
+        "y": 3843.6000366210938,
+        "z": "8bd89607.6248d8",
         "wires": [
             []
         ]
     },
     {
-        "id": "7b0989f8.4cdbd",
+        "id": "a14834df.662a8",
         "type": "switchNode",
         "name": "switch found-connectivity?",
         "xml": "\n<switch test=\"`$found-connectivity`\">\n\n",
         "comments": "",
         "outputs": 1,
         "x": 3266.749969482422,
-        "y": 3892.4000854492188,
-        "z": "d1eceead.adafe",
+        "y": 3895.4000854492188,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "723122ee.60b394",
-                "1f79397f.9ef707"
+                "b9a4b0ad.78d9e8",
+                "49168449.b48e54"
             ]
         ]
     },
     {
-        "id": "723122ee.60b394",
+        "id": "b9a4b0ad.78d9e8",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3459.749969482422,
-        "y": 3893.4000854492188,
-        "z": "d1eceead.adafe",
+        "y": 3896.4000854492188,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "fc2d1c85.b4eee"
+                "c7d731c2.8648d8"
             ]
         ]
     },
     {
-        "id": "fc2d1c85.b4eee",
+        "id": "c7d731c2.8648d8",
         "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": 3603.749969482422,
-        "y": 3889.6000366210938,
-        "z": "d1eceead.adafe",
+        "y": 3892.6000366210938,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "1f79397f.9ef707",
+        "id": "49168449.b48e54",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3463.749969482422,
-        "y": 3937.4000854492188,
-        "z": "d1eceead.adafe",
+        "y": 3940.4000854492188,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "6275f59c.0890b4"
+                "2b5fde97.f226ea"
             ]
         ]
     },
     {
-        "id": "6275f59c.0890b4",
+        "id": "2b5fde97.f226ea",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
@@ -3767,165 +3643,165 @@
         "comments": "",
         "outputs": 1,
         "x": 3602.749969482422,
-        "y": 3932.4000854492188,
-        "z": "d1eceead.adafe",
+        "y": 3935.4000854492188,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "810f11d9.c59a7",
-                "852c933b.a9e98",
-                "dd94c766.3611e8"
+                "6c8d251.aa4085c",
+                "1d93d9c1.b4dc36",
+                "2f3e9082.a03f"
             ]
         ]
     },
     {
-        "id": "810f11d9.c59a7",
+        "id": "6c8d251.aa4085c",
         "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": 3853.149627685547,
-        "y": 3940.9166870117188,
-        "z": "d1eceead.adafe",
+        "y": 3943.9166870117188,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "4f7025f7.9e0214"
+                "8f03c967.45f27"
             ]
         ]
     },
     {
-        "id": "4f7025f7.9e0214",
+        "id": "8f03c967.45f27",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.the-connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4075.149627685547,
-        "y": 3918.9166870117188,
-        "z": "d1eceead.adafe",
+        "y": 3921.9166870117188,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "c1dfdbf7.de4f68"
+                "3959f0cf.96f36"
             ]
         ]
     },
     {
-        "id": "c1dfdbf7.de4f68",
+        "id": "3959f0cf.96f36",
         "type": "outcome",
         "name": "uni",
         "xml": "<outcome value='uni'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4235.149139404297,
-        "y": 3898.9166870117188,
-        "z": "d1eceead.adafe",
+        "y": 3901.9166870117188,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "811e3163.5710b"
+                "1414f243.3459be"
             ]
         ]
     },
     {
-        "id": "7642582a.7718e8",
+        "id": "80ad8584.1bf2c8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 4388.149658203125,
-        "y": 3879.916717529297,
-        "z": "d1eceead.adafe",
+        "y": 3882.916717529297,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "b019880c.9753e",
-                "f61cef0c.bbc238"
+                "dbcbba23.eadbb",
+                "2ba6b637.902e82"
             ]
         ]
     },
     {
-        "id": "b019880c.9753e",
+        "id": "dbcbba23.eadbb",
         "type": "set",
         "name": "set tmp.stillHasUni to TRUE",
         "xml": "<set>\n<parameter name='tmp.stillHasUni' value='true' />\n",
         "comments": "",
         "x": 4584.649871826172,
-        "y": 3847.9999389648438,
-        "z": "d1eceead.adafe",
+        "y": 3850.9999389648438,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "852c933b.a9e98",
+        "id": "1d93d9c1.b4dc36",
         "type": "set",
         "name": "set tmp.stillHasUn tmp.keepVPNBs to FALSE",
         "xml": "<set>\n<parameter name='tmp.stillHasUni' value='false' />\n<parameter name='tmp.keepVPNBs' value='false' />\n",
         "comments": "",
         "x": 3959.64990234375,
-        "y": 3859.999969482422,
-        "z": "d1eceead.adafe",
+        "y": 3862.999969482422,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "dd94c766.3611e8",
+        "id": "2f3e9082.a03f",
         "type": "switchNode",
         "name": "switch tmp.keepVPNBs?",
         "xml": "\n<switch test=\"`$tmp.keepVPNBs`\">\n\n",
         "comments": "",
         "outputs": 1,
         "x": 3767.64990234375,
-        "y": 4281.000213623047,
-        "z": "d1eceead.adafe",
+        "y": 4284.000213623047,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "73d16500.5c0ae4",
-                "d3a70ceb.c50b78"
+                "f5f9b41d.cada7",
+                "3f4fef24.6df1a"
             ]
         ]
     },
     {
-        "id": "f61cef0c.bbc238",
+        "id": "2ba6b637.902e82",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
         "x": 4552.88330078125,
-        "y": 3915.999969482422,
-        "z": "d1eceead.adafe",
+        "y": 3918.999969482422,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "d3a70ceb.c50b78",
+        "id": "3f4fef24.6df1a",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
         "x": 154.65066528320312,
-        "y": 5345.000457763672,
-        "z": "d1eceead.adafe",
+        "y": 5348.000457763672,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "4a51985e.972e68"
+                "16d898b2.82d4af"
             ]
         ]
     },
     {
-        "id": "73d16500.5c0ae4",
+        "id": "f5f9b41d.cada7",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3988.650634765625,
-        "y": 4383.000213623047,
-        "z": "d1eceead.adafe",
+        "y": 4386.000213623047,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "25f72ad2.47990e"
+                "26c73a8d.4562be"
             ]
         ]
     },
     {
-        "id": "25f72ad2.47990e",
+        "id": "26c73a8d.4562be",
         "type": "block",
         "name": "block",
         "xml": "<block>",
@@ -3933,208 +3809,209 @@
         "comments": "",
         "outputs": 1,
         "x": 4131.650634765625,
-        "y": 4379.000213623047,
-        "z": "d1eceead.adafe",
+        "y": 4382.000213623047,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "6e8bafff.64fc88",
-                "dcf23a76.fb4f5",
-                "f889b68d.197d9",
-                "69806916.62139",
-                "32064458.33cdf4",
-                "9c7a66fb.560d48",
-                "2b19eccb.73cf0c",
-                "987f769f.1ba7f8"
+                "e9909468.33151",
+                "efe71d55.9caa78",
+                "21b48e5f.bc8462",
+                "55b631d2.803a38",
+                "a2022ff9.9bc538",
+                "702c8bba.ca32ac",
+                "e084df79.80ceb8",
+                "624968c9.f15538",
+                "abf74f44.8bd74"
             ]
         ]
     },
     {
-        "id": "316316fc.4e3ac2",
+        "id": "4355739e.98f0ec",
         "type": "comment",
         "name": "keepVPNBs == false, then check tmp.stillHasUni",
         "info": "(2) keepVPNBs == false, means there are no other UNIs in this\nsame domain and same connectivity that share the same OLT node.\n\ncheck if tmp.stillHasUni is True or False?\n\nif TRUE --> means this domain (connectivity) still has other UNIs\n- delete VPNBs\n- delete LEAF UNI in AAI -- DONE\n- upadte bw in ROOT UNI -- DONE\n- delete LEAF UNI in LEAF ethernet service PNC\n- change ROOT conn status to Modified\n--- mark LEAF connectivity as Modified because the underlay OTN tunnel list of this connectivity is now different\n\nif FALSE --> means this domain (connectivity) has no other UNIs\n\nif MMstillHasUni == TRUE, means scenario (3), else, means scenario (4)\n\n(3) & (4) both:\n- delete VPNBs\n- delete LEAF connectivity\n- delete LEAF Ethernet Service from PNC\n\n(3) only:\n- change ROOT conn status to Modified\n- Keep the middle-man-conn and DON'T delete\n\n(4) only:\n- delete ROOT UNI\n- delete ROOT conn from AAI\n- delete ROOT Ethernet Service from PNC\n- delete middle-man-conn from AAI\n\n",
         "comments": "",
         "x": 181,
-        "y": 5301.000457763672,
-        "z": "d1eceead.adafe",
+        "y": 5304.000457763672,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "32c3f6b1.304972",
+        "id": "4da2ca0c.4a8b84",
         "type": "comment",
         "name": "There are still other UNIs in this connectivity that share same OLT node. Only update bw of the vpn-bindings involved",
         "info": "(1) keepVPNBs == true, means there are still other UNIs in this\nsame domain and same connectivity that share the same OLT node.\n\n- Only update bw of the vpn-bindings involved -- DONE\n- upadte bw in ROOT UNI -- DONE\n- change ROOT conn status to Modified -- DONE\n- delete LEAF UNI in AAI -- DONE\n- delete LEAF UNI in LEAF ethernet service PNC -- DONE\n- DON'T delete the connectivities of LEAF and ROOT -- DONE\nAlso update the ethernet services",
         "comments": "",
         "x": 4007.884033203125,
-        "y": 4346.000213623047,
-        "z": "d1eceead.adafe",
+        "y": 4349.000213623047,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "7adbe8ea.ad8838",
+        "id": "9b3df18d.6f724",
         "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": 4820.667724609375,
-        "y": 4536.783660888672,
-        "z": "d1eceead.adafe",
+        "y": 4539.783660888672,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "ee3b3067.d425a8",
+        "id": "84df48a4.4e5358",
         "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": 5165.667724609375,
-        "y": 4398.783660888672,
-        "z": "d1eceead.adafe",
+        "y": 4401.783660888672,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "76f6067d.796678"
+                "cfc0c818.79fe68"
             ]
         ]
     },
     {
-        "id": "fc93f53c.f481d",
+        "id": "10190e03.34bba2",
         "type": "for",
         "name": "for netwidx..allNetworksList_length",
         "xml": "<for index='netwidx' start='0' end='`$allNetworksList.network-resource_length`' >",
         "comments": "",
         "outputs": 1,
         "x": 4872.667724609375,
-        "y": 4392.783660888672,
-        "z": "d1eceead.adafe",
+        "y": 4395.783660888672,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "ee3b3067.d425a8"
+                "84df48a4.4e5358"
             ]
         ]
     },
     {
-        "id": "3f4440b0.d66f8",
+        "id": "1796601b.dbfbf",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5127.667724609375,
-        "y": 4349.783660888672,
-        "z": "d1eceead.adafe",
+        "y": 4352.783660888672,
+        "z": "8bd89607.6248d8",
         "wires": [
             []
         ]
     },
     {
-        "id": "27f65669.8e0af2",
+        "id": "4871207.ade70e",
         "type": "set",
         "name": "unset parameters",
         "xml": "<set>\n<parameter name='tmp.pce-src-node.' value='' />\n",
         "comments": "",
         "x": 4816.667724609375,
-        "y": 4444.783660888672,
-        "z": "d1eceead.adafe",
+        "y": 4447.783660888672,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "410c70eb.214758",
+        "id": "fe8bfdbc.e310b8",
         "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": 4824.667724609375,
-        "y": 4489.783660888672,
-        "z": "d1eceead.adafe",
+        "y": 4492.783660888672,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "e258b42d.2c46d8",
+        "id": "ed94bc94.c3085",
         "type": "set",
         "name": "unset otnTopoIdSrc",
         "xml": "<set>\n<parameter name='otnTopoIdSrc' value='' />\n",
         "comments": "",
         "x": 4821.667724609375,
-        "y": 4342.783660888672,
-        "z": "d1eceead.adafe",
+        "y": 4345.783660888672,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "76f6067d.796678",
+        "id": "cfc0c818.79fe68",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5074.667724609375,
-        "y": 4466.783660888672,
-        "z": "d1eceead.adafe",
+        "y": 4469.783660888672,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "acca9da1.cc4618"
+                "3784b6ea.dad97a"
             ]
         ]
     },
     {
-        "id": "acca9da1.cc4618",
+        "id": "3784b6ea.dad97a",
         "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": 5259.667724609375,
-        "y": 4465.783660888672,
-        "z": "d1eceead.adafe",
+        "y": 4468.783660888672,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "f448b4f8.c120e"
+                "6ba573fe.abd33c"
             ]
         ]
     },
     {
-        "id": "f448b4f8.c120e",
+        "id": "6ba573fe.abd33c",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5451.667724609375,
-        "y": 4468.783660888672,
-        "z": "d1eceead.adafe",
+        "y": 4471.783660888672,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "19985725.a5eca1"
+                "a8101530.41669"
             ]
         ]
     },
     {
-        "id": "19985725.a5eca1",
+        "id": "a8101530.41669",
         "type": "set",
         "name": "set otnTopoIdSrc",
         "xml": "<set>\n<parameter name='otnTopoIdSrc' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />\n",
         "comments": "",
         "x": 5623.667724609375,
-        "y": 4464.783660888672,
-        "z": "d1eceead.adafe",
+        "y": 4467.783660888672,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "ab4edace.9f77f",
+        "id": "3a63decd.7b4cb2",
         "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": 4999.667724609375,
-        "y": 4579.783660888672,
-        "z": "d1eceead.adafe",
+        "y": 4582.783660888672,
+        "z": "8bd89607.6248d8",
         "wires": [
             []
         ]
     },
     {
-        "id": "6e8bafff.64fc88",
+        "id": "e9909468.33151",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -4142,232 +4019,232 @@
         "comments": "",
         "outputs": 1,
         "x": 4516.667724609375,
-        "y": 4364.783660888672,
-        "z": "d1eceead.adafe",
+        "y": 4367.783660888672,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "30c992c8.4db58e",
-                "c2728b20.458338",
-                "27f65669.8e0af2",
-                "410c70eb.214758",
-                "7adbe8ea.ad8838",
-                "fc93f53c.f481d",
-                "ab4edace.9f77f"
+                "9c834ddf.7b5a8",
+                "1b5b7b9f.240eac",
+                "4871207.ade70e",
+                "fe8bfdbc.e310b8",
+                "9b3df18d.6f724",
+                "10190e03.34bba2",
+                "3a63decd.7b4cb2"
             ]
         ]
     },
     {
-        "id": "2e6e6c8a.c892fc",
+        "id": "5418760e.ea421",
         "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": 4501.667724609375,
-        "y": 4298.783660888672,
-        "z": "d1eceead.adafe",
+        "y": 4301.783660888672,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "c2728b20.458338",
+        "id": "1b5b7b9f.240eac",
         "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": 4880.667724609375,
-        "y": 4285.783660888672,
-        "z": "d1eceead.adafe",
+        "y": 4288.783660888672,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "cd41e347.c8a4d",
-                "5bcb3237.45bf24",
-                "3f4440b0.d66f8"
+                "cdc8c3cd.7743d8",
+                "829501cc.19a87",
+                "1796601b.dbfbf"
             ]
         ]
     },
     {
-        "id": "cd41e347.c8a4d",
+        "id": "cdc8c3cd.7743d8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5116.667724609375,
-        "y": 4268.783660888672,
-        "z": "d1eceead.adafe",
+        "y": 4271.783660888672,
+        "z": "8bd89607.6248d8",
         "wires": [
             []
         ]
     },
     {
-        "id": "5bcb3237.45bf24",
+        "id": "829501cc.19a87",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5113.667724609375,
-        "y": 4309.783660888672,
-        "z": "d1eceead.adafe",
+        "y": 4312.783660888672,
+        "z": "8bd89607.6248d8",
         "wires": [
             []
         ]
     },
     {
-        "id": "30c992c8.4db58e",
+        "id": "9c834ddf.7b5a8",
         "type": "set",
         "name": "unset parameters",
         "xml": "<set>\n<parameter name='allNetworksList.' value='' />\n",
         "comments": "",
         "x": 4829.667724609375,
-        "y": 4242.783660888672,
-        "z": "d1eceead.adafe",
+        "y": 4245.783660888672,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "dcf23a76.fb4f5",
+        "id": "efe71d55.9caa78",
         "type": "set",
         "name": "unset tmp.aai.all-vpn-bindings",
         "xml": "<set>\n<parameter name='tmp.aai.all-vpn-bindings.' value='' />\n",
         "comments": "",
         "x": 4336.667724609375,
-        "y": 4697.183563232422,
-        "z": "d1eceead.adafe",
+        "y": 4700.183563232422,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "f549a24.b4e97e",
+        "id": "429a4c62.ec5bdc",
         "type": "comment",
         "name": "find all OTNs that have srcTtpOtnLayer and decrease their bandwidth",
         "info": "",
         "comments": "",
         "x": 4459.968017578125,
-        "y": 4736.183563232422,
-        "z": "d1eceead.adafe",
+        "y": 4739.183563232422,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "f889b68d.197d9",
+        "id": "21b48e5f.bc8462",
         "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": 4357.968017578125,
-        "y": 4771.183563232422,
-        "z": "d1eceead.adafe",
+        "y": 4774.183563232422,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "f7fe6bc0.f9d1a8",
-                "b939c13a.bd148",
-                "63930841.13965"
+                "a823d247.f64a98",
+                "36823aa3.4d18a6",
+                "eb8482c0.2d4878"
             ]
         ]
     },
     {
-        "id": "f7fe6bc0.f9d1a8",
+        "id": "a823d247.f64a98",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4562.968017578125,
-        "y": 4768.183563232422,
-        "z": "d1eceead.adafe",
+        "y": 4771.183563232422,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "85787fa.a0f0d8"
+                "8498bebb.23bf48"
             ]
         ]
     },
     {
-        "id": "b939c13a.bd148",
+        "id": "36823aa3.4d18a6",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4546.458984375,
-        "y": 4829.757598876953,
-        "z": "d1eceead.adafe",
+        "y": 4832.757598876953,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "c496c4d4.109c78"
+                "386b7921.748fb6"
             ]
         ]
     },
     {
-        "id": "63930841.13965",
+        "id": "eb8482c0.2d4878",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4543.968017578125,
-        "y": 4873.183563232422,
-        "z": "d1eceead.adafe",
+        "y": 4876.183563232422,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "bb1ebaa9.c2fac"
+                "134c42f5.f94555"
             ]
         ]
     },
     {
-        "id": "85787fa.a0f0d8",
+        "id": "8498bebb.23bf48",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 4730.96826171875,
-        "y": 4763.183563232422,
-        "z": "d1eceead.adafe",
+        "y": 4766.183563232422,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "6a7a29b4.6659c"
+                "6b12d916.16568"
             ]
         ]
     },
     {
-        "id": "c496c4d4.109c78",
+        "id": "386b7921.748fb6",
         "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": 4709.0303955078125,
-        "y": 4830.0433349609375,
-        "z": "d1eceead.adafe",
+        "y": 4833.0433349609375,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "bb1ebaa9.c2fac",
+        "id": "134c42f5.f94555",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
         "x": 4710.968017578125,
-        "y": 4872.183563232422,
-        "z": "d1eceead.adafe",
+        "y": 4875.183563232422,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "6a7a29b4.6659c",
+        "id": "6b12d916.16568",
         "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": 4968.96826171875,
-        "y": 4768.183563232422,
-        "z": "d1eceead.adafe",
+        "y": 4771.183563232422,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "2e12f618.b174b2"
+                "cfa150d4.94ff28"
             ]
         ]
     },
     {
-        "id": "2e12f618.b174b2",
+        "id": "cfa150d4.94ff28",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
@@ -4375,74 +4252,74 @@
         "comments": "",
         "outputs": 1,
         "x": 5202.968017578125,
-        "y": 4775.183563232422,
-        "z": "d1eceead.adafe",
+        "y": 4778.183563232422,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "1b37b556.addac3"
+                "e4eccca9.9724c8"
             ]
         ]
     },
     {
-        "id": "3df57bb4.1a97cc",
+        "id": "dd4e0e04.50655",
         "type": "comment",
         "name": "find all OTNs that have srcTtpOtnLayer and increase their bandwidth",
         "info": "",
         "comments": "",
         "x": 5119.783935546875,
-        "y": 4846.349884033203,
-        "z": "d1eceead.adafe",
+        "y": 4849.349884033203,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "1b37b556.addac3",
+        "id": "e4eccca9.9724c8",
         "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": 5063.783935546875,
-        "y": 4895.349884033203,
-        "z": "d1eceead.adafe",
+        "y": 4898.349884033203,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "c62dd674.fd73f",
-                "37627bf2.c03934"
+                "7056a1ab.16f5c8",
+                "9ff2677.5b72918"
             ]
         ]
     },
     {
-        "id": "37627bf2.c03934",
+        "id": "9ff2677.5b72918",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5306.784423828125,
-        "y": 4936.349395751953,
-        "z": "d1eceead.adafe",
+        "y": 4939.349395751953,
+        "z": "8bd89607.6248d8",
         "wires": [
             []
         ]
     },
     {
-        "id": "c62dd674.fd73f",
+        "id": "7056a1ab.16f5c8",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5317.7841796875,
-        "y": 4893.349609375,
-        "z": "d1eceead.adafe",
+        "y": 4896.349609375,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "b2c9765c.25999"
+                "2f2661a7.5dc1e6"
             ]
         ]
     },
     {
-        "id": "a5ecb13c.9c7548",
+        "id": "a26e073.3ca98f8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
@@ -4450,213 +4327,213 @@
         "comments": "",
         "outputs": 1,
         "x": 5544.767578125,
-        "y": 4900.76611328125,
-        "z": "d1eceead.adafe",
+        "y": 4903.76611328125,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "78a5ede3.09cc54",
-                "aecf8872.1d5c4",
-                "657d43b1.13c254"
+                "ff1ba77c.30ef7",
+                "6cee0088.2f0908",
+                "acf1096d.49e23"
             ]
         ]
     },
     {
-        "id": "9d348107.818aa",
+        "id": "6e1088cb.02b348",
         "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": 5709.8173828125,
-        "y": 4785.766571044922,
-        "z": "d1eceead.adafe",
+        "y": 4788.766571044922,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "99f28c5d.95abe8"
+                "28fa48d0.c1f11"
             ]
         ]
     },
     {
-        "id": "99f28c5d.95abe8",
+        "id": "28fa48d0.c1f11",
         "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": 5901.8173828125,
-        "y": 4774.766815185547,
-        "z": "d1eceead.adafe",
+        "y": 4777.766815185547,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "9a75bdf9.10641"
+                "794e0693.bafff"
             ]
         ]
     },
     {
-        "id": "78a5ede3.09cc54",
+        "id": "ff1ba77c.30ef7",
         "type": "set",
         "name": "unset tmp.aai.the-vpn-binding",
         "xml": "<set>\n<parameter name='tmp.aai.the-vpn-binding.' value=\"\" />\n",
         "comments": "",
         "x": 5658.334228515625,
-        "y": 4675.983612060547,
-        "z": "d1eceead.adafe",
+        "y": 4678.983612060547,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "aecf8872.1d5c4",
+        "id": "6cee0088.2f0908",
         "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": 5650.334228515625,
-        "y": 4724.983612060547,
-        "z": "d1eceead.adafe",
+        "y": 4727.983612060547,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "657d43b1.13c254",
+        "id": "acf1096d.49e23",
         "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 - $bwToBeDecreased`' />\n<parameter name='operational-status' value='Modified' />\n",
         "comments": "",
         "outputs": 1,
         "x": 5881.751220703125,
-        "y": 4906.149627685547,
-        "z": "d1eceead.adafe",
+        "y": 4909.149627685547,
+        "z": "8bd89607.6248d8",
         "wires": [
             []
         ]
     },
     {
-        "id": "f1c96228.a5339",
+        "id": "7591a9e8.920d7",
         "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": 5833.401123046875,
-        "y": 4953.466522216797,
-        "z": "d1eceead.adafe",
+        "y": 4956.466522216797,
+        "z": "8bd89607.6248d8",
         "wires": [
             []
         ]
     },
     {
-        "id": "75d6304c.089cd8",
+        "id": "20c2cafd.4f2b6e",
         "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": 5905.751220703125,
-        "y": 4867.149627685547,
-        "z": "d1eceead.adafe",
+        "y": 4870.149627685547,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "9a75bdf9.10641",
+        "id": "794e0693.bafff",
         "type": "outcome",
         "name": "connectivity",
         "xml": "<outcome value='connectivity'>\n",
         "comments": "",
         "outputs": 1,
         "x": 6083.8173828125,
-        "y": 4753.766815185547,
-        "z": "d1eceead.adafe",
+        "y": 4756.766815185547,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "b5ad886.81af5f8"
+                "cb67e673.c3b218"
             ]
         ]
     },
     {
-        "id": "b5ad886.81af5f8",
+        "id": "cb67e673.c3b218",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 6245.8173828125,
-        "y": 4742.766815185547,
-        "z": "d1eceead.adafe",
+        "y": 4745.766815185547,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "6f94f7eb.f4d818",
-                "269fac18.2bb21c"
+                "28efce3c.031a02",
+                "a7f7a502.452a7"
             ]
         ]
     },
     {
-        "id": "6f94f7eb.f4d818",
+        "id": "28efce3c.031a02",
         "type": "set",
         "name": "unset tmp.the-connectivity",
         "xml": "<set>\n<parameter name='tmp.the-connectivity.' value='' />\n",
         "comments": "",
         "x": 6442.8173828125,
-        "y": 4671.766815185547,
-        "z": "d1eceead.adafe",
+        "y": 4674.766815185547,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "269fac18.2bb21c",
+        "id": "a7f7a502.452a7",
         "type": "set",
         "name": "set tmp.the-connectivity",
         "xml": "<set>\n<parameter name='tmp.the-connectivity.' value='`$tmp.aai.the-vpn-binding.relationship-list.relationship[$vpnbridx].relationship-data[0].relationship-value`' />\n",
         "comments": "",
         "x": 6440.2841796875,
-        "y": 4770.983612060547,
-        "z": "d1eceead.adafe",
+        "y": 4773.983612060547,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "a984d0c7.8574d",
+        "id": "121ba89c.f4d387",
         "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": 3097.800048828125,
-        "y": 3229.800018310547,
-        "z": "d1eceead.adafe",
+        "y": 3232.800018310547,
+        "z": "8bd89607.6248d8",
         "wires": [
             []
         ]
     },
     {
-        "id": "49347bae.3e2974",
+        "id": "e7a924f9.c6032",
         "type": "switchNode",
         "name": "switch found-middle-man?",
         "xml": "<switch test='`$found-middle-man`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2974.800048828125,
-        "y": 3339.800018310547,
-        "z": "d1eceead.adafe",
+        "y": 3342.800018310547,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "7b835f88.3b076",
-                "7490c0ec.4dda5"
+                "a8ce787f.7ca8b8",
+                "dab4cfcf.e3306"
             ]
         ]
     },
     {
-        "id": "7b835f88.3b076",
+        "id": "a8ce787f.7ca8b8",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3158.800048828125,
-        "y": 3318.800018310547,
-        "z": "d1eceead.adafe",
+        "y": 3321.800018310547,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "5b141b7a.8f28f4"
+                "3ed4168e.db435a"
             ]
         ]
     },
     {
-        "id": "5b141b7a.8f28f4",
+        "id": "3ed4168e.db435a",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
@@ -4664,43 +4541,43 @@
         "comments": "",
         "outputs": 1,
         "x": 3301.800048828125,
-        "y": 3318.800018310547,
-        "z": "d1eceead.adafe",
+        "y": 3321.800018310547,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "94596646.a7e4f"
+                "d46982de.a36698"
             ]
         ]
     },
     {
-        "id": "94596646.a7e4f",
+        "id": "d46982de.a36698",
         "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": 3477.800048828125,
-        "y": 3316.800018310547,
-        "z": "d1eceead.adafe",
+        "y": 3319.800018310547,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "7490c0ec.4dda5",
+        "id": "dab4cfcf.e3306",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3156.800048828125,
-        "y": 3373.800018310547,
-        "z": "d1eceead.adafe",
+        "y": 3376.800018310547,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "a3855d70.dbb87"
+                "55aae2f8.8a15b4"
             ]
         ]
     },
     {
-        "id": "a3855d70.dbb87",
+        "id": "55aae2f8.8a15b4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
@@ -4708,216 +4585,216 @@
         "comments": "",
         "outputs": 1,
         "x": 3003.800048828125,
-        "y": 3506.800018310547,
-        "z": "d1eceead.adafe",
+        "y": 3509.800018310547,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "5b4e5a5d.18c714",
-                "a7a1bb48.b43ec8",
-                "7b0989f8.4cdbd",
-                "b98b1ba5.429c1",
-                "37657916.72f08e",
-                "cc0c619e.32de58"
+                "82a9b10f.cbf938",
+                "9a0ba695.c13258",
+                "a14834df.662a8",
+                "87bd7501.49bf18",
+                "4331a4c2.0089dc",
+                "b9e9be73.6c3be"
             ]
         ]
     },
     {
-        "id": "a5a62e88.7d802",
+        "id": "6411a3c0.06e7c4",
         "type": "comment",
         "name": "Find LEAF connectivity",
         "info": "",
         "comments": "",
         "x": 3225.88330078125,
-        "y": 3746.999969482422,
-        "z": "d1eceead.adafe",
+        "y": 3749.999969482422,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "b98b1ba5.429c1",
+        "id": "87bd7501.49bf18",
         "type": "set",
         "name": "set tmp.MMstillHasUni to FALSE",
         "xml": "<set>\n<parameter name='tmp.MMstillHasUni' value='false' />\n",
         "comments": "",
         "x": 3308.333251953125,
-        "y": 3519.800018310547,
-        "z": "d1eceead.adafe",
+        "y": 3522.800018310547,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "37657916.72f08e",
+        "id": "4331a4c2.0089dc",
         "type": "for",
         "name": "for each relationship of middle-man-conn",
         "xml": "<for silentFailure='true' index='cridx' start='0' end='`$middle-man-conn.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
         "x": 3306.8330078125,
-        "y": 3565.716766357422,
-        "z": "d1eceead.adafe",
+        "y": 3568.716766357422,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "1a4c3937.32a93f"
+                "3cfcd803.984ff"
             ]
         ]
     },
     {
-        "id": "1a4c3937.32a93f",
+        "id": "3cfcd803.984ff",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$middle-man-conn.relationship-list.relationship[$cridx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3569.8330078125,
-        "y": 3560.716766357422,
-        "z": "d1eceead.adafe",
+        "y": 3563.716766357422,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "95d80a37.7eef5"
+                "19e3fea0.d430a9"
             ]
         ]
     },
     {
-        "id": "95d80a37.7eef5",
+        "id": "19e3fea0.d430a9",
         "type": "outcome",
         "name": "uni",
         "xml": "<outcome value='uni'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3729.83251953125,
-        "y": 3540.716766357422,
-        "z": "d1eceead.adafe",
+        "y": 3543.716766357422,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "9608373.19689c8"
+                "cc595a48.1912e8"
             ]
         ]
     },
     {
-        "id": "d9ea756c.06e5e",
+        "id": "db4c40a7.875698",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4498.833740234375,
-        "y": 3575.716766357422,
-        "z": "d1eceead.adafe",
+        "x": 5066.834228515625,
+        "y": 3574.716796875,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "29278691.db117a",
-                "29bad35d.650d14",
-                "a6af6c62.1a6b5"
+                "7118b227.f4c97c",
+                "642017c6.da5f18",
+                "d7647a1a.599238"
             ]
         ]
     },
     {
-        "id": "29278691.db117a",
+        "id": "7118b227.f4c97c",
         "type": "set",
         "name": "set tmp.MMstillHasUni to TRUE",
         "xml": "<set>\n<parameter name='tmp.MMstillHasUni' value='true' />\n",
         "comments": "",
-        "x": 4738.334228515625,
-        "y": 3524.800018310547,
-        "z": "d1eceead.adafe",
+        "x": 5306.334716796875,
+        "y": 3523.800048828125,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "29bad35d.650d14",
+        "id": "642017c6.da5f18",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 4671.567657470703,
-        "y": 3597.800048828125,
-        "z": "d1eceead.adafe",
+        "x": 5239.568145751953,
+        "y": 3596.800079345703,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "4465f9ec.e3dbb",
+        "id": "d96806ce.d6ba3",
         "type": "comment",
         "name": "Find LEAF and ROOT connectivities and remove UNI from PNC",
         "info": "",
         "comments": "",
         "x": 4432.88427734375,
-        "y": 5128.000213623047,
-        "z": "d1eceead.adafe",
+        "y": 5131.000213623047,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "69806916.62139",
+        "id": "55b631d2.803a38",
         "type": "set",
         "name": "set tmp.leafconn.",
         "xml": "<set>\n<parameter name='tmp.leafconn.' value='`$tmp.the-connectivity.`' />\n",
         "comments": "",
         "x": 4331.317138671875,
-        "y": 5179.916717529297,
-        "z": "d1eceead.adafe",
+        "y": 5182.916717529297,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "2b19eccb.73cf0c",
+        "id": "e084df79.80ceb8",
         "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": 4482.317138671875,
-        "y": 5622.916717529297,
-        "z": "d1eceead.adafe",
+        "y": 5625.916717529297,
+        "z": "8bd89607.6248d8",
         "wires": [
             []
         ]
     },
     {
-        "id": "987f769f.1ba7f8",
+        "id": "624968c9.f15538",
         "type": "switchNode",
         "name": "switch found-root-connectivity",
         "xml": "\n<switch test=\"`$found-root-connectivity`\">\n\n",
         "comments": "",
         "outputs": 1,
         "x": 4297.317138671875,
-        "y": 5689.916717529297,
-        "z": "d1eceead.adafe",
+        "y": 5692.916717529297,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "c7979e94.4deb18",
-                "5e8c956f.69a854"
+                "3ebbf801.286498",
+                "76ebd92f.1642a"
             ]
         ]
     },
     {
-        "id": "c7979e94.4deb18",
+        "id": "3ebbf801.286498",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4562.317138671875,
-        "y": 5674.916717529297,
-        "z": "d1eceead.adafe",
+        "y": 5677.916717529297,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "4a28d2a5.936924"
+                "37d1d73c.eecfd"
             ]
         ]
     },
     {
-        "id": "5e8c956f.69a854",
+        "id": "76ebd92f.1642a",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4558.317138671875,
-        "y": 5722.916717529297,
-        "z": "d1eceead.adafe",
+        "y": 5725.916717529297,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "213fbf95.d03c8"
+                "199fe1ad.b53f66"
             ]
         ]
     },
     {
-        "id": "4a28d2a5.936924",
+        "id": "37d1d73c.eecfd",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
@@ -4925,116 +4802,116 @@
         "comments": "",
         "outputs": 1,
         "x": 4718.317138671875,
-        "y": 5670.916717529297,
-        "z": "d1eceead.adafe",
+        "y": 5673.916717529297,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "a96c5a1a.d66bf"
+                "31a9971.ad96268"
             ]
         ]
     },
     {
-        "id": "213fbf95.d03c8",
+        "id": "199fe1ad.b53f66",
         "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": 4706.317138671875,
-        "y": 5717.916717529297,
-        "z": "d1eceead.adafe",
+        "y": 5720.916717529297,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "4e8315f.b9446ec",
+        "id": "802c1097.dcd94",
         "type": "set",
         "name": "set tmp.rootconn.",
         "xml": "<set>\n<parameter name='tmp.rootconn.' value=\"`$tmp.aai.ROOT.connectivity.`\" />\n\n\n",
         "comments": "",
         "x": 5138.3173828125,
-        "y": 5612.916717529297,
-        "z": "d1eceead.adafe",
+        "y": 5615.916717529297,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "aa7d5d8.eb8bca",
+        "id": "8e64de53.2c9fe8",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.domain.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.leafconn.access-provider-id + '-clientId-' +\n                                                   $tmp.leafconn.access-client-id + '-topologyId-' +\n                                                   $tmp.leafconn.access-topology-id + '-nodeId-' +\n                                                   $tmp.leafconn.access-node-id`\" />\n",
         "comments": "",
         "x": 4540.734130859375,
-        "y": 5209.200408935547,
-        "z": "d1eceead.adafe",
+        "y": 5212.200408935547,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "32064458.33cdf4",
+        "id": "a2022ff9.9bc538",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 4311.734130859375,
-        "y": 5298.200408935547,
-        "z": "d1eceead.adafe",
+        "y": 5301.200408935547,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "aa7d5d8.eb8bca",
-                "3165c974.539e06"
+                "8e64de53.2c9fe8",
+                "2a874f25.a11e68"
             ]
         ]
     },
     {
-        "id": "3165c974.539e06",
+        "id": "2a874f25.a11e68",
         "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.domain.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
         "x": 4547.734130859375,
-        "y": 5291.200408935547,
-        "z": "d1eceead.adafe",
+        "y": 5294.200408935547,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "4cddcbba.102194",
-                "d5cd17da.64e6a",
-                "9d33157c.077f3"
+                "42e4546b.7efc04",
+                "8902c91a.a1454",
+                "2a8da0f.130cae"
             ]
         ]
     },
     {
-        "id": "4cddcbba.102194",
+        "id": "42e4546b.7efc04",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4743.2342529296875,
-        "y": 5243.200408935547,
-        "z": "d1eceead.adafe",
+        "y": 5246.200408935547,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "658952ec.d50f2c"
+                "374d8.3341eb28c"
             ]
         ]
     },
     {
-        "id": "d5cd17da.64e6a",
+        "id": "8902c91a.a1454",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4735.2342529296875,
-        "y": 5298.200408935547,
-        "z": "d1eceead.adafe",
+        "y": 5301.200408935547,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "f87d3f72.db25b"
+                "1ff3bcec.a42b9b"
             ]
         ]
     },
     {
-        "id": "658952ec.d50f2c",
+        "id": "374d8.3341eb28c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -5042,219 +4919,219 @@
         "comments": "",
         "outputs": 1,
         "x": 4887.6165771484375,
-        "y": 5242.8560791015625,
-        "z": "d1eceead.adafe",
+        "y": 5245.8560791015625,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "5e03d50d.e31174"
+                "ec0686db.c1a878"
             ]
         ]
     },
     {
-        "id": "5e03d50d.e31174",
+        "id": "ec0686db.c1a878",
         "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": 5071.734130859375,
-        "y": 5241.200408935547,
-        "z": "d1eceead.adafe",
+        "y": 5244.200408935547,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "81fcac6e.c2cbb"
+                "d4462e32.3100d8"
             ]
         ]
     },
     {
-        "id": "81fcac6e.c2cbb",
+        "id": "d4462e32.3100d8",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5266.734130859375,
-        "y": 5241.200408935547,
-        "z": "d1eceead.adafe",
+        "y": 5244.200408935547,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "23740bd0.c54174"
+                "3a9e0096.e3a448"
             ]
         ]
     },
     {
-        "id": "9d33157c.077f3",
+        "id": "2a8da0f.130cae",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4740.2342529296875,
-        "y": 5355.200408935547,
-        "z": "d1eceead.adafe",
+        "y": 5358.200408935547,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "d477847d.474a8"
+                "17a678b2.952aef"
             ]
         ]
     },
     {
-        "id": "d477847d.474a8",
+        "id": "17a678b2.952aef",
         "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": 4892.2342529296875,
-        "y": 5356.200408935547,
-        "z": "d1eceead.adafe",
+        "y": 5359.200408935547,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "f87d3f72.db25b",
+        "id": "1ff3bcec.a42b9b",
         "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": 4903.2342529296875,
-        "y": 5299.200408935547,
-        "z": "d1eceead.adafe",
+        "y": 5302.200408935547,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "e3023af7.680d7",
+        "id": "318d00c4.ca52c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 5648.734130859375,
-        "y": 5245.200408935547,
-        "z": "d1eceead.adafe",
+        "y": 5248.200408935547,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "31c1897e.fbb116",
-                "b906e4f7.66368",
-                "ac0e0ca2.883cb"
+                "46db4a25.4363a4",
+                "34953acc.5d5dc6",
+                "9de681b9.d85948"
             ]
         ]
     },
     {
-        "id": "23740bd0.c54174",
+        "id": "3a9e0096.e3a448",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5469.734130859375,
-        "y": 5245.200408935547,
-        "z": "d1eceead.adafe",
+        "y": 5248.200408935547,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "e3023af7.680d7"
+                "318d00c4.ca52c"
             ]
         ]
     },
     {
-        "id": "b906e4f7.66368",
+        "id": "34953acc.5d5dc6",
         "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.domain.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domain.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
         "x": 5854.734130859375,
-        "y": 5258.200408935547,
-        "z": "d1eceead.adafe",
+        "y": 5261.200408935547,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "df7977a7.075b8",
-                "f17bde95.882498",
-                "61e2d23e.358d1c"
+                "a1306b3e.752188",
+                "af1e227.d98756",
+                "c7dc9a0c.c1a12"
             ]
         ]
     },
     {
-        "id": "31c1897e.fbb116",
+        "id": "46db4a25.4363a4",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domain id",
         "xml": "<set>\n<parameter name='tmp.domain.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
         "x": 5884.734130859375,
-        "y": 5206.200408935547,
-        "z": "d1eceead.adafe",
+        "y": 5209.200408935547,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "df7977a7.075b8",
+        "id": "a1306b3e.752188",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 6064.734130859375,
-        "y": 5249.200408935547,
-        "z": "d1eceead.adafe",
+        "y": 5252.200408935547,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "7ac6fe75.62b4e"
+                "c17f0a30.28a8c"
             ]
         ]
     },
     {
-        "id": "f17bde95.882498",
+        "id": "af1e227.d98756",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 6056.734130859375,
-        "y": 5304.200408935547,
-        "z": "d1eceead.adafe",
+        "y": 5307.200408935547,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "671c9934.2cd48"
+                "f59cff5b.1a7268"
             ]
         ]
     },
     {
-        "id": "61e2d23e.358d1c",
+        "id": "c7dc9a0c.c1a12",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
         "x": 6061.734130859375,
-        "y": 5361.200408935547,
-        "z": "d1eceead.adafe",
+        "y": 5364.200408935547,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "a6615570.50c968"
+                "18fa3a10.34d806"
             ]
         ]
     },
     {
-        "id": "a6615570.50c968",
+        "id": "18fa3a10.34d806",
         "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": 6213.734130859375,
-        "y": 5362.200408935547,
-        "z": "d1eceead.adafe",
+        "y": 5365.200408935547,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "671c9934.2cd48",
+        "id": "f59cff5b.1a7268",
         "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": 6224.734130859375,
-        "y": 5307.200408935547,
-        "z": "d1eceead.adafe",
+        "y": 5310.200408935547,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "7ac6fe75.62b4e",
+        "id": "c17f0a30.28a8c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -5262,82 +5139,82 @@
         "comments": "",
         "outputs": 1,
         "x": 6209.116455078125,
-        "y": 5246.8560791015625,
-        "z": "d1eceead.adafe",
+        "y": 5249.8560791015625,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "6989c737.25d068"
+                "7a04be69.78c07"
             ]
         ]
     },
     {
-        "id": "6989c737.25d068",
+        "id": "7a04be69.78c07",
         "type": "set",
         "name": "set controller domain data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.url' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.user' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.password' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
         "comments": "",
         "x": 6423.734130859375,
-        "y": 5243.200408935547,
-        "z": "d1eceead.adafe",
+        "y": 5246.200408935547,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "ac0e0ca2.883cb",
+        "id": "9de681b9.d85948",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
         "x": 5804.734130859375,
-        "y": 5322.200408935547,
-        "z": "d1eceead.adafe",
+        "y": 5325.200408935547,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "9c7a66fb.560d48",
+        "id": "702c8bba.ca32ac",
         "type": "execute",
         "name": "execute RestApiCallNode Delete LEAF UNI of ethernet Service without token",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.leafconn.etht-svc-name + '/etht-svc-end-points=' + $tmp.LEAF.uni-p-interface-long`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<!--<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",
         "comments": "",
         "outputs": 1,
         "x": 4453.234375,
-        "y": 5402.800018310547,
-        "z": "d1eceead.adafe",
+        "y": 5405.800018310547,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "1e28e096.7499f7",
-                "cc9e5694.f9d17"
+                "b53a2357.cb19f",
+                "1f266f6e.997129"
             ]
         ]
     },
     {
-        "id": "1e28e096.7499f7",
+        "id": "b53a2357.cb19f",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4813.734130859375,
-        "y": 5410.800018310547,
-        "z": "d1eceead.adafe",
+        "y": 5413.800018310547,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "906e379.3b93848"
+                "1f814603.8b079a"
             ]
         ]
     },
     {
-        "id": "906e379.3b93848",
+        "id": "1f814603.8b079a",
         "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 delete ethernet service rest api\" />\n",
         "comments": "",
         "x": 4971.734130859375,
-        "y": 5410.800018310547,
-        "z": "d1eceead.adafe",
+        "y": 5413.800018310547,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "90be5ca9.028288",
+        "id": "3ef4bb2e.ea4704",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
@@ -5345,97 +5222,97 @@
         "comments": "",
         "outputs": 1,
         "x": 4975.234130859375,
-        "y": 5450.800018310547,
-        "z": "d1eceead.adafe",
+        "y": 5453.800018310547,
+        "z": "8bd89607.6248d8",
         "wires": [
             []
         ]
     },
     {
-        "id": "cc9e5694.f9d17",
+        "id": "1f266f6e.997129",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4817.734130859375,
-        "y": 5450.800018310547,
-        "z": "d1eceead.adafe",
+        "y": 5453.800018310547,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "90be5ca9.028288"
+                "3ef4bb2e.ea4704"
             ]
         ]
     },
     {
-        "id": "921095c8.3bc23",
+        "id": "4cb994af.f28aac",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 5126.451171875,
-        "y": 5664.800018310547,
-        "z": "d1eceead.adafe",
+        "y": 5667.800018310547,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "fb4f4697.4dc5f",
-                "7ea31674.99e1d8"
+                "37db8c04.dcc65c",
+                "e00788f7.d2c01"
             ]
         ]
     },
     {
-        "id": "7ea31674.99e1d8",
+        "id": "e00788f7.d2c01",
         "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.domain.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
         "x": 5368.450927734375,
-        "y": 5614.800018310547,
-        "z": "d1eceead.adafe",
+        "y": 5617.800018310547,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "10743e5b.0b6182",
-                "5598183a.212ab",
-                "9c9074e9.bbaff8"
+                "bd67e663.b6cc68",
+                "6a96c9e9.f60f08",
+                "24f63010.71743"
             ]
         ]
     },
     {
-        "id": "10743e5b.0b6182",
+        "id": "bd67e663.b6cc68",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5563.951171875,
-        "y": 5548.800018310547,
-        "z": "d1eceead.adafe",
+        "y": 5551.800018310547,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "767943d2.64a144"
+                "9c952b2f.2e4c48"
             ]
         ]
     },
     {
-        "id": "5598183a.212ab",
+        "id": "6a96c9e9.f60f08",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5559.951171875,
-        "y": 5604.800018310547,
-        "z": "d1eceead.adafe",
+        "y": 5607.800018310547,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "74a77564.40268c"
+                "72760d9d.ebda64"
             ]
         ]
     },
     {
-        "id": "767943d2.64a144",
+        "id": "9c952b2f.2e4c48",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -5443,114 +5320,114 @@
         "comments": "",
         "outputs": 1,
         "x": 5708.3333740234375,
-        "y": 5566.4556884765625,
-        "z": "d1eceead.adafe",
+        "y": 5569.4556884765625,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "10049f5.85364e1"
+                "27765347.4a6a3c"
             ]
         ]
     },
     {
-        "id": "10049f5.85364e1",
+        "id": "27765347.4a6a3c",
         "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": 5892.450927734375,
-        "y": 5564.800018310547,
-        "z": "d1eceead.adafe",
+        "y": 5567.800018310547,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "72e5612b.857e68"
+                "cd6a7530.d2bb8"
             ]
         ]
     },
     {
-        "id": "9c9074e9.bbaff8",
+        "id": "24f63010.71743",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5569.951171875,
-        "y": 5649.800018310547,
-        "z": "d1eceead.adafe",
+        "y": 5652.800018310547,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "952a99b1.f3f0e"
+                "a1473e64.1f4fc8"
             ]
         ]
     },
     {
-        "id": "952a99b1.f3f0e",
+        "id": "a1473e64.1f4fc8",
         "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": 5748.951171875,
-        "y": 5665.800018310547,
-        "z": "d1eceead.adafe",
+        "y": 5668.800018310547,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "74a77564.40268c",
+        "id": "72760d9d.ebda64",
         "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": 5730.951171875,
-        "y": 5617.800018310547,
-        "z": "d1eceead.adafe",
+        "y": 5620.800018310547,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "f64c3a10.6bbc38",
+        "id": "b65e14dd.2b2b98",
         "type": "execute",
         "name": "execute RestApiCallNode Delete UNI of ethernet Service without token",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.rootconn.etht-svc-name + '/etht-svc-end-points=' + $tmp.ROOT.uni-p-interface-long`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<!--<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",
         "comments": "",
         "outputs": 1,
         "x": 5279.951171875,
-        "y": 5720.399627685547,
-        "z": "d1eceead.adafe",
+        "y": 5723.399627685547,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "cd722628.03685",
-                "76458c1b.1a62ac"
+                "f4d26e19.4a33a",
+                "2b318383.32132c"
             ]
         ]
     },
     {
-        "id": "cd722628.03685",
+        "id": "f4d26e19.4a33a",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5628.451171875,
-        "y": 5702.399627685547,
-        "z": "d1eceead.adafe",
+        "y": 5705.399627685547,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "d04dd9dc.2f2dc8"
+                "cc266f68.3170a8"
             ]
         ]
     },
     {
-        "id": "d04dd9dc.2f2dc8",
+        "id": "cc266f68.3170a8",
         "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 delete ethernet service rest api\" />\n",
         "comments": "",
         "x": 5884.451171875,
-        "y": 5705.399627685547,
-        "z": "d1eceead.adafe",
+        "y": 5708.399627685547,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "1006a530.30b813",
+        "id": "e9302632.da2fb8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
@@ -5558,190 +5435,190 @@
         "comments": "",
         "outputs": 1,
         "x": 5836.951171875,
-        "y": 5746.399627685547,
-        "z": "d1eceead.adafe",
+        "y": 5749.399627685547,
+        "z": "8bd89607.6248d8",
         "wires": [
             []
         ]
     },
     {
-        "id": "76458c1b.1a62ac",
+        "id": "2b318383.32132c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5638.451171875,
-        "y": 5751.399627685547,
-        "z": "d1eceead.adafe",
+        "y": 5754.399627685547,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "1006a530.30b813"
+                "e9302632.da2fb8"
             ]
         ]
     },
     {
-        "id": "fb4f4697.4dc5f",
+        "id": "37db8c04.dcc65c",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.domain.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.rootconn.access-provider-id + '-clientId-' +\n                                                   $tmp.rootconn.access-client-id + '-topologyId-' +\n                                                   $tmp.rootconn.access-topology-id + '-nodeId-' +\n                                                   $tmp.rootconn.access-node-id`\" />\n",
         "comments": "",
         "x": 5361.450927734375,
-        "y": 5532.800018310547,
-        "z": "d1eceead.adafe",
+        "y": 5535.800018310547,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "72e5612b.857e68",
+        "id": "cd6a7530.d2bb8",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 6087.450927734375,
-        "y": 5564.800018310547,
-        "z": "d1eceead.adafe",
+        "y": 5567.800018310547,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "3625dda5.38707a"
+                "40d39185.b5e49"
             ]
         ]
     },
     {
-        "id": "402ab8f9.3aa18",
+        "id": "96e4f3b6.f5cd5",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 6469.450927734375,
-        "y": 5568.800018310547,
-        "z": "d1eceead.adafe",
+        "y": 5571.800018310547,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "4697e13e.13b02",
-                "6c3ba6ac.e7c21",
-                "34e0c57a.0e712a"
+                "4ecdd233.2c761c",
+                "4b4d74a7.6aa104",
+                "563a66cd.e07e68"
             ]
         ]
     },
     {
-        "id": "3625dda5.38707a",
+        "id": "40d39185.b5e49",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
         "x": 6290.450927734375,
-        "y": 5568.800018310547,
-        "z": "d1eceead.adafe",
+        "y": 5571.800018310547,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "402ab8f9.3aa18"
+                "96e4f3b6.f5cd5"
             ]
         ]
     },
     {
-        "id": "6c3ba6ac.e7c21",
+        "id": "4b4d74a7.6aa104",
         "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.domain.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domain.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
         "x": 6675.450927734375,
-        "y": 5581.800018310547,
-        "z": "d1eceead.adafe",
+        "y": 5584.800018310547,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "2e31a205.2611fe",
-                "c9f11bf6.38bb98",
-                "99cec3e1.6d2f68"
+                "5212e394.a625ac",
+                "8a0a8abd.557d58",
+                "fe612827.fce1d"
             ]
         ]
     },
     {
-        "id": "4697e13e.13b02",
+        "id": "4ecdd233.2c761c",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domain id",
         "xml": "<set>\n<parameter name='tmp.domain.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
         "x": 6705.450927734375,
-        "y": 5529.800018310547,
-        "z": "d1eceead.adafe",
+        "y": 5532.800018310547,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "2e31a205.2611fe",
+        "id": "5212e394.a625ac",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 6885.450927734375,
-        "y": 5572.800018310547,
-        "z": "d1eceead.adafe",
+        "y": 5575.800018310547,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "2ba283a1.e08d44"
+                "22d6ab8e.b3d594"
             ]
         ]
     },
     {
-        "id": "c9f11bf6.38bb98",
+        "id": "8a0a8abd.557d58",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 6877.450927734375,
-        "y": 5627.800018310547,
-        "z": "d1eceead.adafe",
+        "y": 5630.800018310547,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "3af9cd94.f12ff2"
+                "d2e549e.aa0e038"
             ]
         ]
     },
     {
-        "id": "99cec3e1.6d2f68",
+        "id": "fe612827.fce1d",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
         "x": 6882.450927734375,
-        "y": 5684.800018310547,
-        "z": "d1eceead.adafe",
+        "y": 5687.800018310547,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "c501098b.50507"
+                "18a7205c.94ea5"
             ]
         ]
     },
     {
-        "id": "c501098b.50507",
+        "id": "18a7205c.94ea5",
         "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": 7034.450927734375,
-        "y": 5685.800018310547,
-        "z": "d1eceead.adafe",
+        "y": 5688.800018310547,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "3af9cd94.f12ff2",
+        "id": "d2e549e.aa0e038",
         "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": 7045.450927734375,
-        "y": 5630.800018310547,
-        "z": "d1eceead.adafe",
+        "y": 5633.800018310547,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "2ba283a1.e08d44",
+        "id": "22d6ab8e.b3d594",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -5749,38 +5626,38 @@
         "comments": "",
         "outputs": 1,
         "x": 7029.833251953125,
-        "y": 5570.4556884765625,
-        "z": "d1eceead.adafe",
+        "y": 5573.4556884765625,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "bca9e0da.72619"
+                "c312e16c.c44d58"
             ]
         ]
     },
     {
-        "id": "bca9e0da.72619",
+        "id": "c312e16c.c44d58",
         "type": "set",
         "name": "set controller domain data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.url' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.user' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.password' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
         "comments": "",
         "x": 7244.450927734375,
-        "y": 5566.800018310547,
-        "z": "d1eceead.adafe",
+        "y": 5569.800018310547,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "34e0c57a.0e712a",
+        "id": "563a66cd.e07e68",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
         "x": 6625.450927734375,
-        "y": 5645.800018310547,
-        "z": "d1eceead.adafe",
+        "y": 5648.800018310547,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "9608373.19689c8",
+        "id": "cc595a48.1912e8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -5788,77 +5665,77 @@
         "comments": "",
         "outputs": 1,
         "x": 3854.88330078125,
-        "y": 3534.999969482422,
-        "z": "d1eceead.adafe",
+        "y": 3537.999969482422,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "6e45c64.2629238",
-                "354c7fc8.6d8de"
+                "eec6a040.1af03",
+                "d560f701.2c7f08"
             ]
         ]
     },
     {
-        "id": "6e45c64.2629238",
+        "id": "eec6a040.1af03",
         "type": "set",
         "name": "set tmp.mmUNI-id-long",
         "xml": "<set>\n<parameter name='tmp.mmUNI-id-long' value='`$middle-man-conn.relationship-list.relationship[$cridx].relationship-data[0].relationship-value`' />\n",
         "comments": "",
         "x": 4045.466552734375,
-        "y": 3477.800018310547,
-        "z": "d1eceead.adafe",
+        "y": 3480.800018310547,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "354c7fc8.6d8de",
+        "id": "d560f701.2c7f08",
         "type": "switchNode",
         "name": "switch tmp.mmUNI-id-long != ROOT UNI",
         "xml": "\n<switch test=\"`$tmp.mmUNI-id-long != $tmp.ROOT.uni-p-interface-long`\">\n\n",
         "comments": "",
         "outputs": 1,
         "x": 4092.466552734375,
-        "y": 3548.800018310547,
-        "z": "d1eceead.adafe",
+        "y": 3551.800018310547,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "6bdb2c16.23fc7c",
-                "5820e4e6.95b47c"
+                "70d2875.2f53ff8",
+                "b1bb56dc.337f2"
             ]
         ]
     },
     {
-        "id": "6bdb2c16.23fc7c",
+        "id": "70d2875.2f53ff8",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4330.884033203125,
-        "y": 3507.999969482422,
-        "z": "d1eceead.adafe",
+        "y": 3510.999969482422,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "d4fcba65.f8c8f"
+                "f216f825.2991a8"
             ]
         ]
     },
     {
-        "id": "5820e4e6.95b47c",
+        "id": "b1bb56dc.337f2",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4337.884246826172,
-        "y": 3564.9999389648438,
-        "z": "d1eceead.adafe",
+        "y": 3567.9999389648438,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "d9ea756c.06e5e"
+                "28b93260.26eace"
             ]
         ]
     },
     {
-        "id": "d4fcba65.f8c8f",
+        "id": "f216f825.2991a8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -5866,126 +5743,126 @@
         "comments": "",
         "outputs": 1,
         "x": 4458.884521484375,
-        "y": 3503.999969482422,
-        "z": "d1eceead.adafe",
+        "y": 3506.999969482422,
+        "z": "8bd89607.6248d8",
         "wires": [
             []
         ]
     },
     {
-        "id": "cc0c619e.32de58",
+        "id": "b9e9be73.6c3be",
         "type": "set",
         "name": "set tmp.MMonlyHasROOT to TRUE",
         "xml": "<set>\n<parameter name='tmp.MMonlyHasROOT' value='true' />\n",
         "comments": "",
         "x": 3314.083251953125,
-        "y": 3462.400115966797,
-        "z": "d1eceead.adafe",
+        "y": 3465.400115966797,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "a6af6c62.1a6b5",
+        "id": "d7647a1a.599238",
         "type": "set",
         "name": "set tmp.MMonlyHasROOT to FALSE",
         "xml": "<set>\n<parameter name='tmp.MMonlyHasROOT' value='false' />\n",
         "comments": "",
-        "x": 4727.9169921875,
-        "y": 3468.400115966797,
-        "z": "d1eceead.adafe",
+        "x": 5295.91748046875,
+        "y": 3467.400146484375,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "811e3163.5710b",
+        "id": "1414f243.3459be",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 4407.6669921875,
-        "y": 3984.616668701172,
-        "z": "d1eceead.adafe",
+        "y": 3987.616668701172,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "aa9298d8.acde8",
-                "a5e5763f.58bb2"
+                "45f92202.e9d224",
+                "9274acbb.bb64f"
             ]
         ]
     },
     {
-        "id": "aa9298d8.acde8",
+        "id": "45f92202.e9d224",
         "type": "set",
         "name": "set tmp.uni.id",
         "xml": "<set>\n<parameter name='tmp.uni.id' value='`$tmp.the-connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value`' />\n",
         "comments": "",
         "x": 4580.5498046875,
-        "y": 3980.276336669922,
-        "z": "d1eceead.adafe",
+        "y": 3983.276336669922,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "a5e5763f.58bb2",
+        "id": "9274acbb.bb64f",
         "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.uni.id\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.uni\" >\n\n",
         "comments": "",
         "outputs": 1,
         "x": 4583.5498046875,
-        "y": 4027.276336669922,
-        "z": "d1eceead.adafe",
+        "y": 4030.276336669922,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "4df6bcf4.a4f44c",
-                "89771ed8.977b78",
-                "d1de1d5b.be978"
+                "4b44a73a.87e16",
+                "13d9fc09.409024",
+                "52115c05.c8dcf4"
             ]
         ]
     },
     {
-        "id": "4df6bcf4.a4f44c",
+        "id": "4b44a73a.87e16",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4755.5498046875,
-        "y": 4011.276336669922,
-        "z": "d1eceead.adafe",
+        "y": 4014.276336669922,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "f65d0563.51b9e"
+                "40f66b99.edebbc"
             ]
         ]
     },
     {
-        "id": "89771ed8.977b78",
+        "id": "13d9fc09.409024",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4756.040771484375,
-        "y": 4056.850372314453,
-        "z": "d1eceead.adafe",
+        "y": 4059.850372314453,
+        "z": "8bd89607.6248d8",
         "wires": [
             []
         ]
     },
     {
-        "id": "d1de1d5b.be978",
+        "id": "52115c05.c8dcf4",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4756.5498046875,
-        "y": 4097.276336669922,
-        "z": "d1eceead.adafe",
+        "y": 4100.276336669922,
+        "z": "8bd89607.6248d8",
         "wires": [
             []
         ]
     },
     {
-        "id": "f65d0563.51b9e",
+        "id": "40f66b99.edebbc",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
@@ -5993,165 +5870,165 @@
         "comments": "",
         "outputs": 1,
         "x": 4916.5498046875,
-        "y": 4007.276336669922,
-        "z": "d1eceead.adafe",
+        "y": 4010.276336669922,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "41e51ce8.c7bbd4",
-                "9fcba756.d0c298",
-                "99817ef0.1be558"
+                "de7bc652.3681b8",
+                "eebe95d8.077038",
+                "efb01679.580728"
             ]
         ]
     },
     {
-        "id": "d2f62a11.bbccd",
+        "id": "f38b6801.52bee8",
         "type": "comment",
         "name": "find the node part of the uni.id (uni-tp-id-node-part)",
         "info": "",
         "comments": "",
         "x": 5249.5498046875,
-        "y": 3938.276336669922,
-        "z": "d1eceead.adafe",
+        "y": 3941.276336669922,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "9fcba756.d0c298",
+        "id": "eebe95d8.077038",
         "type": "execute",
         "name": "execute split 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-pnfName\"/>\n\n",
         "comments": "",
         "outputs": 1,
         "x": 5184.5498046875,
-        "y": 3995.276336669922,
-        "z": "d1eceead.adafe",
+        "y": 3998.276336669922,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "ad91a307.53dc18",
-                "66b6c9a.ce41eb8"
+                "20f99809.a45e68",
+                "f98fd083.5f84c"
             ]
         ]
     },
     {
-        "id": "66b6c9a.ce41eb8",
+        "id": "f98fd083.5f84c",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5407.5498046875,
-        "y": 3981.276336669922,
-        "z": "d1eceead.adafe",
+        "y": 3984.276336669922,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "f5696a58.3dcae"
+                "e9001fe4.5ec9"
             ]
         ]
     },
     {
-        "id": "ad91a307.53dc18",
+        "id": "20f99809.a45e68",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5409.5498046875,
-        "y": 4014.276336669922,
-        "z": "d1eceead.adafe",
+        "y": 4017.276336669922,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "cd5f81cd.b325a8"
+                "c4ea9853.8f7b9"
             ]
         ]
     },
     {
-        "id": "f5696a58.3dcae",
+        "id": "e9001fe4.5ec9",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 5555.5498046875,
-        "y": 3974.276336669922,
-        "z": "d1eceead.adafe",
+        "y": 3977.276336669922,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "520c18e.4c672e8"
+                "efdb6ef0.5c83c"
             ]
         ]
     },
     {
-        "id": "cd5f81cd.b325a8",
+        "id": "c4ea9853.8f7b9",
         "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": 5552.5498046875,
-        "y": 4011.276336669922,
-        "z": "d1eceead.adafe",
+        "y": 4014.276336669922,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "520c18e.4c672e8",
+        "id": "efdb6ef0.5c83c",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.uni.pnf-name' value=\"`$param-prefix-uni-pnfName[0] + '-' +\n                                                   $param-prefix-uni-pnfName[1] + '-' +\n                                                   $param-prefix-uni-pnfName[2] + '-' +\n                                                   $param-prefix-uni-pnfName[3] + '-' +\n                                                   $param-prefix-uni-pnfName[4] + '-' +\n                                                   $param-prefix-uni-pnfName[5] + '-' +\n                                                   $param-prefix-uni-pnfName[6] + '-' +\n                                                   $param-prefix-uni-pnfName[7] + '-' +\n                                                   $param-prefix-uni-pnfName[8]`\" />\n",
         "comments": "",
         "x": 5732.5498046875,
-        "y": 3974.276336669922,
-        "z": "d1eceead.adafe",
+        "y": 3977.276336669922,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "41e51ce8.c7bbd4",
+        "id": "de7bc652.3681b8",
         "type": "switchNode",
         "name": "switch uni-tp-id-node-part is the same as the LEAF node",
         "xml": "<switch test='`$tmp.uni.pnf-name == $tmp.LEAF.pnf-name-long`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5228.5498046875,
-        "y": 4129.276336669922,
-        "z": "d1eceead.adafe",
+        "y": 4132.276336669922,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "f5a5405e.ab64e8",
-                "39efe4c8.977e5c"
+                "7639ee60.41df3",
+                "7e06cc80.35387c"
             ]
         ]
     },
     {
-        "id": "f5a5405e.ab64e8",
+        "id": "7639ee60.41df3",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5509.5498046875,
-        "y": 4106.276336669922,
-        "z": "d1eceead.adafe",
+        "y": 4109.276336669922,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "76dcdb2b.58523c"
+                "d6573f78.845c78"
             ]
         ]
     },
     {
-        "id": "39efe4c8.977e5c",
+        "id": "7e06cc80.35387c",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5502.5498046875,
-        "y": 4165.276336669922,
-        "z": "d1eceead.adafe",
+        "y": 4168.276336669922,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "e34b9d00.f34da8"
+                "14bc3378.1253a5"
             ]
         ]
     },
     {
-        "id": "76dcdb2b.58523c",
+        "id": "d6573f78.845c78",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -6159,14 +6036,14 @@
         "comments": "",
         "outputs": 1,
         "x": 5639.5498046875,
-        "y": 4110.276336669922,
-        "z": "d1eceead.adafe",
+        "y": 4113.276336669922,
+        "z": "8bd89607.6248d8",
         "wires": [
             []
         ]
     },
     {
-        "id": "e34b9d00.f34da8",
+        "id": "14bc3378.1253a5",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
@@ -6174,276 +6051,276 @@
         "comments": "",
         "outputs": 1,
         "x": 5644.5498046875,
-        "y": 4164.276336669922,
-        "z": "d1eceead.adafe",
+        "y": 4167.276336669922,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "d870e573.0525d",
-                "daec44c5.c4ca2"
+                "f0b195ca.19df6",
+                "fec7cdec.3f23"
             ]
         ]
     },
     {
-        "id": "d870e573.0525d",
+        "id": "f0b195ca.19df6",
         "type": "set",
         "name": "set no-pce-call",
         "xml": "<set>\n<parameter name='no-pce-call' value=\"true\" />\n",
         "comments": "",
         "x": 5836.5498046875,
-        "y": 4131.276336669922,
-        "z": "d1eceead.adafe",
+        "y": 4134.276336669922,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "77e6d570.0136ec",
+        "id": "14cfe3f0.60188c",
         "type": "set",
         "name": "set middle-man-conn",
         "xml": "<set>\n<parameter name='middle-man-conn.' value='`$tmp.aai.all-connectivities.connectivity[$connidx].`' />\n",
         "comments": "",
         "x": 5852.5498046875,
-        "y": 4183.276336669922,
-        "z": "d1eceead.adafe",
+        "y": 4186.276336669922,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "daec44c5.c4ca2",
+        "id": "fec7cdec.3f23",
         "type": "set",
         "name": "set tmp.stillHasUni and tmp.keepVPNBs to TRUE",
         "xml": "<set>\n<parameter name='tmp.stillHasUni' value='true' />\n<parameter name='tmp.keepVPNBs' value='true' />\n",
         "comments": "",
         "x": 5870.83349609375,
-        "y": 4252.866668701172,
-        "z": "d1eceead.adafe",
+        "y": 4255.866668701172,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "99817ef0.1be558",
+        "id": "efb01679.580728",
         "type": "set",
         "name": "set tmp.stillHasUni to TRUE",
         "xml": "<set>\n<parameter name='tmp.stillHasUni' value='true' />\n",
         "comments": "",
         "x": 5147.533203125,
-        "y": 4078.766571044922,
-        "z": "d1eceead.adafe",
+        "y": 4081.766571044922,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "4a51985e.972e68",
+        "id": "16d898b2.82d4af",
         "type": "switchNode",
         "name": "switch tmp.stillHasUni?",
         "xml": "\n<switch test=\"`$tmp.stillHasUni`\">\n\n",
         "comments": "",
         "outputs": 1,
         "x": 383.7339172363281,
-        "y": 5348.966278076172,
-        "z": "d1eceead.adafe",
+        "y": 5351.966278076172,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "35e41a11.58bd1e",
-                "8fea1632.f2d7a"
+                "2ef37de6.fb696a",
+                "d4b46a3b.e544d"
             ]
         ]
     },
     {
-        "id": "2a89b0c9.686c5",
+        "id": "bb7a24ed.4756b",
         "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": 4288.516357421875,
-        "y": 5512.850067138672,
-        "z": "d1eceead.adafe",
+        "y": 5515.850067138672,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "11eb64db.01f3fb",
-                "edc304ba.5ec56",
-                "e3707812.01b138"
+                "b93cd05c.18e338",
+                "28c478b5.8c3cf",
+                "ad4069fd.35ec2"
             ]
         ]
     },
     {
-        "id": "8fd56902.a16fd8",
+        "id": "cd789bfb.94ca8",
         "type": "comment",
         "name": "Update ROOT UNI's bw -- ALREADY DONE",
         "info": "",
         "comments": "",
         "x": 4286.516845703125,
-        "y": 5464.850311279297,
-        "z": "d1eceead.adafe",
+        "y": 5467.850311279297,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "fe5a805b.6befb8",
+        "id": "f7d2d4f8.f1e648",
         "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": 4903.5166015625,
-        "y": 5582.850311279297,
-        "z": "d1eceead.adafe",
+        "y": 5585.850311279297,
+        "z": "8bd89607.6248d8",
         "wires": [
             []
         ]
     },
     {
-        "id": "edc304ba.5ec56",
+        "id": "28c478b5.8c3cf",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4506.007568359375,
-        "y": 5483.424285888672,
-        "z": "d1eceead.adafe",
+        "y": 5486.424285888672,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "d06cf255.10cad"
+                "4927866f.a84e1"
             ]
         ]
     },
     {
-        "id": "e3707812.01b138",
+        "id": "ad4069fd.35ec2",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4501.5166015625,
-        "y": 5527.850250244141,
-        "z": "d1eceead.adafe",
+        "y": 5530.850250244141,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "c2ada4d7.cf23a"
+                "c4a31719.674e"
             ]
         ]
     },
     {
-        "id": "d06cf255.10cad",
+        "id": "4927866f.a84e1",
         "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": 4668.5791015625,
-        "y": 5482.709991455078,
-        "z": "d1eceead.adafe",
+        "y": 5485.709991455078,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "c2ada4d7.cf23a",
+        "id": "c4a31719.674e",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
         "x": 4669.5166015625,
-        "y": 5527.850250244141,
-        "z": "d1eceead.adafe",
+        "y": 5530.850250244141,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "487370c3.c16b7",
+        "id": "f08cda49.ab7188",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 4666.5166015625,
-        "y": 5577.850311279297,
-        "z": "d1eceead.adafe",
+        "y": 5580.850311279297,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "6c262f9d.59d16",
-                "fe5a805b.6befb8"
+                "ed324322.59277",
+                "f7d2d4f8.f1e648"
             ]
         ]
     },
     {
-        "id": "11eb64db.01f3fb",
+        "id": "b93cd05c.18e338",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4497.5166015625,
-        "y": 5577.850311279297,
-        "z": "d1eceead.adafe",
+        "y": 5580.850311279297,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "487370c3.c16b7"
+                "f08cda49.ab7188"
             ]
         ]
     },
     {
-        "id": "6c262f9d.59d16",
+        "id": "ed324322.59277",
         "type": "set",
         "name": "set new bw",
         "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.rootuni.data-source - $bwToBeDecreased`' />\n",
         "comments": "",
         "x": 4859.517578125,
-        "y": 5502.850311279297,
-        "z": "d1eceead.adafe",
+        "y": 5505.850311279297,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "472764ad.0e5da4",
+        "id": "61d36925.a62e",
         "type": "comment",
         "name": "Update connectivity status to modified",
         "info": "",
         "comments": "",
         "x": 5288.216796875,
-        "y": 5440.616912841797,
-        "z": "d1eceead.adafe",
+        "y": 5443.616912841797,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "a96c5a1a.d66bf",
+        "id": "31a9971.ad96268",
         "type": "save",
         "name": "update ROOT connectivity resource in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.ROOT.connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.ROOT.connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Modified' />\n",
         "comments": "",
         "outputs": 1,
         "x": 5314,
-        "y": 5482.817108154297,
-        "z": "d1eceead.adafe",
+        "y": 5485.817108154297,
+        "z": "8bd89607.6248d8",
         "wires": [
             []
         ]
     },
     {
-        "id": "35e41a11.58bd1e",
+        "id": "2ef37de6.fb696a",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
         "x": 567.8836059570312,
-        "y": 5399.999969482422,
-        "z": "d1eceead.adafe",
+        "y": 5402.999969482422,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "49ab1cdc.2b3dfc"
+                "97fb2b7.67063d8"
             ]
         ]
     },
     {
-        "id": "8fea1632.f2d7a",
+        "id": "d4b46a3b.e544d",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
         "x": 550.883544921875,
-        "y": 5321.999969482422,
-        "z": "d1eceead.adafe",
+        "y": 5324.999969482422,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "44e1ece4.47debc"
+                "d28cabbc.30ca5"
             ]
         ]
     },
     {
-        "id": "71bd2e28.fdc428",
+        "id": "4a0919d1.fbc9d8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -6451,121 +6328,122 @@
         "comments": "",
         "outputs": 1,
         "x": 679.8833923339844,
-        "y": 4408.999694824219,
-        "z": "d1eceead.adafe",
+        "y": 4411.999694824219,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "ab47ddf.140532",
-                "d3485e4a.cbde48",
-                "964a9d6b.511ef",
-                "58993466.bcba34",
-                "b72e55ab.bc6bd8",
-                "8d45971b.519e08"
+                "551f2a9f.a9466c",
+                "6f7adb55.d0de94",
+                "7279f474.ca532c",
+                "c28774e0.0f37e8",
+                "fd804c17.d00668",
+                "6504876a.65a0e",
+                "d39caf18.6babe"
             ]
         ]
     },
     {
-        "id": "ab47ddf.140532",
+        "id": "551f2a9f.a9466c",
         "type": "set",
         "name": "set tmp.leafconn.",
         "xml": "<set>\n<parameter name='tmp.leafconn.' value='`$tmp.the-connectivity.`' />\n",
         "comments": "",
         "x": 931.5667419433594,
-        "y": 4387.049499511719,
-        "z": "d1eceead.adafe",
+        "y": 4390.049499511719,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "83fd3013.a6f008",
+        "id": "1a5de4c8.98ba3b",
         "type": "comment",
         "name": "Find LEAF and ROOT connectivities and remove UNI from PNC",
         "info": "",
         "comments": "",
         "x": 1033.1338806152344,
-        "y": 4335.132995605469,
-        "z": "d1eceead.adafe",
+        "y": 4338.132995605469,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "8b20d7ab.715e18",
+        "id": "35555086.07bd08",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.domain.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.leafconn.access-provider-id + '-clientId-' +\n                                                   $tmp.leafconn.access-client-id + '-topologyId-' +\n                                                   $tmp.leafconn.access-topology-id + '-nodeId-' +\n                                                   $tmp.leafconn.access-node-id`\" />\n",
         "comments": "",
         "x": 1140.9837341308594,
-        "y": 4416.333190917969,
-        "z": "d1eceead.adafe",
+        "y": 4419.333190917969,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "d3485e4a.cbde48",
+        "id": "6f7adb55.d0de94",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 911.9837341308594,
-        "y": 4505.333190917969,
-        "z": "d1eceead.adafe",
+        "y": 4508.333190917969,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "8b20d7ab.715e18",
-                "3ddce0eb.9cdfd8"
+                "35555086.07bd08",
+                "f6475b04.522d68"
             ]
         ]
     },
     {
-        "id": "3ddce0eb.9cdfd8",
+        "id": "f6475b04.522d68",
         "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.domain.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
         "x": 1147.9837341308594,
-        "y": 4498.333190917969,
-        "z": "d1eceead.adafe",
+        "y": 4501.333190917969,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "c4f933ed.6c6328",
-                "c8f61cf.a6fdde",
-                "31635596.d79712"
+                "d9d0b846.fc4eb",
+                "859bebef.e15268",
+                "82bf3fe2.ca776"
             ]
         ]
     },
     {
-        "id": "c4f933ed.6c6328",
+        "id": "d9d0b846.fc4eb",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1343.4838562011719,
-        "y": 4450.333190917969,
-        "z": "d1eceead.adafe",
+        "y": 4453.333190917969,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "40098ed2.4f4dd"
+                "54e66745.d0a218"
             ]
         ]
     },
     {
-        "id": "c8f61cf.a6fdde",
+        "id": "859bebef.e15268",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1335.4838562011719,
-        "y": 4505.333190917969,
-        "z": "d1eceead.adafe",
+        "y": 4508.333190917969,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "8f4995e7.00e5b8"
+                "6c2244a0.55dae4"
             ]
         ]
     },
     {
-        "id": "40098ed2.4f4dd",
+        "id": "54e66745.d0a218",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -6573,180 +6451,180 @@
         "comments": "",
         "outputs": 1,
         "x": 1487.8661804199219,
-        "y": 4449.988861083984,
-        "z": "d1eceead.adafe",
+        "y": 4452.988861083984,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "4b557dbd.14d794"
+                "c5450793.0d4ff8"
             ]
         ]
     },
     {
-        "id": "4b557dbd.14d794",
+        "id": "c5450793.0d4ff8",
         "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": 1671.9837341308594,
-        "y": 4448.333190917969,
-        "z": "d1eceead.adafe",
+        "y": 4451.333190917969,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "a0958afe.9d1b"
+                "8c14dfae.797ac"
             ]
         ]
     },
     {
-        "id": "a0958afe.9d1b",
+        "id": "8c14dfae.797ac",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1866.9837341308594,
-        "y": 4448.333190917969,
-        "z": "d1eceead.adafe",
+        "y": 4451.333190917969,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "31026a11.2a4bde"
+                "2cd4e727.640d2"
             ]
         ]
     },
     {
-        "id": "31635596.d79712",
+        "id": "82bf3fe2.ca776",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1340.4838562011719,
-        "y": 4562.333190917969,
-        "z": "d1eceead.adafe",
+        "y": 4565.333190917969,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "c3c84b5.76fc5b8"
+                "1f28baf3.4c601d"
             ]
         ]
     },
     {
-        "id": "c3c84b5.76fc5b8",
+        "id": "1f28baf3.4c601d",
         "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": 1492.4838562011719,
-        "y": 4563.333190917969,
-        "z": "d1eceead.adafe",
+        "y": 4566.333190917969,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "8f4995e7.00e5b8",
+        "id": "6c2244a0.55dae4",
         "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": 1503.4838562011719,
-        "y": 4506.333190917969,
-        "z": "d1eceead.adafe",
+        "y": 4509.333190917969,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "ca7cc65e.e299b",
+        "id": "c7d8a4a1.11fab",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 2248.9837341308594,
-        "y": 4452.333190917969,
-        "z": "d1eceead.adafe",
+        "y": 4455.333190917969,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "7e1000fc.f7ace",
-                "10f0f2b8.28ecdd",
-                "1cf608fc.280f8f"
+                "51d3a91c.c42e68",
+                "d0954d9b.2799a8",
+                "454e24ff.d6924c"
             ]
         ]
     },
     {
-        "id": "31026a11.2a4bde",
+        "id": "2cd4e727.640d2",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2069.9837341308594,
-        "y": 4452.333190917969,
-        "z": "d1eceead.adafe",
+        "y": 4455.333190917969,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "ca7cc65e.e299b"
+                "c7d8a4a1.11fab"
             ]
         ]
     },
     {
-        "id": "964a9d6b.511ef",
+        "id": "7279f474.ca532c",
         "type": "execute",
         "name": "execute RestApiCallNode Delete LEAF UNI of ethernet Service without token",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.leafconn.etht-svc-name + '/etht-svc-end-points=' + $tmp.LEAF.uni-p-interface-long`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<!--<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",
         "comments": "",
         "outputs": 1,
         "x": 1053.4839782714844,
-        "y": 4609.932800292969,
-        "z": "d1eceead.adafe",
+        "y": 4612.932800292969,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "a14b7306.f0f088",
-                "edc3d42b.21d3d"
+                "63493229.c5487c",
+                "9b59a379.ae234"
             ]
         ]
     },
     {
-        "id": "edc3d42b.21d3d",
+        "id": "9b59a379.ae234",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1417.9837341308594,
-        "y": 4657.932800292969,
-        "z": "d1eceead.adafe",
+        "y": 4660.932800292969,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "7d2a7da9.46fdfc"
+                "7641260e.a4325"
             ]
         ]
     },
     {
-        "id": "a14b7306.f0f088",
+        "id": "63493229.c5487c",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1413.9837341308594,
-        "y": 4617.932800292969,
-        "z": "d1eceead.adafe",
+        "y": 4620.932800292969,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "db3e9725.884648"
+                "3e92540.7763d2c"
             ]
         ]
     },
     {
-        "id": "db3e9725.884648",
+        "id": "3e92540.7763d2c",
         "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 delete ethernet service rest api\" />\n",
         "comments": "",
         "x": 1571.9837341308594,
-        "y": 4617.932800292969,
-        "z": "d1eceead.adafe",
+        "y": 4620.932800292969,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "7d2a7da9.46fdfc",
+        "id": "7641260e.a4325",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
@@ -6754,113 +6632,113 @@
         "comments": "",
         "outputs": 1,
         "x": 1575.4837341308594,
-        "y": 4657.932800292969,
-        "z": "d1eceead.adafe",
+        "y": 4660.932800292969,
+        "z": "8bd89607.6248d8",
         "wires": [
             []
         ]
     },
     {
-        "id": "10f0f2b8.28ecdd",
+        "id": "d0954d9b.2799a8",
         "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.domain.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domain.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
         "x": 2454.9837341308594,
-        "y": 4465.333190917969,
-        "z": "d1eceead.adafe",
+        "y": 4468.333190917969,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "25e5e61.acf541a",
-                "12a14aa1.cf2fb5",
-                "c1a2b3a0.8c75c"
+                "53623639.5d8eb",
+                "11f800c8.cf014f",
+                "e0ce2e99.74a758"
             ]
         ]
     },
     {
-        "id": "7e1000fc.f7ace",
+        "id": "51d3a91c.c42e68",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domain id",
         "xml": "<set>\n<parameter name='tmp.domain.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
         "x": 2484.9837341308594,
-        "y": 4413.333190917969,
-        "z": "d1eceead.adafe",
+        "y": 4416.333190917969,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "25e5e61.acf541a",
+        "id": "53623639.5d8eb",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2664.9837341308594,
-        "y": 4456.333190917969,
-        "z": "d1eceead.adafe",
+        "y": 4459.333190917969,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "5696d51e.dbfe64"
+                "73587898.c5bc6"
             ]
         ]
     },
     {
-        "id": "12a14aa1.cf2fb5",
+        "id": "11f800c8.cf014f",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2656.9837341308594,
-        "y": 4511.333190917969,
-        "z": "d1eceead.adafe",
+        "y": 4514.333190917969,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "8d572a45.011df8"
+                "7759dd63.3c0bd4"
             ]
         ]
     },
     {
-        "id": "c1a2b3a0.8c75c",
+        "id": "e0ce2e99.74a758",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2661.9837341308594,
-        "y": 4568.333190917969,
-        "z": "d1eceead.adafe",
+        "y": 4571.333190917969,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "dddace6e.f9e9f"
+                "29744fd6.f0a3"
             ]
         ]
     },
     {
-        "id": "dddace6e.f9e9f",
+        "id": "29744fd6.f0a3",
         "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": 2813.9837341308594,
-        "y": 4569.333190917969,
-        "z": "d1eceead.adafe",
+        "y": 4572.333190917969,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "8d572a45.011df8",
+        "id": "7759dd63.3c0bd4",
         "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": 2824.9837341308594,
-        "y": 4514.333190917969,
-        "z": "d1eceead.adafe",
+        "y": 4517.333190917969,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "5696d51e.dbfe64",
+        "id": "73587898.c5bc6",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -6868,101 +6746,101 @@
         "comments": "",
         "outputs": 1,
         "x": 2809.3660583496094,
-        "y": 4453.988861083984,
-        "z": "d1eceead.adafe",
+        "y": 4456.988861083984,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "e4cea83c.4d71a"
+                "2b6c0b59.4c3f54"
             ]
         ]
     },
     {
-        "id": "e4cea83c.4d71a",
+        "id": "2b6c0b59.4c3f54",
         "type": "set",
         "name": "set controller domain data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.url' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.user' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.password' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
         "comments": "",
         "x": 3023.9837341308594,
-        "y": 4450.333190917969,
-        "z": "d1eceead.adafe",
+        "y": 4453.333190917969,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "1cf608fc.280f8f",
+        "id": "454e24ff.d6924c",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
         "x": 2404.9837341308594,
-        "y": 4529.333190917969,
-        "z": "d1eceead.adafe",
+        "y": 4532.333190917969,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "58993466.bcba34",
+        "id": "c28774e0.0f37e8",
         "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": 1082.5667419433594,
-        "y": 4830.049499511719,
-        "z": "d1eceead.adafe",
+        "y": 4833.049499511719,
+        "z": "8bd89607.6248d8",
         "wires": [
             []
         ]
     },
     {
-        "id": "b72e55ab.bc6bd8",
+        "id": "fd804c17.d00668",
         "type": "switchNode",
         "name": "switch found-root-connectivity",
         "xml": "\n<switch test=\"`$found-root-connectivity`\">\n\n",
         "comments": "",
         "outputs": 1,
         "x": 897.5667419433594,
-        "y": 4897.049499511719,
-        "z": "d1eceead.adafe",
+        "y": 4900.049499511719,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "191ee334.0f09fd",
-                "b8911820.2c8f68"
+                "c90d3790.0c31f",
+                "b432c8fe.988cb"
             ]
         ]
     },
     {
-        "id": "191ee334.0f09fd",
+        "id": "c90d3790.0c31f",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1162.5667419433594,
-        "y": 4882.049499511719,
-        "z": "d1eceead.adafe",
+        "y": 4885.049499511719,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "328aa2d2.c36a96"
+                "b12f48c6.75129"
             ]
         ]
     },
     {
-        "id": "b8911820.2c8f68",
+        "id": "b432c8fe.988cb",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1158.5667419433594,
-        "y": 4930.049499511719,
-        "z": "d1eceead.adafe",
+        "y": 4933.049499511719,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "88b54a6f.ba3898"
+                "7a2784c6.a60bf4"
             ]
         ]
     },
     {
-        "id": "328aa2d2.c36a96",
+        "id": "b12f48c6.75129",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
@@ -6970,66 +6848,66 @@
         "comments": "",
         "outputs": 1,
         "x": 1318.5667419433594,
-        "y": 4878.049499511719,
-        "z": "d1eceead.adafe",
+        "y": 4881.049499511719,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "4a7a1b00.5fe524"
+                "b537e67c.ce751"
             ]
         ]
     },
     {
-        "id": "88b54a6f.ba3898",
+        "id": "7a2784c6.a60bf4",
         "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": 1306.5667419433594,
-        "y": 4925.049499511719,
-        "z": "d1eceead.adafe",
+        "y": 4928.049499511719,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "d5cdb27.e4e575",
+        "id": "5b301854.48435",
         "type": "comment",
         "name": "Update connectivity status to modified",
         "info": "",
         "comments": "",
         "x": 1587.4664001464844,
-        "y": 4828.749694824219,
-        "z": "d1eceead.adafe",
+        "y": 4831.749694824219,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "4a7a1b00.5fe524",
+        "id": "b537e67c.ce751",
         "type": "save",
         "name": "update ROOT connectivity resource in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.ROOT.connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.ROOT.connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Modified' />\n",
         "comments": "",
         "outputs": 1,
         "x": 1613.2496032714844,
-        "y": 4870.949890136719,
-        "z": "d1eceead.adafe",
+        "y": 4873.949890136719,
+        "z": "8bd89607.6248d8",
         "wires": [
             []
         ]
     },
     {
-        "id": "1003b628.8cf272",
+        "id": "46575909.129948",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-delete-VPNBs",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-delete-VPNBs' mode='sync' >\n\n",
         "comments": "",
         "outputs": 1,
         "x": 1026.8833923339844,
-        "y": 4144.316589355469,
-        "z": "d1eceead.adafe",
+        "y": 4147.316589355469,
+        "z": "8bd89607.6248d8",
         "wires": [
             []
         ]
     },
     {
-        "id": "44e1ece4.47debc",
+        "id": "d28cabbc.30ca5",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -7037,17 +6915,17 @@
         "comments": "",
         "outputs": 1,
         "x": 632.8834228515625,
-        "y": 4148.999725341797,
-        "z": "d1eceead.adafe",
+        "y": 4151.999725341797,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "1003b628.8cf272",
-                "71bd2e28.fdc428"
+                "46575909.129948",
+                "4a0919d1.fbc9d8"
             ]
         ]
     },
     {
-        "id": "49ab1cdc.2b3dfc",
+        "id": "97fb2b7.67063d8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -7055,643 +6933,644 @@
         "comments": "",
         "outputs": 1,
         "x": 716.3333740234375,
-        "y": 5401.516571044922,
-        "z": "d1eceead.adafe",
+        "y": 5404.516571044922,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "723c2903.f58428",
-                "98b88954.793148",
-                "b393338f.3c0a5",
-                "119574e6.129413"
+                "8c98b36e.448bc8",
+                "4b4a8b6f.30cb4c",
+                "232ef942.027ea6",
+                "9956c6b0.e8f5b"
             ]
         ]
     },
     {
-        "id": "723c2903.f58428",
+        "id": "8c98b36e.448bc8",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-delete-VPNBs",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-delete-VPNBs' mode='sync' >\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1067.7166748046875,
-        "y": 5332.516571044922,
-        "z": "d1eceead.adafe",
+        "x": 1077.7166748046875,
+        "y": 5167.5166015625,
+        "z": "8bd89607.6248d8",
         "wires": [
             []
         ]
     },
     {
-        "id": "98b88954.793148",
+        "id": "4b4a8b6f.30cb4c",
         "type": "save",
         "name": "delete LEAF connectivity resource in AAI",
         "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 978.7166748046875,
-        "y": 5401.516571044922,
-        "z": "d1eceead.adafe",
+        "x": 988.7166748046875,
+        "y": 5236.5166015625,
+        "z": "8bd89607.6248d8",
         "wires": [
             []
         ]
     },
     {
-        "id": "b393338f.3c0a5",
+        "id": "232ef942.027ea6",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 869.88330078125,
-        "y": 5636.516571044922,
-        "z": "d1eceead.adafe",
+        "x": 879.88330078125,
+        "y": 5471.5166015625,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "df7f814b.30dca",
-                "680a6c2d.c81304",
-                "f02d2a13.d0aa48"
+                "3ef7ef40.ec34",
+                "afe6825d.3e4ed8",
+                "56fc7b03.ef7a34"
             ]
         ]
     },
     {
-        "id": "c8c4cb96.f9d8b",
+        "id": "8f4e88cb.a2731",
         "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.domain.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domain.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
-        "x": 2585.882568359375,
-        "y": 5523.516571044922,
-        "z": "d1eceead.adafe",
+        "x": 2588.882568359375,
+        "y": 5396.5166015625,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "43900724.7021a8",
-                "b5fd98a.36736e8",
-                "3c26b3f8.230acc"
+                "4a46c897.331cf",
+                "c619cf4e.8ea4f8",
+                "c904c4c1.6a362"
             ]
         ]
     },
     {
-        "id": "de9e1e1d.dcbc3",
+        "id": "c656ce5c.18cf6",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 2535.882568359375,
-        "y": 5587.516571044922,
-        "z": "d1eceead.adafe",
+        "x": 2538.882568359375,
+        "y": 5460.5166015625,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "d2b1cccb.1f5468",
+        "id": "c0938886.470a7",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domain id",
         "xml": "<set>\n<parameter name='tmp.domain.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 2615.882568359375,
-        "y": 5471.516571044922,
-        "z": "d1eceead.adafe",
+        "x": 2618.882568359375,
+        "y": 5344.5166015625,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "43900724.7021a8",
+        "id": "4a46c897.331cf",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2795.882568359375,
-        "y": 5514.516571044922,
-        "z": "d1eceead.adafe",
+        "x": 2906.8826904296875,
+        "y": 5327.5166015625,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "dc7a8a3b.a925f8"
+                "a7e4d7d8.d8bee"
             ]
         ]
     },
     {
-        "id": "b5fd98a.36736e8",
+        "id": "c619cf4e.8ea4f8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2787.882568359375,
-        "y": 5569.516571044922,
-        "z": "d1eceead.adafe",
+        "x": 2898.8826904296875,
+        "y": 5382.5166015625,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "c1ab7307.8305a8"
+                "8289ee53.c79808"
             ]
         ]
     },
     {
-        "id": "3c26b3f8.230acc",
+        "id": "c904c4c1.6a362",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2792.882568359375,
-        "y": 5626.516571044922,
-        "z": "d1eceead.adafe",
+        "x": 2903.8826904296875,
+        "y": 5439.5166015625,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "f1d869f8.b644e"
+                "6baa18e0.e89e88"
             ]
         ]
     },
     {
-        "id": "f1d869f8.b644e",
+        "id": "6baa18e0.e89e88",
         "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": 2944.882568359375,
-        "y": 5627.516571044922,
-        "z": "d1eceead.adafe",
+        "x": 3055.8826904296875,
+        "y": 5440.5166015625,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "c1ab7307.8305a8",
+        "id": "8289ee53.c79808",
         "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": 2955.882568359375,
-        "y": 5572.516571044922,
-        "z": "d1eceead.adafe",
+        "x": 3066.8826904296875,
+        "y": 5385.5166015625,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "dc7a8a3b.a925f8",
+        "id": "a7e4d7d8.d8bee",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2940.264892578125,
-        "y": 5512.1722412109375,
-        "z": "d1eceead.adafe",
+        "x": 3051.2650146484375,
+        "y": 5325.172271728516,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "99f651cc.e3a158"
+                "ec15425b.c6de8"
             ]
         ]
     },
     {
-        "id": "99f651cc.e3a158",
+        "id": "ec15425b.c6de8",
         "type": "set",
         "name": "set controller domain data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.url' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.user' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.password' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
         "comments": "",
-        "x": 3154.882568359375,
-        "y": 5508.516571044922,
-        "z": "d1eceead.adafe",
+        "x": 3265.8826904296875,
+        "y": 5321.5166015625,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "df7f814b.30dca",
+        "id": "3ef7ef40.ec34",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.domain.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.the-connectivity.access-provider-id + '-clientId-' +\n                                                   $tmp.the-connectivity.access-client-id + '-topologyId-' +\n                                                   $tmp.the-connectivity.access-topology-id + '-nodeId-' +\n                                                   $tmp.the-connectivity.access-node-id`\" />\n",
         "comments": "",
-        "x": 1151.88330078125,
-        "y": 5505.516571044922,
-        "z": "d1eceead.adafe",
+        "x": 1161.88330078125,
+        "y": 5340.5166015625,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "1d552db6.d6aaca",
+        "id": "a4339be5.b80c5",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1362.3834228515625,
-        "y": 5644.516571044922,
-        "z": "d1eceead.adafe",
+        "x": 1372.3834228515625,
+        "y": 5479.5166015625,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "2d69161c.7523aa"
+                "1127f42a.b3bf34"
             ]
         ]
     },
     {
-        "id": "d7946986.6d0968",
+        "id": "2e74a78.3df33d8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1365.3834228515625,
-        "y": 5532.516571044922,
-        "z": "d1eceead.adafe",
+        "x": 1375.3834228515625,
+        "y": 5367.5166015625,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "b24f95b.8630968"
+                "5612018f.6df8"
             ]
         ]
     },
     {
-        "id": "9ea8b87c.75f8b",
+        "id": "70a06659.f7e26",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1357.3834228515625,
-        "y": 5587.516571044922,
-        "z": "d1eceead.adafe",
+        "x": 1367.3834228515625,
+        "y": 5422.5166015625,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "d1cfde55.05efd"
+                "f549eabc.91dae8"
             ]
         ]
     },
     {
-        "id": "b24f95b.8630968",
+        "id": "5612018f.6df8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1499.765625,
-        "y": 5527.172332763672,
-        "z": "d1eceead.adafe",
+        "x": 1509.765625,
+        "y": 5362.17236328125,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "57f5a4ed.934544"
+                "e700427f.a90ed"
             ]
         ]
     },
     {
-        "id": "2d69161c.7523aa",
+        "id": "1127f42a.b3bf34",
         "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": 1514.3834228515625,
-        "y": 5645.516571044922,
-        "z": "d1eceead.adafe",
+        "x": 1524.3834228515625,
+        "y": 5480.5166015625,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "d1cfde55.05efd",
+        "id": "f549eabc.91dae8",
         "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": 1525.3834228515625,
-        "y": 5588.516571044922,
-        "z": "d1eceead.adafe",
+        "x": 1535.3834228515625,
+        "y": 5423.5166015625,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "57f5a4ed.934544",
+        "id": "e700427f.a90ed",
         "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": 1686.8828125,
-        "y": 5528.516571044922,
-        "z": "d1eceead.adafe",
+        "x": 1696.8828125,
+        "y": 5363.5166015625,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "489e94a0.cb0724"
+                "5799adae.feee0c"
             ]
         ]
     },
     {
-        "id": "489e94a0.cb0724",
+        "id": "5799adae.feee0c",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1914.8828125,
-        "y": 5521.516571044922,
-        "z": "d1eceead.adafe",
+        "x": 1924.8828125,
+        "y": 5356.5166015625,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "70d2a39a.39c914"
+                "1e23480b.f981d8"
             ]
         ]
     },
     {
-        "id": "680a6c2d.c81304",
+        "id": "afe6825d.3e4ed8",
         "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.domain.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 1169.88330078125,
-        "y": 5580.516571044922,
-        "z": "d1eceead.adafe",
+        "x": 1179.88330078125,
+        "y": 5415.5166015625,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "1d552db6.d6aaca",
-                "d7946986.6d0968",
-                "9ea8b87c.75f8b"
+                "a4339be5.b80c5",
+                "2e74a78.3df33d8",
+                "70a06659.f7e26"
             ]
         ]
     },
     {
-        "id": "70d2a39a.39c914",
+        "id": "1e23480b.f981d8",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2120.8828125,
-        "y": 5518.516571044922,
-        "z": "d1eceead.adafe",
+        "x": 2130.8828125,
+        "y": 5353.5166015625,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "11f0110f.f1cbd7"
+                "82b93b0b.3752a"
             ]
         ]
     },
     {
-        "id": "11f0110f.f1cbd7",
+        "id": "82b93b0b.3752a",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2335.8822021484375,
-        "y": 5521.516571044922,
-        "z": "d1eceead.adafe",
+        "x": 2345.8822021484375,
+        "y": 5356.5166015625,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "d2b1cccb.1f5468",
-                "c8c4cb96.f9d8b",
-                "de9e1e1d.dcbc3"
+                "c0938886.470a7",
+                "8f4e88cb.a2731",
+                "c656ce5c.18cf6"
             ]
         ]
     },
     {
-        "id": "f02d2a13.d0aa48",
+        "id": "56fc7b03.ef7a34",
         "type": "execute",
         "name": "execute RestApiCallNode Delete LEAF ethernet Service without token",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.the-connectivity.etht-svc-name`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<!--<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1293.6500244140625,
-        "y": 5729.916473388672,
-        "z": "d1eceead.adafe",
+        "x": 1303.6500244140625,
+        "y": 5564.91650390625,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "73cc7454.46b21c",
-                "983cf462.7773e"
+                "5de191f6.0adf08",
+                "8645dbc5.336bd"
             ]
         ]
     },
     {
-        "id": "73cc7454.46b21c",
+        "id": "5de191f6.0adf08",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1640.1500244140625,
-        "y": 5722.916473388672,
-        "z": "d1eceead.adafe",
+        "x": 1650.1500244140625,
+        "y": 5557.91650390625,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "d64e37c.99aa9c8"
+                "1d2e7b8b.bb158c"
             ]
         ]
     },
     {
-        "id": "983cf462.7773e",
+        "id": "8645dbc5.336bd",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1644.1500244140625,
-        "y": 5762.916473388672,
-        "z": "d1eceead.adafe",
+        "x": 1654.1500244140625,
+        "y": 5597.91650390625,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "63d68d1b.26356c"
+                "7a1f5009.c19bf"
             ]
         ]
     },
     {
-        "id": "d64e37c.99aa9c8",
+        "id": "1d2e7b8b.bb158c",
         "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 delete ethernet service rest api\" />\n",
         "comments": "",
-        "x": 1798.1500244140625,
-        "y": 5722.916473388672,
-        "z": "d1eceead.adafe",
+        "x": 1808.1500244140625,
+        "y": 5557.91650390625,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "63d68d1b.26356c",
+        "id": "7a1f5009.c19bf",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1801.6500244140625,
-        "y": 5762.916473388672,
-        "z": "d1eceead.adafe",
+        "x": 1811.6500244140625,
+        "y": 5597.91650390625,
+        "z": "8bd89607.6248d8",
         "wires": [
             []
         ]
     },
     {
-        "id": "119574e6.129413",
+        "id": "9956c6b0.e8f5b",
         "type": "switchNode",
         "name": "switch tmp.MMstillHasUni?",
         "xml": "\n<switch test=\"`$tmp.MMstillHasUni`\">\n\n",
         "comments": "",
         "outputs": 1,
         "x": 913.183349609375,
-        "y": 5891.716766357422,
-        "z": "d1eceead.adafe",
+        "y": 5894.716766357422,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "20383b77.9d13bc",
-                "9b5788ce.9c9408"
+                "1b3dc283.1c72c5",
+                "6927d979.135438"
             ]
         ]
     },
     {
-        "id": "20383b77.9d13bc",
+        "id": "1b3dc283.1c72c5",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1105.183349609375,
-        "y": 5868.716766357422,
-        "z": "d1eceead.adafe",
+        "x": 1107.183349609375,
+        "y": 5721.716796875,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "c8a5ff15.a0cc5"
+                "90688337.4fcde8"
             ]
         ]
     },
     {
-        "id": "9b5788ce.9c9408",
+        "id": "6927d979.135438",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1093.3500366210938,
-        "y": 6041.316864013672,
-        "z": "d1eceead.adafe",
+        "y": 6044.316864013672,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "80ab1272.8cacd"
+                "66475002.0efde8"
             ]
         ]
     },
     {
-        "id": "c8a5ff15.a0cc5",
+        "id": "90688337.4fcde8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1253.35009765625,
-        "y": 5868.316864013672,
-        "z": "d1eceead.adafe",
+        "x": 1255.35009765625,
+        "y": 5721.31689453125,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "b646edcc.5849d8",
-                "7aaef741.32dd88"
+                "88d77fb7.cde5d8",
+                "89314dbf.8366b8",
+                "68e0d31a.2e51f4"
             ]
         ]
     },
     {
-        "id": "b646edcc.5849d8",
+        "id": "88d77fb7.cde5d8",
         "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": 1675.199951171875,
-        "y": 5839.716766357422,
-        "z": "d1eceead.adafe",
+        "x": 1677.199951171875,
+        "y": 5692.716796875,
+        "z": "8bd89607.6248d8",
         "wires": [
             []
         ]
     },
     {
-        "id": "7aaef741.32dd88",
+        "id": "89314dbf.8366b8",
         "type": "switchNode",
         "name": "switch found-root-connectivity",
         "xml": "\n<switch test=\"`$found-root-connectivity`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1490.199951171875,
-        "y": 5906.716766357422,
-        "z": "d1eceead.adafe",
+        "x": 1492.199951171875,
+        "y": 5759.716796875,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "f0373e80.9f5c1",
-                "17b9923a.e6ff36"
+                "4d863da6.047404",
+                "e3c67257.c0375"
             ]
         ]
     },
     {
-        "id": "f0373e80.9f5c1",
+        "id": "4d863da6.047404",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1755.199951171875,
-        "y": 5891.716766357422,
-        "z": "d1eceead.adafe",
+        "x": 1757.199951171875,
+        "y": 5744.716796875,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "ea0794c3.5caad8"
+                "798adf3a.473ef"
             ]
         ]
     },
     {
-        "id": "17b9923a.e6ff36",
+        "id": "e3c67257.c0375",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1751.199951171875,
-        "y": 5939.716766357422,
-        "z": "d1eceead.adafe",
+        "x": 1756.199951171875,
+        "y": 5792.716796875,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "f785b40a.2c0f08"
+                "88e52eb1.fc93f"
             ]
         ]
     },
     {
-        "id": "ea0794c3.5caad8",
+        "id": "798adf3a.473ef",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1911.199951171875,
-        "y": 5887.716766357422,
-        "z": "d1eceead.adafe",
+        "x": 1913.199951171875,
+        "y": 5740.716796875,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "c184cafd.df5108"
+                "733c34ed.517f9c"
             ]
         ]
     },
     {
-        "id": "f785b40a.2c0f08",
+        "id": "88e52eb1.fc93f",
         "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": 1899.199951171875,
-        "y": 5934.716766357422,
-        "z": "d1eceead.adafe",
+        "x": 1904.199951171875,
+        "y": 5787.716796875,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "c184cafd.df5108",
+        "id": "733c34ed.517f9c",
         "type": "save",
         "name": "update ROOT connectivity resource in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.ROOT.connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.ROOT.connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Modified' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 2219.8826904296875,
-        "y": 5881.617156982422,
-        "z": "d1eceead.adafe",
+        "x": 2221.8826904296875,
+        "y": 5734.6171875,
+        "z": "8bd89607.6248d8",
         "wires": [
             []
         ]
     },
     {
-        "id": "c1da52d9.9cf468",
+        "id": "51bb42c1.6468fc",
         "type": "comment",
         "name": "Update connectivity status to modified",
         "info": "",
         "comments": "",
-        "x": 2194.0994873046875,
-        "y": 5839.416961669922,
-        "z": "d1eceead.adafe",
+        "x": 2196.0994873046875,
+        "y": 5692.4169921875,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "80ab1272.8cacd",
+        "id": "66475002.0efde8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -7699,242 +7578,242 @@
         "comments": "",
         "outputs": 1,
         "x": 1230.916748046875,
-        "y": 6040.616668701172,
-        "z": "d1eceead.adafe",
+        "y": 6043.616668701172,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "49431e5b.e46588",
-                "1475339.a9ed04c"
+                "a0a718de.f23a",
+                "e9e38848.54da1"
             ]
         ]
     },
     {
-        "id": "49431e5b.e46588",
+        "id": "a0a718de.f23a",
         "type": "for",
         "name": "for each relationship of middle-man-conn",
         "xml": "<for index='rel-index' start='0' end='`$middle-man-conn.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
         "x": 1544.23291015625,
-        "y": 6034.816864013672,
-        "z": "d1eceead.adafe",
+        "y": 6037.816864013672,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "f57bdc9.9ead4a"
+                "76936a5f.84bc84"
             ]
         ]
     },
     {
-        "id": "f57bdc9.9ead4a",
+        "id": "76936a5f.84bc84",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$middle-man-conn.relationship-list.relationship[$rel-index].related-to`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1844.566650390625,
-        "y": 6029.816802978516,
-        "z": "d1eceead.adafe",
+        "y": 6032.816802978516,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "ba35dccb.3b6bb8"
+                "44a7328f.e8be34"
             ]
         ]
     },
     {
-        "id": "ba35dccb.3b6bb8",
+        "id": "44a7328f.e8be34",
         "type": "outcome",
         "name": "connectivity",
         "xml": "<outcome value='connectivity'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2024.2332763671875,
-        "y": 6029.81689453125,
-        "z": "d1eceead.adafe",
+        "y": 6032.81689453125,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "86341ec4.ccb728"
+                "208791a0.d9f786"
             ]
         ]
     },
     {
-        "id": "86341ec4.ccb728",
+        "id": "208791a0.d9f786",
         "type": "save",
         "name": "get connectivity from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"connectivity\"\n\t    key=\"connectivity.connectivity-id = $middle-man-conn.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.connectivity\" >\n",
         "comments": "",
         "outputs": 1,
         "x": 2224.233154296875,
-        "y": 6029.816864013672,
-        "z": "d1eceead.adafe",
+        "y": 6032.816864013672,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "73b15a95.c45e6c",
-                "577c89f1.70257",
-                "ebf7b15b.49862"
+                "574a6228.5b1754",
+                "eafb76a9.ded53",
+                "327d9363.1aef4c"
             ]
         ]
     },
     {
-        "id": "73b15a95.c45e6c",
+        "id": "574a6228.5b1754",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2431.23291015625,
-        "y": 6079.816864013672,
-        "z": "d1eceead.adafe",
+        "y": 6082.816864013672,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "d5e5b35.6604c5"
+                "23760b0c.48685c"
             ]
         ]
     },
     {
-        "id": "925dd5ef.2fc678",
+        "id": "460767d0.d2c1b8",
         "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": 2408.466552734375,
-        "y": 6264.016571044922,
-        "z": "d1eceead.adafe",
+        "y": 6267.016571044922,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "42725353.b4a374",
-                "1745f7ad.eada2",
-                "ebfc9334.bdf468"
+                "88082c33.393",
+                "e1f0fae1.b8f4d8",
+                "822aec8b.abd888"
             ]
         ]
     },
     {
-        "id": "6ac4c475.ce37cc",
+        "id": "6361e7ff.46b828",
         "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": 1607.466552734375,
-        "y": 6179.016571044922,
-        "z": "d1eceead.adafe",
+        "y": 6182.016571044922,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "df9efed7.82417"
+                "75dfc93.82d2038"
             ]
         ]
     },
     {
-        "id": "df9efed7.82417",
+        "id": "75dfc93.82d2038",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1804.466552734375,
-        "y": 6193.016571044922,
-        "z": "d1eceead.adafe",
+        "y": 6196.016571044922,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "376f554a.32ded2",
-                "e86a8d88.08809"
+                "a28db7b9.a381c8",
+                "9f04b050.7c6fe8"
             ]
         ]
     },
     {
-        "id": "376f554a.32ded2",
+        "id": "a28db7b9.a381c8",
         "type": "outcome",
         "name": "vpn-binding",
         "xml": "<outcome value='vpn-binding'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1972.466552734375,
-        "y": 6186.016571044922,
-        "z": "d1eceead.adafe",
+        "y": 6189.016571044922,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "bc2d7c0c.7cc4a8"
+                "136ceea8.d9cdf9"
             ]
         ]
     },
     {
-        "id": "bc2d7c0c.7cc4a8",
+        "id": "136ceea8.d9cdf9",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 2135.466552734375,
-        "y": 6186.016571044922,
-        "z": "d1eceead.adafe",
+        "y": 6189.016571044922,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "925dd5ef.2fc678"
+                "460767d0.d2c1b8"
             ]
         ]
     },
     {
-        "id": "e86a8d88.08809",
+        "id": "9f04b050.7c6fe8",
         "type": "outcome",
         "name": "uni",
         "xml": "<outcome value='uni'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1988.466552734375,
-        "y": 6482.016571044922,
-        "z": "d1eceead.adafe",
+        "y": 6485.016571044922,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "32fa6a7d.612076"
+                "5e0bc78d.ba716"
             ]
         ]
     },
     {
-        "id": "32fa6a7d.612076",
+        "id": "5e0bc78d.ba716",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 2151.466552734375,
-        "y": 6482.016571044922,
-        "z": "d1eceead.adafe",
+        "y": 6485.016571044922,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "6e62ca.5284a538"
+                "2848a471.d7d3ac"
             ]
         ]
     },
     {
-        "id": "6e62ca.5284a538",
+        "id": "2848a471.d7d3ac",
         "type": "save",
         "name": "delete uni resource in AAI",
         "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2394.466552734375,
-        "y": 6482.016571044922,
-        "z": "d1eceead.adafe",
+        "y": 6485.016571044922,
+        "z": "8bd89607.6248d8",
         "wires": [
             []
         ]
     },
     {
-        "id": "91368e45.2e3cd8",
+        "id": "14cdbd34.9d5433",
         "type": "save",
         "name": "delete connectivity resource in AAI",
         "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.connectivity.connectivity-id'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1362.466552734375,
-        "y": 7248.016571044922,
-        "z": "d1eceead.adafe",
+        "y": 7251.016571044922,
+        "z": "8bd89607.6248d8",
         "wires": [
             []
         ]
     },
     {
-        "id": "d5e5b35.6604c5",
+        "id": "23760b0c.48685c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -7942,259 +7821,259 @@
         "comments": "",
         "outputs": 1,
         "x": 1433.466552734375,
-        "y": 6177.016571044922,
-        "z": "d1eceead.adafe",
+        "y": 6180.016571044922,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "6ac4c475.ce37cc",
-                "91368e45.2e3cd8",
-                "5c661b6d.db566c"
+                "6361e7ff.46b828",
+                "14cdbd34.9d5433",
+                "468cb6c4.ffb168"
             ]
         ]
     },
     {
-        "id": "42725353.b4a374",
+        "id": "88082c33.393",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2619.466552734375,
-        "y": 6266.016571044922,
-        "z": "d1eceead.adafe",
+        "y": 6269.016571044922,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "aedd4240.642968"
+                "83017d89.d2d33"
             ]
         ]
     },
     {
-        "id": "1745f7ad.eada2",
+        "id": "e1f0fae1.b8f4d8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2619.95751953125,
-        "y": 6311.590606689453,
-        "z": "d1eceead.adafe",
+        "y": 6314.590606689453,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "6425bc45.5cdfcc"
+                "ec259daf.cc4758"
             ]
         ]
     },
     {
-        "id": "ebfc9334.bdf468",
+        "id": "822aec8b.abd888",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2617.466552734375,
-        "y": 6355.016571044922,
-        "z": "d1eceead.adafe",
+        "y": 6358.016571044922,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "337169e1.665c2e"
+                "ba3c2552.11f0b"
             ]
         ]
     },
     {
-        "id": "ebf7b15b.49862",
+        "id": "327d9363.1aef4c",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2455.282958984375,
-        "y": 5980.616668701172,
-        "z": "d1eceead.adafe",
+        "y": 5983.616668701172,
+        "z": "8bd89607.6248d8",
         "wires": [
             []
         ]
     },
     {
-        "id": "577c89f1.70257",
+        "id": "eafb76a9.ded53",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2452.7919921875,
-        "y": 6024.042633056641,
-        "z": "d1eceead.adafe",
+        "y": 6027.042633056641,
+        "z": "8bd89607.6248d8",
         "wires": [
             []
         ]
     },
     {
-        "id": "1475339.a9ed04c",
+        "id": "e9e38848.54da1",
         "type": "save",
         "name": "delete middle-man-conn resource in AAI",
         "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1531.400146484375,
-        "y": 6109.416473388672,
-        "z": "d1eceead.adafe",
+        "y": 6112.416473388672,
+        "z": "8bd89607.6248d8",
         "wires": [
             []
         ]
     },
     {
-        "id": "aedd4240.642968",
+        "id": "83017d89.d2d33",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 2785.466552734375,
-        "y": 6256.016571044922,
-        "z": "d1eceead.adafe",
+        "y": 6259.016571044922,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "20a20b24.b18d74",
-                "da0ac321.ebd92",
-                "450533a8.9c748c",
-                "dc80e7d7.692bf8",
-                "7b453ddd.4a4edc"
+                "c9d43f06.0d115",
+                "b37c19e0.f8f32",
+                "60da6725.d98bd8",
+                "be2af461.e005a",
+                "cbf01fd8.d058c"
             ]
         ]
     },
     {
-        "id": "337169e1.665c2e",
+        "id": "ba3c2552.11f0b",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
         "x": 2784.466552734375,
-        "y": 6354.016571044922,
-        "z": "d1eceead.adafe",
+        "y": 6357.016571044922,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "6425bc45.5cdfcc",
+        "id": "ec259daf.cc4758",
         "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": 2782.5289306640625,
-        "y": 6311.8763427734375,
-        "z": "d1eceead.adafe",
+        "y": 6314.8763427734375,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "20a20b24.b18d74",
+        "id": "c9d43f06.0d115",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.domain.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.vpn-binding.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.vpn-binding.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.vpn-binding.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.vpn-binding.src-access-node-id`\" />\n",
         "comments": "",
         "x": 3007.466552734375,
-        "y": 5974.016571044922,
-        "z": "d1eceead.adafe",
+        "y": 5977.016571044922,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "da0ac321.ebd92",
+        "id": "b37c19e0.f8f32",
         "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.domain.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
         "x": 3033.466552734375,
-        "y": 6091.016571044922,
-        "z": "d1eceead.adafe",
+        "y": 6094.016571044922,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "ab328def.9c2568",
-                "1e0d49ce.54650e",
-                "83f96b0e.23503"
+                "410583dd.d8121c",
+                "88eb934e.2f5b08",
+                "a865a4a5.d4df78"
             ]
         ]
     },
     {
-        "id": "450533a8.9c748c",
+        "id": "60da6725.d98bd8",
         "type": "execute",
         "name": "execute RestApiCallNode Delete 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.ts-otn-src-domain-creation.templatefile`\" />-->\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-te:te/tunnels/tunnel=' + $tmp.aai.vpn-binding.vpn-name`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
         "comments": "",
         "outputs": 1,
         "x": 3136.466552734375,
-        "y": 6358.016571044922,
-        "z": "d1eceead.adafe",
+        "y": 6361.016571044922,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "e189248a.5308d8",
-                "42e13b38.68927c"
+                "72b47bea.9a0f24",
+                "66f0d6b4.eb7008"
             ]
         ]
     },
     {
-        "id": "dc80e7d7.692bf8",
+        "id": "be2af461.e005a",
         "type": "switchNode",
         "name": "switch connectivity has ethernet service",
         "xml": "<switch test='`$tmp.aai.connectivity.etht-svc-name`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3074.466552734375,
-        "y": 6493.016571044922,
-        "z": "d1eceead.adafe",
+        "y": 6496.016571044922,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "75c39310.64e10c",
-                "865b2c0.812e658"
+                "2f67e97f.141fd6",
+                "7b5fd505.3b0694"
             ]
         ]
     },
     {
-        "id": "7b453ddd.4a4edc",
+        "id": "cbf01fd8.d058c",
         "type": "save",
         "name": "delete vpn-binding resource in AAI",
         "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-binding.vpn-id' >\n",
         "comments": "",
         "outputs": 1,
         "x": 3055.466552734375,
-        "y": 6609.016571044922,
-        "z": "d1eceead.adafe",
+        "y": 6612.016571044922,
+        "z": "8bd89607.6248d8",
         "wires": [
             []
         ]
     },
     {
-        "id": "ab328def.9c2568",
+        "id": "410583dd.d8121c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3228.9666748046875,
-        "y": 6043.016571044922,
-        "z": "d1eceead.adafe",
+        "y": 6046.016571044922,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "7b2173a0.a25f4c"
+                "4a83ae1e.07b578"
             ]
         ]
     },
     {
-        "id": "1e0d49ce.54650e",
+        "id": "88eb934e.2f5b08",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3220.9666748046875,
-        "y": 6098.016571044922,
-        "z": "d1eceead.adafe",
+        "y": 6101.016571044922,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "3e21d08a.9cf2d8"
+                "282085b8.0d4512"
             ]
         ]
     },
     {
-        "id": "7b2173a0.a25f4c",
+        "id": "4a83ae1e.07b578",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -8202,176 +8081,176 @@
         "comments": "",
         "outputs": 1,
         "x": 3363.348876953125,
-        "y": 6037.672332763672,
-        "z": "d1eceead.adafe",
+        "y": 6040.672332763672,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "d783eb8.e8d4418"
+                "33baf8b0.f059c8"
             ]
         ]
     },
     {
-        "id": "83f96b0e.23503",
+        "id": "a865a4a5.d4df78",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3225.9666748046875,
-        "y": 6155.016571044922,
-        "z": "d1eceead.adafe",
+        "y": 6158.016571044922,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "39d187f7.387c08"
+                "63323518.7bcbac"
             ]
         ]
     },
     {
-        "id": "39d187f7.387c08",
+        "id": "63323518.7bcbac",
         "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": 3377.9666748046875,
-        "y": 6156.016571044922,
-        "z": "d1eceead.adafe",
+        "y": 6159.016571044922,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "3e21d08a.9cf2d8",
+        "id": "282085b8.0d4512",
         "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": 3388.9666748046875,
-        "y": 6099.016571044922,
-        "z": "d1eceead.adafe",
+        "y": 6102.016571044922,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "865b2c0.812e658",
+        "id": "7b5fd505.3b0694",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3327.466552734375,
-        "y": 6471.016571044922,
-        "z": "d1eceead.adafe",
+        "y": 6474.016571044922,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "772ac851.ed388"
+                "948366f4.fec95"
             ]
         ]
     },
     {
-        "id": "75c39310.64e10c",
+        "id": "2f67e97f.141fd6",
         "type": "outcome",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
         "x": 3327.466552734375,
-        "y": 6527.016571044922,
-        "z": "d1eceead.adafe",
+        "y": 6530.016571044922,
+        "z": "8bd89607.6248d8",
         "wires": [
             []
         ]
     },
     {
-        "id": "d783eb8.e8d4418",
+        "id": "33baf8b0.f059c8",
         "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": 3550.466064453125,
-        "y": 6039.016571044922,
-        "z": "d1eceead.adafe",
+        "y": 6042.016571044922,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "22737809.d5a598"
+                "e2cf1880.b9d7c"
             ]
         ]
     },
     {
-        "id": "22737809.d5a598",
+        "id": "e2cf1880.b9d7c",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3791.466064453125,
-        "y": 6030.016571044922,
-        "z": "d1eceead.adafe",
+        "y": 6033.016571044922,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "8e816736.3f1518"
+                "bc484497.a79ff8"
             ]
         ]
     },
     {
-        "id": "772ac851.ed388",
+        "id": "948366f4.fec95",
         "type": "execute",
         "name": "execute RestApiCallNode Delete ethernet Service without token",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.aai.connectivity.etht-svc-name`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<!--<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",
         "comments": "",
         "outputs": 1,
         "x": 3677.466064453125,
-        "y": 6461.016571044922,
-        "z": "d1eceead.adafe",
+        "y": 6464.016571044922,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "7e278410.d4a45c",
-                "5323d43d.ae4a94"
+                "c37cd95d.368e7",
+                "92455633.bf0ee8"
             ]
         ]
     },
     {
-        "id": "e189248a.5308d8",
+        "id": "72b47bea.9a0f24",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3443.966064453125,
-        "y": 6383.016571044922,
-        "z": "d1eceead.adafe",
+        "y": 6386.016571044922,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "a38fc7bd.ddbeb"
+                "f1048a1f.996e4"
             ]
         ]
     },
     {
-        "id": "42e13b38.68927c",
+        "id": "66f0d6b4.eb7008",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3444.966064453125,
-        "y": 6328.016571044922,
-        "z": "d1eceead.adafe",
+        "y": 6331.016571044922,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "ca98e797.f9c13"
+                "314550b5.0a064"
             ]
         ]
     },
     {
-        "id": "a38fc7bd.ddbeb",
+        "id": "f1048a1f.996e4",
         "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 delete OTN tunnel rest api\" />\n",
         "comments": "",
         "x": 3615.966064453125,
-        "y": 6381.016571044922,
-        "z": "d1eceead.adafe",
+        "y": 6384.016571044922,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "ca98e797.f9c13",
+        "id": "314550b5.0a064",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
@@ -8379,80 +8258,80 @@
         "comments": "",
         "outputs": 1,
         "x": 3612.466064453125,
-        "y": 6330.016571044922,
-        "z": "d1eceead.adafe",
+        "y": 6333.016571044922,
+        "z": "8bd89607.6248d8",
         "wires": [
             []
         ]
     },
     {
-        "id": "63dcc10.1e934c",
+        "id": "926cd0b8.871b1",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 4148.4658203125,
-        "y": 5979.016571044922,
-        "z": "d1eceead.adafe",
+        "y": 5982.016571044922,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "cb51edb2.a6957",
-                "7da0f639.3db538",
-                "dfe02514.308cd"
+                "e5e99dd1.35ed8",
+                "977d12a.f8bd9f",
+                "b449b2c0.535c38"
             ]
         ]
     },
     {
-        "id": "8e816736.3f1518",
+        "id": "bc484497.a79ff8",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3997.466064453125,
-        "y": 6027.016571044922,
-        "z": "d1eceead.adafe",
+        "y": 6030.016571044922,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "63dcc10.1e934c"
+                "926cd0b8.871b1"
             ]
         ]
     },
     {
-        "id": "7e278410.d4a45c",
+        "id": "c37cd95d.368e7",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4009.966064453125,
-        "y": 6435.016571044922,
-        "z": "d1eceead.adafe",
+        "y": 6438.016571044922,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "21b3d920.ac879e"
+                "b162e50d.7cae58"
             ]
         ]
     },
     {
-        "id": "5323d43d.ae4a94",
+        "id": "92455633.bf0ee8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4013.966064453125,
-        "y": 6475.016571044922,
-        "z": "d1eceead.adafe",
+        "y": 6478.016571044922,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "da782471.0e218"
+                "2199ad10.a55eda"
             ]
         ]
     },
     {
-        "id": "da782471.0e218",
+        "id": "2199ad10.a55eda",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
@@ -8460,135 +8339,135 @@
         "comments": "",
         "outputs": 1,
         "x": 4201.466064453125,
-        "y": 6479.016571044922,
-        "z": "d1eceead.adafe",
+        "y": 6482.016571044922,
+        "z": "8bd89607.6248d8",
         "wires": [
             []
         ]
     },
     {
-        "id": "21b3d920.ac879e",
+        "id": "b162e50d.7cae58",
         "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 delete ethernet service rest api\" />\n",
         "comments": "",
         "x": 4197.966064453125,
-        "y": 6439.016571044922,
-        "z": "d1eceead.adafe",
+        "y": 6442.016571044922,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "7da0f639.3db538",
+        "id": "977d12a.f8bd9f",
         "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.domain.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domain.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
         "x": 4354.4658203125,
-        "y": 5992.016571044922,
-        "z": "d1eceead.adafe",
+        "y": 5995.016571044922,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "2a4fa91b.b928a6",
-                "3708f6c9.39ed2a",
-                "7ad7cb3f.866b74"
+                "7f661594.98b80c",
+                "b4244919.5b3fa8",
+                "fd8c4c61.cc25e8"
             ]
         ]
     },
     {
-        "id": "cb51edb2.a6957",
+        "id": "e5e99dd1.35ed8",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domain id",
         "xml": "<set>\n<parameter name='tmp.domain.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
         "x": 4384.4658203125,
-        "y": 5940.016571044922,
-        "z": "d1eceead.adafe",
+        "y": 5943.016571044922,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "2a4fa91b.b928a6",
+        "id": "7f661594.98b80c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4564.4658203125,
-        "y": 5983.016571044922,
-        "z": "d1eceead.adafe",
+        "y": 5986.016571044922,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "bee63261.4dfe28"
+                "b64e3b3c.b2614"
             ]
         ]
     },
     {
-        "id": "3708f6c9.39ed2a",
+        "id": "b4244919.5b3fa8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4556.4658203125,
-        "y": 6038.016571044922,
-        "z": "d1eceead.adafe",
+        "y": 6041.016571044922,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "9ceb2b97.8189"
+                "13dd75f8.aa1f6a"
             ]
         ]
     },
     {
-        "id": "7ad7cb3f.866b74",
+        "id": "fd8c4c61.cc25e8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
         "x": 4561.4658203125,
-        "y": 6095.016571044922,
-        "z": "d1eceead.adafe",
+        "y": 6098.016571044922,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "84d1d52.6203b28"
+                "67c0a219.8d5f1c"
             ]
         ]
     },
     {
-        "id": "dfe02514.308cd",
+        "id": "b449b2c0.535c38",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
         "x": 4304.4658203125,
-        "y": 6056.016571044922,
-        "z": "d1eceead.adafe",
+        "y": 6059.016571044922,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "84d1d52.6203b28",
+        "id": "67c0a219.8d5f1c",
         "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": 4713.4658203125,
-        "y": 6096.016571044922,
-        "z": "d1eceead.adafe",
+        "y": 6099.016571044922,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "9ceb2b97.8189",
+        "id": "13dd75f8.aa1f6a",
         "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": 4724.4658203125,
-        "y": 6041.016571044922,
-        "z": "d1eceead.adafe",
+        "y": 6044.016571044922,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "bee63261.4dfe28",
+        "id": "b64e3b3c.b2614",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -8596,88 +8475,88 @@
         "comments": "",
         "outputs": 1,
         "x": 4708.84814453125,
-        "y": 5980.6722412109375,
-        "z": "d1eceead.adafe",
+        "y": 5983.6722412109375,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "595ecbb0.cd7dfc"
+                "a6322085.6bb328"
             ]
         ]
     },
     {
-        "id": "595ecbb0.cd7dfc",
+        "id": "a6322085.6bb328",
         "type": "set",
         "name": "set controller domain data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.url' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.user' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.password' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
         "comments": "",
         "x": 4923.4658203125,
-        "y": 5977.016571044922,
-        "z": "d1eceead.adafe",
+        "y": 5980.016571044922,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "e8d2c16f.36acb",
+        "id": "90358f7a.3bc868",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.domain.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.connectivity.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.connectivity.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.connectivity.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.connectivity.access-node-id`\" />\n",
         "comments": "",
         "x": 1659.2332763671875,
-        "y": 6774.616668701172,
-        "z": "d1eceead.adafe",
+        "y": 6777.616668701172,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "656fa541.af35f4",
+        "id": "a442da27.96a27",
         "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.domain.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
         "x": 1685.2332763671875,
-        "y": 6891.616668701172,
-        "z": "d1eceead.adafe",
+        "y": 6894.616668701172,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "35de354f.e14d62",
-                "aedf728e.4bd508",
-                "d65aa6c1.4a58e"
+                "5457374d.6393a8",
+                "c43cf1bd.3a9c48",
+                "aafe4c92.ab6148"
             ]
         ]
     },
     {
-        "id": "35de354f.e14d62",
+        "id": "5457374d.6393a8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1880.7333984375,
-        "y": 6843.616668701172,
-        "z": "d1eceead.adafe",
+        "y": 6846.616668701172,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "5345535d.1f34d4"
+                "53717e38.4ed96"
             ]
         ]
     },
     {
-        "id": "aedf728e.4bd508",
+        "id": "c43cf1bd.3a9c48",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1872.7333984375,
-        "y": 6898.616668701172,
-        "z": "d1eceead.adafe",
+        "y": 6901.616668701172,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "20bec1fa.80674e"
+                "f440d45f.e2c3b"
             ]
         ]
     },
     {
-        "id": "5345535d.1f34d4",
+        "id": "53717e38.4ed96",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -8685,230 +8564,230 @@
         "comments": "",
         "outputs": 1,
         "x": 2015.1156005859375,
-        "y": 6838.272430419922,
-        "z": "d1eceead.adafe",
+        "y": 6841.272430419922,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "eb473582.da829"
+                "237db843.e1a28"
             ]
         ]
     },
     {
-        "id": "d65aa6c1.4a58e",
+        "id": "aafe4c92.ab6148",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1877.7333984375,
-        "y": 6955.616668701172,
-        "z": "d1eceead.adafe",
+        "y": 6958.616668701172,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "15a64cb6.b20343"
+                "f21c5384.45f0a8"
             ]
         ]
     },
     {
-        "id": "15a64cb6.b20343",
+        "id": "f21c5384.45f0a8",
         "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": 2029.7333984375,
-        "y": 6956.616668701172,
-        "z": "d1eceead.adafe",
+        "y": 6959.616668701172,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "20bec1fa.80674e",
+        "id": "f440d45f.e2c3b",
         "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": 2040.7333984375,
-        "y": 6899.616668701172,
-        "z": "d1eceead.adafe",
+        "y": 6902.616668701172,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "eb473582.da829",
+        "id": "237db843.e1a28",
         "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": 2202.2327880859375,
-        "y": 6839.616668701172,
-        "z": "d1eceead.adafe",
+        "y": 6842.616668701172,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "b73dec8d.f89198"
+                "df53e846.0627d8"
             ]
         ]
     },
     {
-        "id": "b73dec8d.f89198",
+        "id": "df53e846.0627d8",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2443.2327880859375,
-        "y": 6830.616668701172,
-        "z": "d1eceead.adafe",
+        "y": 6833.616668701172,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "1ceb2f26.68ec79"
+                "1dea4397.4ddefc"
             ]
         ]
     },
     {
-        "id": "8e7e1d35.45d4c8",
+        "id": "ddd8f461.6b9a28",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 2800.2325439453125,
-        "y": 6779.616668701172,
-        "z": "d1eceead.adafe",
+        "y": 6782.616668701172,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "a1ade3fe.d4148",
-                "2a08582e.e9a11",
-                "a2d9c162.524c1"
+                "da1d6ae3.19a4a",
+                "f17b263b.0b92b8",
+                "e6be1026.0fc218"
             ]
         ]
     },
     {
-        "id": "1ceb2f26.68ec79",
+        "id": "1dea4397.4ddefc",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2649.2327880859375,
-        "y": 6827.616668701172,
-        "z": "d1eceead.adafe",
+        "y": 6830.616668701172,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "8e7e1d35.45d4c8"
+                "ddd8f461.6b9a28"
             ]
         ]
     },
     {
-        "id": "2a08582e.e9a11",
+        "id": "f17b263b.0b92b8",
         "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.domain.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domain.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
         "x": 3006.2325439453125,
-        "y": 6792.616668701172,
-        "z": "d1eceead.adafe",
+        "y": 6795.616668701172,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "cc4e4323.ff0c8",
-                "37454266.958e06",
-                "fc54918e.b07f78"
+                "93d3ae4.c48255",
+                "a8b7b61a.880ff",
+                "1b334b23.690f3d"
             ]
         ]
     },
     {
-        "id": "a2d9c162.524c1",
+        "id": "e6be1026.0fc218",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
         "x": 2956.2325439453125,
-        "y": 6856.616668701172,
-        "z": "d1eceead.adafe",
+        "y": 6859.616668701172,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "a1ade3fe.d4148",
+        "id": "da1d6ae3.19a4a",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domain id",
         "xml": "<set>\n<parameter name='tmp.domain.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
         "x": 3036.2325439453125,
-        "y": 6740.616668701172,
-        "z": "d1eceead.adafe",
+        "y": 6743.616668701172,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "cc4e4323.ff0c8",
+        "id": "93d3ae4.c48255",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3216.2325439453125,
-        "y": 6783.616668701172,
-        "z": "d1eceead.adafe",
+        "y": 6786.616668701172,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "e3f7ab37.cd3338"
+                "38012aaa.4db4be"
             ]
         ]
     },
     {
-        "id": "37454266.958e06",
+        "id": "a8b7b61a.880ff",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3208.2325439453125,
-        "y": 6838.616668701172,
-        "z": "d1eceead.adafe",
+        "y": 6841.616668701172,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "c423f303.cf0fc"
+                "3b0a565e.7b9b52"
             ]
         ]
     },
     {
-        "id": "fc54918e.b07f78",
+        "id": "1b334b23.690f3d",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
         "x": 3213.2325439453125,
-        "y": 6895.616668701172,
-        "z": "d1eceead.adafe",
+        "y": 6898.616668701172,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "f7cc4fee.3d03d8"
+                "a42eaf3a.6fbc5"
             ]
         ]
     },
     {
-        "id": "f7cc4fee.3d03d8",
+        "id": "a42eaf3a.6fbc5",
         "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": 3365.2325439453125,
-        "y": 6896.616668701172,
-        "z": "d1eceead.adafe",
+        "y": 6899.616668701172,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "c423f303.cf0fc",
+        "id": "3b0a565e.7b9b52",
         "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": 3376.2325439453125,
-        "y": 6841.616668701172,
-        "z": "d1eceead.adafe",
+        "y": 6844.616668701172,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "e3f7ab37.cd3338",
+        "id": "38012aaa.4db4be",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
@@ -8916,141 +8795,141 @@
         "comments": "",
         "outputs": 1,
         "x": 3360.6148681640625,
-        "y": 6781.2723388671875,
-        "z": "d1eceead.adafe",
+        "y": 6784.2723388671875,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "a32f770f.0bf93"
+                "2c7d526d.80fc76"
             ]
         ]
     },
     {
-        "id": "a32f770f.0bf93",
+        "id": "2c7d526d.80fc76",
         "type": "set",
         "name": "set controller domain data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.url' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.user' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.password' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
         "comments": "",
         "x": 3575.2325439453125,
-        "y": 6777.616668701172,
-        "z": "d1eceead.adafe",
+        "y": 6780.616668701172,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "5c661b6d.db566c",
+        "id": "468cb6c4.ffb168",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
         "x": 1451.2332763671875,
-        "y": 6902.616668701172,
-        "z": "d1eceead.adafe",
+        "y": 6905.616668701172,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "e8d2c16f.36acb",
-                "656fa541.af35f4",
-                "f25051a6.fa4e28"
+                "90358f7a.3bc868",
+                "a442da27.96a27",
+                "12fc611d.1c5a0f"
             ]
         ]
     },
     {
-        "id": "f25051a6.fa4e28",
+        "id": "12fc611d.1c5a0f",
         "type": "switchNode",
         "name": "switch connectivity has ethernet service",
         "xml": "<switch test='`$tmp.aai.connectivity.etht-svc-name`'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1733.433349609375,
-        "y": 7043.816864013672,
-        "z": "d1eceead.adafe",
+        "y": 7046.816864013672,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "81385ecf.138098",
-                "de989c54.09997"
+                "fd3fa457.558cb8",
+                "5e9ee12a.d5b628"
             ]
         ]
     },
     {
-        "id": "de989c54.09997",
+        "id": "5e9ee12a.d5b628",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1986.433349609375,
-        "y": 7021.816864013672,
-        "z": "d1eceead.adafe",
+        "y": 7024.816864013672,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "78a6b529.99c6a4"
+                "c43e864.6fdea78"
             ]
         ]
     },
     {
-        "id": "81385ecf.138098",
+        "id": "fd3fa457.558cb8",
         "type": "outcome",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
         "x": 1986.433349609375,
-        "y": 7077.816864013672,
-        "z": "d1eceead.adafe",
+        "y": 7080.816864013672,
+        "z": "8bd89607.6248d8",
         "wires": [
             []
         ]
     },
     {
-        "id": "78a6b529.99c6a4",
+        "id": "c43e864.6fdea78",
         "type": "execute",
         "name": "execute RestApiCallNode Delete ethernet Service without token",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.aai.connectivity.etht-svc-name`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<!--<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",
         "comments": "",
         "outputs": 1,
         "x": 2336.432861328125,
-        "y": 7011.816864013672,
-        "z": "d1eceead.adafe",
+        "y": 7014.816864013672,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "a19873b6.a4d6e",
-                "94634cdd.23be6"
+                "d8cf4668.e6bf58",
+                "fc9a7200.07e08"
             ]
         ]
     },
     {
-        "id": "a19873b6.a4d6e",
+        "id": "d8cf4668.e6bf58",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2668.932861328125,
-        "y": 6985.816864013672,
-        "z": "d1eceead.adafe",
+        "y": 6988.816864013672,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "2dad16ef.224d22"
+                "fa6e7b78.6ccd98"
             ]
         ]
     },
     {
-        "id": "94634cdd.23be6",
+        "id": "fc9a7200.07e08",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 2672.932861328125,
-        "y": 7025.816864013672,
-        "z": "d1eceead.adafe",
+        "y": 7028.816864013672,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "4ffd9da0.18218c"
+                "f96cab06.f1bd18"
             ]
         ]
     },
     {
-        "id": "4ffd9da0.18218c",
+        "id": "f96cab06.f1bd18",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
@@ -9058,85 +8937,85 @@
         "comments": "",
         "outputs": 1,
         "x": 2860.432861328125,
-        "y": 7029.816864013672,
-        "z": "d1eceead.adafe",
+        "y": 7032.816864013672,
+        "z": "8bd89607.6248d8",
         "wires": [
             []
         ]
     },
     {
-        "id": "2dad16ef.224d22",
+        "id": "fa6e7b78.6ccd98",
         "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 delete ethernet service rest api\" />\n",
         "comments": "",
         "x": 2856.932861328125,
-        "y": 6989.816864013672,
-        "z": "d1eceead.adafe",
+        "y": 6992.816864013672,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "8d45971b.519e08",
+        "id": "6504876a.65a0e",
         "type": "execute",
         "name": "execute RestApiCallNode Delete Underlay OTN tunnel from the LEAF ethernet Service",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.leafconn.etht-svc-name + '/underlay/otn-tunnels=' + $tmp.underlayOTN`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<!--<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",
         "comments": "",
         "outputs": 1,
         "x": 1089.25,
-        "y": 4729.39990234375,
-        "z": "d1eceead.adafe",
+        "y": 4732.39990234375,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "5dcba2e4.9fe114",
-                "1fae83d7.8f54e4"
+                "2f2c7d69.04a202",
+                "749e3757.254fd8"
             ]
         ]
     },
     {
-        "id": "5dcba2e4.9fe114",
+        "id": "2f2c7d69.04a202",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1517.749755859375,
-        "y": 4717.39990234375,
-        "z": "d1eceead.adafe",
+        "y": 4720.39990234375,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "504ce75b.b6442"
+                "e83630dc.e1ba"
             ]
         ]
     },
     {
-        "id": "1fae83d7.8f54e4",
+        "id": "749e3757.254fd8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
         "x": 1521.749755859375,
-        "y": 4757.39990234375,
-        "z": "d1eceead.adafe",
+        "y": 4760.39990234375,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "2463a8bc.d76748"
+                "28010736.1a772"
             ]
         ]
     },
     {
-        "id": "504ce75b.b6442",
+        "id": "e83630dc.e1ba",
         "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 delete ethernet service rest api\" />\n",
         "comments": "",
         "x": 1675.749755859375,
-        "y": 4717.39990234375,
-        "z": "d1eceead.adafe",
+        "y": 4720.39990234375,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "2463a8bc.d76748",
+        "id": "28010736.1a772",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
@@ -9144,14 +9023,14 @@
         "comments": "",
         "outputs": 1,
         "x": 1679.249755859375,
-        "y": 4757.39990234375,
-        "z": "d1eceead.adafe",
+        "y": 4760.39990234375,
+        "z": "8bd89607.6248d8",
         "wires": [
             []
         ]
     },
     {
-        "id": "b2c9765c.25999",
+        "id": "2f2661a7.5dc1e6",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
@@ -9159,71 +9038,2046 @@
         "comments": "",
         "outputs": 1,
         "x": 5113,
-        "y": 5050,
-        "z": "d1eceead.adafe",
+        "y": 5053,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "86e944dc.0c4178",
-                "5fccecfa.290f3c",
-                "76c53fa0.8ab25"
+                "ae15e960.f1e88",
+                "28b0c0f7.1a36d8",
+                "8a83aff9.8ddf38"
             ]
         ]
     },
     {
-        "id": "76c53fa0.8ab25",
+        "id": "8a83aff9.8ddf38",
         "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": 5340,
-        "y": 4995,
-        "z": "d1eceead.adafe",
+        "y": 4998,
+        "z": "8bd89607.6248d8",
         "wires": []
     },
     {
-        "id": "86e944dc.0c4178",
+        "id": "ae15e960.f1e88",
         "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": 5494,
-        "y": 5047,
-        "z": "d1eceead.adafe",
+        "y": 5050,
+        "z": "8bd89607.6248d8",
         "wires": [
             []
         ]
     },
     {
-        "id": "5fccecfa.290f3c",
+        "id": "28b0c0f7.1a36d8",
         "type": "switchNode",
         "name": "switch $foundVpnName",
         "xml": "<switch test=\"`$foundVpnName`\">\n\n",
         "comments": "",
         "outputs": 1,
         "x": 5339,
-        "y": 5102,
-        "z": "d1eceead.adafe",
+        "y": 5105,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "2a17f2a1.8a9c0e"
+                "48fdd2f1.2b095c"
             ]
         ]
     },
     {
-        "id": "2a17f2a1.8a9c0e",
+        "id": "48fdd2f1.2b095c",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
         "x": 5518,
-        "y": 5101,
-        "z": "d1eceead.adafe",
+        "y": 5104,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            [
+                "a26e073.3ca98f8"
+            ]
+        ]
+    },
+    {
+        "id": "e3b4a4d3.b60598",
+        "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": 3380.249969482422,
+        "y": 459,
+        "z": "8bd89607.6248d8",
+        "wires": []
+    },
+    {
+        "id": "22dcd918.a9e88e",
+        "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": 3344.249969482422,
+        "y": 709,
+        "z": "8bd89607.6248d8",
+        "wires": []
+    },
+    {
+        "id": "1743864d.d3d2f2",
+        "type": "switchNode",
+        "name": "switch secondary empty?",
+        "xml": "<switch test='`length($network-route-three) == 0`'>\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3347.666473388672,
+        "y": 751.2499694824219,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            [
+                "a9f40bfb.e2369",
+                "3b2a9389.6292cc"
+            ]
+        ]
+    },
+    {
+        "id": "a9f40bfb.e2369",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3586.6663513183594,
+        "y": 587.25,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            [
+                "143a1a38.4be736"
+            ]
+        ]
+    },
+    {
+        "id": "3b2a9389.6292cc",
+        "type": "outcomeFalse",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3595.6663513183594,
+        "y": 634.25,
+        "z": "8bd89607.6248d8",
         "wires": [
             [
-                "a5ecb13c.9c7548"
+                "90836078.d811b"
             ]
         ]
+    },
+    {
+        "id": "90836078.d811b",
+        "type": "set",
+        "name": "set hasSecondary true",
+        "xml": "<set>\n<parameter name='hasSecondary' value=\"true\" />\n\n\n",
+        "comments": "",
+        "x": 3809.6663513183594,
+        "y": 628.25,
+        "z": "8bd89607.6248d8",
+        "wires": []
+    },
+    {
+        "id": "143a1a38.4be736",
+        "type": "set",
+        "name": "set hasSecondary false",
+        "xml": "<set>\n<parameter name='hasSecondary' value=\"false\" />\n\n\n",
+        "comments": "",
+        "x": 3813.6663513183594,
+        "y": 584.25,
+        "z": "8bd89607.6248d8",
+        "wires": []
+    },
+    {
+        "id": "c2039341.ed7fe",
+        "type": "outcome",
+        "name": "SECONDARY-ROOT",
+        "xml": "<outcome value='SECONDARY-ROOT'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4175.700408935547,
+        "y": 537.699951171875,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            [
+                "8f42381e.256918"
+            ]
+        ]
+    },
+    {
+        "id": "8f42381e.256918",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 4349.700408935547,
+        "y": 532.699951171875,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            [
+                "2dfbe8eb.6df208",
+                "ae5efca5.b13ee"
+            ]
+        ]
+    },
+    {
+        "id": "2dfbe8eb.6df208",
+        "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": 4593.700653076172,
+        "y": 524.699951171875,
+        "z": "8bd89607.6248d8",
+        "wires": []
+    },
+    {
+        "id": "ae5efca5.b13ee",
+        "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": 4539.700653076172,
+        "y": 564.699951171875,
+        "z": "8bd89607.6248d8",
+        "wires": []
+    },
+    {
+        "id": "49cd1e6.2c21e6",
+        "type": "outcome",
+        "name": "SECONDARY-ROOT",
+        "xml": "<outcome value='SECONDARY-ROOT'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4144.700408935547,
+        "y": 767.0999755859375,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            [
+                "37d7c141.43238e"
+            ]
+        ]
+    },
+    {
+        "id": "37d7c141.43238e",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 4302.700164794922,
+        "y": 810.0997924804688,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            [
+                "3e1881a7.808dae",
+                "e3ee5030.818c18"
+            ]
+        ]
+    },
+    {
+        "id": "3e1881a7.808dae",
+        "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": 4524.700164794922,
+        "y": 796.0999145507812,
+        "z": "8bd89607.6248d8",
+        "wires": []
+    },
+    {
+        "id": "e3ee5030.818c18",
+        "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": 4470.700164794922,
+        "y": 836.0999145507812,
+        "z": "8bd89607.6248d8",
+        "wires": []
+    },
+    {
+        "id": "898efbe9.b7aab8",
+        "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": 3356.133270263672,
+        "y": 1003.333251953125,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            [
+                "648675ef.25d1f4",
+                "2e60c86e.fc1c08",
+                "80896ca0.c29cc8"
+            ]
+        ]
+    },
+    {
+        "id": "648675ef.25d1f4",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3596.133270263672,
+        "y": 986.333251953125,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "2e60c86e.fc1c08",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3591.642333984375,
+        "y": 1028.7593078613281,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "80896ca0.c29cc8",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3595.642303466797,
+        "y": 1076.75927734375,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            [
+                "1a4bd447.a95bf4"
+            ]
+        ]
+    },
+    {
+        "id": "1a4bd447.a95bf4",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 3751.133270263672,
+        "y": 1046.3331909179688,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            [
+                "caee9e1d.8e2348"
+            ]
+        ]
+    },
+    {
+        "id": "caee9e1d.8e2348",
+        "type": "switchNode",
+        "name": "switch nr type",
+        "xml": "<switch test='`$tmp.aai.network-route-three.type`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3873.133270263672,
+        "y": 993.3331909179688,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            [
+                "63dc4834.c55f2",
+                "861e97a1.4a94",
+                "50fdf697.5f0398"
+            ]
+        ]
+    },
+    {
+        "id": "63dc4834.c55f2",
+        "type": "outcome",
+        "name": "ROOT",
+        "xml": "<outcome value='ROOT'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4109.133270263672,
+        "y": 843.3331909179688,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            [
+                "15fc5ae7.def135"
+            ]
+        ]
+    },
+    {
+        "id": "861e97a1.4a94",
+        "type": "outcome",
+        "name": "LEAF",
+        "xml": "<outcome value='LEAF'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4105.133270263672,
+        "y": 899.3331909179688,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            [
+                "de3f550a.e65dd8"
+            ]
+        ]
+    },
+    {
+        "id": "15fc5ae7.def135",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 4235.133270263672,
+        "y": 851.3331909179688,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            [
+                "a2d4f205.05df18",
+                "97e552b.298d73"
+            ]
+        ]
+    },
+    {
+        "id": "de3f550a.e65dd8",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 4238.133270263672,
+        "y": 904.3331909179688,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            [
+                "77158a83.3502bc",
+                "fb7ab28b.9d9ce8"
+            ]
+        ]
+    },
+    {
+        "id": "50fdf697.5f0398",
+        "type": "outcome",
+        "name": "SECONDARY-ROOT",
+        "xml": "<outcome value='SECONDARY-ROOT'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4098.133270263672,
+        "y": 977.3331909179688,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            [
+                "4a03238e.72a4b4"
+            ]
+        ]
+    },
+    {
+        "id": "4a03238e.72a4b4",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 4254.133270263672,
+        "y": 998.3331909179688,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            [
+                "8f9b7ac9.e6c508",
+                "4399bcd6.51e06c"
+            ]
+        ]
+    },
+    {
+        "id": "a2d4f205.05df18",
+        "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": 4482.133270263672,
+        "y": 881.3331909179688,
+        "z": "8bd89607.6248d8",
+        "wires": []
+    },
+    {
+        "id": "97e552b.298d73",
+        "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": 4474.133270263672,
+        "y": 923.3331909179688,
+        "z": "8bd89607.6248d8",
+        "wires": []
+    },
+    {
+        "id": "77158a83.3502bc",
+        "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": 4475.133270263672,
+        "y": 975.3331909179688,
+        "z": "8bd89607.6248d8",
+        "wires": []
+    },
+    {
+        "id": "fb7ab28b.9d9ce8",
+        "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": 4462.133270263672,
+        "y": 1015.3331909179688,
+        "z": "8bd89607.6248d8",
+        "wires": []
+    },
+    {
+        "id": "4399bcd6.51e06c",
+        "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": 4436.133270263672,
+        "y": 1109.3331909179688,
+        "z": "8bd89607.6248d8",
+        "wires": []
+    },
+    {
+        "id": "8f9b7ac9.e6c508",
+        "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": 4498.133270263672,
+        "y": 1065.3331909179688,
+        "z": "8bd89607.6248d8",
+        "wires": []
+    },
+    {
+        "id": "ac53fadb.549658",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 3700.13330078125,
+        "y": 2249,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            [
+                "a75c6a9f.cbf01",
+                "92c4a208.e0cb28"
+            ]
+        ]
+    },
+    {
+        "id": "c76e7c83.8acf1",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3527.466796875,
+        "y": 2250,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            [
+                "ac53fadb.549658"
+            ]
+        ]
+    },
+    {
+        "id": "ac317b44.b3b988",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3536.957763671875,
+        "y": 2292.5740356445312,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "a866b4cc.e0caa",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3525.466796875,
+        "y": 2339,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "a75c6a9f.cbf01",
+        "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": 3990.466796875,
+        "y": 2265,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            [
+                "af57ae08.dd681",
+                "e5cbeb5f.6e9468"
+            ]
+        ]
+    },
+    {
+        "id": "e5cbeb5f.6e9468",
+        "type": "failure",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4213.466796875,
+        "y": 2220,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            [
+                "5a256296.5bc59c"
+            ]
+        ]
+    },
+    {
+        "id": "af57ae08.dd681",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4215.466796875,
+        "y": 2284,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            [
+                "c3ad5792.8dfac"
+            ]
+        ]
+    },
+    {
+        "id": "f7bdbced.e4e6e",
+        "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": 3321.466796875,
+        "y": 2271,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            [
+                "c76e7c83.8acf1",
+                "ac317b44.b3b988",
+                "a866b4cc.e0caa"
+            ]
+        ]
+    },
+    {
+        "id": "4d6bf9fc.2af3d8",
+        "type": "comment",
+        "name": "Question?",
+        "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
+        "comments": "",
+        "x": 3260.466796875,
+        "y": 2229,
+        "z": "8bd89607.6248d8",
+        "wires": []
+    },
+    {
+        "id": "3ddfa25a.4bc3f6",
+        "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": 3341.466796875,
+        "y": 2119,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            [
+                "1f8f213c.23a987",
+                "723c86fe.b2129"
+            ]
+        ]
+    },
+    {
+        "id": "723c86fe.b2129",
+        "type": "failure",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3564.466796875,
+        "y": 2105,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            [
+                "2b76ade7.37f3aa"
+            ]
+        ]
+    },
+    {
+        "id": "1f8f213c.23a987",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3566.466796875,
+        "y": 2138,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "2b76ade7.37f3aa",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 3712.466796875,
+        "y": 2098,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            [
+                "a96a9fab.149bd",
+                "6bae074d.4cc69"
+            ]
+        ]
+    },
+    {
+        "id": "a96a9fab.149bd",
+        "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": 3904.4666748046875,
+        "y": 2035,
+        "z": "8bd89607.6248d8",
+        "wires": []
+    },
+    {
+        "id": "92c4a208.e0cb28",
+        "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": 3971.466796875,
+        "y": 2396,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            [
+                "fb667e00.cdee38"
+            ]
+        ]
+    },
+    {
+        "id": "fb667e00.cdee38",
+        "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": 4177.466796875,
+        "y": 2396,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            [
+                "7f231a25.219aec"
+            ]
+        ]
+    },
+    {
+        "id": "6bae074d.4cc69",
+        "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": 3926.4666748046875,
+        "y": 2103,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            [
+                "6f9fafbd.595338",
+                "5fece99f.57a078",
+                "53c7941c.fd6f84"
+            ]
+        ]
+    },
+    {
+        "id": "6f9fafbd.595338",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4121.966796875,
+        "y": 2055,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            [
+                "1ef2a52f.ce58c3"
+            ]
+        ]
+    },
+    {
+        "id": "5fece99f.57a078",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4113.966796875,
+        "y": 2110,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            [
+                "d353a27e.170a88"
+            ]
+        ]
+    },
+    {
+        "id": "53c7941c.fd6f84",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4118.966796875,
+        "y": 2167,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            [
+                "815f83cf.c9ecf"
+            ]
+        ]
+    },
+    {
+        "id": "815f83cf.c9ecf",
+        "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": 4270.966796875,
+        "y": 2168,
+        "z": "8bd89607.6248d8",
+        "wires": []
+    },
+    {
+        "id": "1ef2a52f.ce58c3",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 4266.34912109375,
+        "y": 2052.6556701660156,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            [
+                "df579443.2dfaa"
+            ]
+        ]
+    },
+    {
+        "id": "b2f7d29a.c36bc8",
+        "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": 3322.13330078125,
+        "y": 2364,
+        "z": "8bd89607.6248d8",
+        "wires": []
+    },
+    {
+        "id": "29a75985.a4b2ae",
+        "type": "comment",
+        "name": "NOT NEEDED ANYMORE?",
+        "info": "",
+        "comments": "",
+        "x": 4001.133270263672,
+        "y": 2339.9998474121094,
+        "z": "8bd89607.6248d8",
+        "wires": []
+    },
+    {
+        "id": "c3ad5792.8dfac",
+        "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": 4374.466796875,
+        "y": 2303,
+        "z": "8bd89607.6248d8",
+        "wires": []
+    },
+    {
+        "id": "5a256296.5bc59c",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 4378.466796875,
+        "y": 2217,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            [
+                "a0a57c60.9feaa",
+                "8f9217bc.ce51e"
+            ]
+        ]
+    },
+    {
+        "id": "7f231a25.219aec",
+        "type": "outcome",
+        "name": "tunnel-termination-point",
+        "xml": "<outcome value='tunnel-termination-point'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4394.75244140625,
+        "y": 2394.82177734375,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            [
+                "f1964530.52cb1"
+            ]
+        ]
+    },
+    {
+        "id": "d353a27e.170a88",
+        "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": 4281.966796875,
+        "y": 2113,
+        "z": "8bd89607.6248d8",
+        "wires": []
+    },
+    {
+        "id": "a0a57c60.9feaa",
+        "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": 4548.466796875,
+        "y": 2178,
+        "z": "8bd89607.6248d8",
+        "wires": []
+    },
+    {
+        "id": "8f9217bc.ce51e",
+        "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": 4549.466796875,
+        "y": 2283,
+        "z": "8bd89607.6248d8",
+        "wires": []
+    },
+    {
+        "id": "1ea5e7d3.f23f9",
+        "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": 4544.466796875,
+        "y": 2232,
+        "z": "8bd89607.6248d8",
+        "wires": []
+    },
+    {
+        "id": "f1964530.52cb1",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 4601.583984375,
+        "y": 2384.3404541015625,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            [
+                "cbbeb825.19f92",
+                "b0c2600a.46c7c",
+                "511030eb.63bcc8"
+            ]
+        ]
+    },
+    {
+        "id": "cbbeb825.19f92",
+        "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": 4816.583984375,
+        "y": 2346.3404541015625,
+        "z": "8bd89607.6248d8",
+        "wires": []
+    },
+    {
+        "id": "b0c2600a.46c7c",
+        "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": 4813.583984375,
+        "y": 2385.3404541015625,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            [
+                "ce425175.45de18"
+            ]
+        ]
+    },
+    {
+        "id": "511030eb.63bcc8",
+        "type": "break",
+        "name": "break",
+        "xml": "<break>\n",
+        "comments": "",
+        "x": 4769.083984375,
+        "y": 2427.3404541015625,
+        "z": "8bd89607.6248d8",
+        "wires": []
+    },
+    {
+        "id": "b757d82d.12f65",
+        "type": "outcome",
+        "name": "esr-thirdparty-sdnc",
+        "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4850.466796875,
+        "y": 2137.0001220703125,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            [
+                "8ab896d8.87229"
+            ]
+        ]
+    },
+    {
+        "id": "df579443.2dfaa",
+        "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": 4450.4666748046875,
+        "y": 2067,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            [
+                "51046da7.24d494"
+            ]
+        ]
+    },
+    {
+        "id": "51046da7.24d494",
+        "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": 4647.466796875,
+        "y": 2133.0001220703125,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            [
+                "b757d82d.12f65",
+                "4ad69efc.b2bd68"
+            ]
+        ]
+    },
+    {
+        "id": "4ad69efc.b2bd68",
+        "type": "outcome",
+        "name": "network-resource",
+        "xml": "<outcome value='network-resource'>",
+        "comments": "",
+        "outputs": 1,
+        "x": 4852.466796875,
+        "y": 2210.0001220703125,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            [
+                "a0ad2556.3951b8"
+            ]
+        ]
+    },
+    {
+        "id": "ce425175.45de18",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4994.083984375,
+        "y": 2384.3404541015625,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            [
+                "822b3c7.3a67ac"
+            ]
+        ]
+    },
+    {
+        "id": "822b3c7.3a67ac",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 5152.083984375,
+        "y": 2384.3404541015625,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            [
+                "71be1479.f150cc"
+            ]
+        ]
+    },
+    {
+        "id": "71be1479.f150cc",
+        "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": 5359.083984375,
+        "y": 2384.3404541015625,
+        "z": "8bd89607.6248d8",
+        "wires": []
+    },
+    {
+        "id": "8ab896d8.87229",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 5027.466796875,
+        "y": 2129.0001220703125,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            [
+                "d7fa69fb.085438",
+                "ce745876.37fbb"
+            ]
+        ]
+    },
+    {
+        "id": "ce745876.37fbb",
+        "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": 5235.466796875,
+        "y": 2136.0001220703125,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            [
+                "10a5091f.ce791f",
+                "70c5216d.20762",
+                "eee03948.c8ee08"
+            ]
+        ]
+    },
+    {
+        "id": "a0ad2556.3951b8",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 5029.466796875,
+        "y": 2202.0001220703125,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            [
+                "dba8eb8b.b7ea7"
+            ]
+        ]
+    },
+    {
+        "id": "d7fa69fb.085438",
+        "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": 5265.466796875,
+        "y": 2084.0001220703125,
+        "z": "8bd89607.6248d8",
+        "wires": []
+    },
+    {
+        "id": "dba8eb8b.b7ea7",
+        "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": 5264.466796875,
+        "y": 2326.0001220703125,
+        "z": "8bd89607.6248d8",
+        "wires": []
+    },
+    {
+        "id": "10a5091f.ce791f",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5445.466796875,
+        "y": 2127.0001220703125,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            [
+                "d091f788.e8c778"
+            ]
+        ]
+    },
+    {
+        "id": "70c5216d.20762",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5437.466796875,
+        "y": 2182.0001220703125,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            [
+                "52797bd8.2181a4"
+            ]
+        ]
+    },
+    {
+        "id": "eee03948.c8ee08",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5442.466796875,
+        "y": 2239.0001220703125,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            [
+                "a5f87747.8903"
+            ]
+        ]
+    },
+    {
+        "id": "a5f87747.8903",
+        "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": 5594.466796875,
+        "y": 2240.0001220703125,
+        "z": "8bd89607.6248d8",
+        "wires": []
+    },
+    {
+        "id": "52797bd8.2181a4",
+        "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": 5605.466796875,
+        "y": 2185.0001220703125,
+        "z": "8bd89607.6248d8",
+        "wires": []
+    },
+    {
+        "id": "d091f788.e8c778",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 5589.84912109375,
+        "y": 2124.655792236328,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            [
+                "4f5aa4ec.a9ba44"
+            ]
+        ]
+    },
+    {
+        "id": "4f5aa4ec.a9ba44",
+        "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": 5804.466796875,
+        "y": 2121.0001220703125,
+        "z": "8bd89607.6248d8",
+        "wires": []
+    },
+    {
+        "id": "b98aea07.4499",
+        "type": "switchNode",
+        "name": "switch $hasSecondary",
+        "xml": "<switch test='`$hasSecondary`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3836.13330078125,
+        "y": 2733,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            [
+                "7d724c43.dd872c"
+            ]
+        ]
+    },
+    {
+        "id": "7d724c43.dd872c",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4027.13330078125,
+        "y": 2737,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            [
+                "c26943ed.871ed8"
+            ]
+        ]
+    },
+    {
+        "id": "c26943ed.871ed8",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 4154.13330078125,
+        "y": 2736,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            [
+                "a43135d6.d32b28"
+            ]
+        ]
+    },
+    {
+        "id": "a43135d6.d32b28",
+        "type": "save",
+        "name": "get secondary 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": 4380.467041015625,
+        "y": 2729.3336181640625,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            [
+                "a8ebbe95.3f6e4",
+                "38e80218.b5d4ce",
+                "b6cd2169.c74bc8"
+            ]
+        ]
+    },
+    {
+        "id": "a8ebbe95.3f6e4",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4747.466796875,
+        "y": 2623.33349609375,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            [
+                "e22da322.d0127"
+            ]
+        ]
+    },
+    {
+        "id": "38e80218.b5d4ce",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4742.975830078125,
+        "y": 2667.7594604492188,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            [
+                "cc355488.cae9f"
+            ]
+        ]
+    },
+    {
+        "id": "b6cd2169.c74bc8",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4738.975830078125,
+        "y": 2717.759521484375,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            [
+                "78c42cb1.03bbb4"
+            ]
+        ]
+    },
+    {
+        "id": "61178516.955b94",
+        "type": "save",
+        "name": "update SECONDARY-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": 5186.976318359375,
+        "y": 2712.7596435546875,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "e22da322.d0127",
+        "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": 4910.038330078125,
+        "y": 2622.6192016601562,
+        "z": "8bd89607.6248d8",
+        "wires": []
+    },
+    {
+        "id": "cc355488.cae9f",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+        "comments": "",
+        "x": 4910.975830078125,
+        "y": 2667.7594604492188,
+        "z": "8bd89607.6248d8",
+        "wires": []
+    },
+    {
+        "id": "78c42cb1.03bbb4",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 4907.975830078125,
+        "y": 2717.759521484375,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            [
+                "67900f7a.aee708",
+                "61178516.955b94"
+            ]
+        ]
+    },
+    {
+        "id": "67900f7a.aee708",
+        "type": "set",
+        "name": "set new bw",
+        "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.secondaryrootuni.data-source - $bwToBeDecreased`' />\n",
+        "comments": "",
+        "x": 5089.9765625,
+        "y": 2659.759521484375,
+        "z": "8bd89607.6248d8",
+        "wires": []
+    },
+    {
+        "id": "28b93260.26eace",
+        "type": "switchNode",
+        "name": "switch tmp.mmUNI-id-long != SECONDARY-ROOT UNI",
+        "xml": "\n<switch test=\"`$tmp.mmUNI-id-long != $tmp.SECONDARY-ROOT.uni-p-interface-long`\">\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4624.467041015625,
+        "y": 3573.333251953125,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            [
+                "462ac15.49ec0c"
+            ]
+        ]
+    },
+    {
+        "id": "462ac15.49ec0c",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4914.467041015625,
+        "y": 3575.333251953125,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            [
+                "db4c40a7.875698"
+            ]
+        ]
+    },
+    {
+        "id": "abf74f44.8bd74",
+        "type": "switchNode",
+        "name": "switch $hasSecondary",
+        "xml": "<switch test='`$hasSecondary`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4277,
+        "y": 5803.33349609375,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            [
+                "b3e521a4.a97f4"
+            ]
+        ]
+    },
+    {
+        "id": "b3e521a4.a97f4",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4468,
+        "y": 5807.33349609375,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            [
+                "aa154017.d63388"
+            ]
+        ]
+    },
+    {
+        "id": "aa154017.d63388",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 4595,
+        "y": 5806.33349609375,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            [
+                "ea396a9e.94917"
+            ]
+        ]
+    },
+    {
+        "id": "ea396a9e.94917",
+        "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": 4820.3330078125,
+        "y": 5808.33349609375,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            [
+                "4aa7a407.8eccb4",
+                "90951777.87e61"
+            ]
+        ]
+    },
+    {
+        "id": "4aa7a407.8eccb4",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5030.3330078125,
+        "y": 5785.33349609375,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            [
+                "6131b803.ead228"
+            ]
+        ]
+    },
+    {
+        "id": "90951777.87e61",
+        "type": "outcomeTrue",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5035.3330078125,
+        "y": 5834.33349609375,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            [
+                "9203f8f4.976da"
+            ]
+        ]
+    },
+    {
+        "id": "6131b803.ead228",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 5156.3330078125,
+        "y": 5785.33349609375,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "9203f8f4.976da",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 5153.3330078125,
+        "y": 5841.33349609375,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            [
+                "252aad6f.949002",
+                "2be015ab.396d82"
+            ]
+        ]
+    },
+    {
+        "id": "252aad6f.949002",
+        "type": "save",
+        "name": "update SECONDARY-ROOT connectivity resource in AAI",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Modified' />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5467.3330078125,
+        "y": 5900.33349609375,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "1524ee99.1e1cd1",
+        "type": "comment",
+        "name": "Update connectivity status to modified",
+        "info": "",
+        "comments": "",
+        "x": 5399.550048828125,
+        "y": 5852.13330078125,
+        "z": "8bd89607.6248d8",
+        "wires": []
+    },
+    {
+        "id": "2be015ab.396d82",
+        "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": 5598,
+        "y": 5810.33349609375,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "d39caf18.6babe",
+        "type": "switchNode",
+        "name": "switch $hasSecondary",
+        "xml": "<switch test='`$hasSecondary`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 868,
+        "y": 5000.3330078125,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            [
+                "bb5f541b.ab1a88"
+            ]
+        ]
+    },
+    {
+        "id": "bb5f541b.ab1a88",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1059,
+        "y": 5004.3330078125,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            [
+                "d475fb98.0c79f"
+            ]
+        ]
+    },
+    {
+        "id": "d475fb98.0c79f",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1186,
+        "y": 5003.3330078125,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            [
+                "4975d2d3.1f477c"
+            ]
+        ]
+    },
+    {
+        "id": "4975d2d3.1f477c",
+        "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": 1411.3330078125,
+        "y": 5005.3330078125,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            [
+                "78d676eb.347948",
+                "b9cebfbe.3a16d8"
+            ]
+        ]
+    },
+    {
+        "id": "78d676eb.347948",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1621.3330078125,
+        "y": 4982.3330078125,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            [
+                "be0beff9.053b6"
+            ]
+        ]
+    },
+    {
+        "id": "b9cebfbe.3a16d8",
+        "type": "outcomeTrue",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1626.3330078125,
+        "y": 5031.3330078125,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            [
+                "1ec18968.883e37"
+            ]
+        ]
+    },
+    {
+        "id": "be0beff9.053b6",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1747.3330078125,
+        "y": 4982.3330078125,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "1ec18968.883e37",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1744.3330078125,
+        "y": 5038.3330078125,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            [
+                "3f1c1ffb.4cacd8",
+                "643240ac.3a15a"
+            ]
+        ]
+    },
+    {
+        "id": "643240ac.3a15a",
+        "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": 2189,
+        "y": 5007.3330078125,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "16675ac.2ba7ba5",
+        "type": "comment",
+        "name": "Update connectivity status to modified",
+        "info": "",
+        "comments": "",
+        "x": 1990.550048828125,
+        "y": 5049.1328125,
+        "z": "8bd89607.6248d8",
+        "wires": []
+    },
+    {
+        "id": "3f1c1ffb.4cacd8",
+        "type": "save",
+        "name": "update SECONDARY-ROOT connectivity resource in AAI",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Modified' />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2058.3330078125,
+        "y": 5097.3330078125,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "68e0d31a.2e51f4",
+        "type": "switchNode",
+        "name": "switch $hasSecondary",
+        "xml": "<switch test='`$hasSecondary`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1470.3333740234375,
+        "y": 5841.33349609375,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            [
+                "2c8509f2.c5786e"
+            ]
+        ]
+    },
+    {
+        "id": "2c8509f2.c5786e",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1661.3333740234375,
+        "y": 5845.33349609375,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            [
+                "30f6f14a.076056"
+            ]
+        ]
+    },
+    {
+        "id": "30f6f14a.076056",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1788.3333740234375,
+        "y": 5844.33349609375,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            [
+                "b9a2493.fce2438"
+            ]
+        ]
+    },
+    {
+        "id": "b9a2493.fce2438",
+        "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": 2013.6663818359375,
+        "y": 5846.33349609375,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            [
+                "7c5427a0.bfcb2",
+                "2b71ce9a.05df6a"
+            ]
+        ]
+    },
+    {
+        "id": "7c5427a0.bfcb2",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2223.6663818359375,
+        "y": 5823.33349609375,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            [
+                "7c8ca33d.b99804"
+            ]
+        ]
+    },
+    {
+        "id": "2b71ce9a.05df6a",
+        "type": "outcomeTrue",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2228.6663818359375,
+        "y": 5872.33349609375,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            [
+                "af2e72.47de599"
+            ]
+        ]
+    },
+    {
+        "id": "7c8ca33d.b99804",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 2349.6663818359375,
+        "y": 5823.33349609375,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "af2e72.47de599",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 2346.6663818359375,
+        "y": 5879.33349609375,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            [
+                "2f308234.b92f6e",
+                "e716a684.8ec94"
+            ]
+        ]
+    },
+    {
+        "id": "e716a684.8ec94",
+        "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": 2791.3333740234375,
+        "y": 5848.33349609375,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "1f18634c.d886cd",
+        "type": "comment",
+        "name": "Update connectivity status to modified",
+        "info": "",
+        "comments": "",
+        "x": 2592.8834228515625,
+        "y": 5890.13330078125,
+        "z": "8bd89607.6248d8",
+        "wires": []
+    },
+    {
+        "id": "2f308234.b92f6e",
+        "type": "save",
+        "name": "update SECONDARY-ROOT connectivity resource in AAI",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Modified' />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2660.6663818359375,
+        "y": 5938.33349609375,
+        "z": "8bd89607.6248d8",
+        "wires": [
+            []
+        ]
     }
 ]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn.json b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn.json
new file mode 100644
index 00000000..83a5bf97
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn.json
@@ -0,0 +1,611 @@
+[
+  {
+    "id": "2e93c168.6c7176",
+    "type": "dgstart",
+    "name": "DGSTART",
+    "outputs": 1,
+    "x": 131,
+    "y": 94,
+    "z": "e702f568.a82608",
+    "wires": [
+      [
+        "f3472611.3b3a7"
+      ]
+    ]
+  },
+  {
+    "id": "f3472611.3b3a7",
+    "type": "service-logic",
+    "name": "GENERIC-RESOURCE-API ${project.version}",
+    "module": "GENERIC-RESOURCE-API",
+    "version": "${project.version}",
+    "comments": "",
+    "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
+    "outputs": 1,
+    "x": 415.2856903076172,
+    "y": 155.23810863494873,
+    "z": "e702f568.a82608",
+    "wires": [
+      [
+        "f934f601.250c68"
+      ]
+    ]
+  },
+  {
+    "id": "f934f601.250c68",
+    "type": "method",
+    "name": "method cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn",
+    "xml": "<method rpc='cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn' mode='sync'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 370.4285888671875,
+    "y": 247.00003051757812,
+    "z": "e702f568.a82608",
+    "wires": [
+      [
+        "f86b55e.289eca8"
+      ]
+    ]
+  },
+  {
+    "id": "f86b55e.289eca8",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 731.238037109375,
+    "y": 231.66668701171875,
+    "z": "e702f568.a82608",
+    "wires": [
+      [
+        "1711ba16.b9e5fe",
+        "86a57251.1116d",
+        "23642fea.37bce8",
+        "6091a27b.6e2de4"
+      ]
+    ]
+  },
+  {
+    "id": "1711ba16.b9e5fe",
+    "type": "save",
+    "name": "get all-connectivities from aai",
+    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"connectivities\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/connectivities/'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.helper-secondary-root-all-connectivities\" >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 216,
+    "y": 417,
+    "z": "e702f568.a82608",
+    "wires": [
+      [
+        "38d70593.a6db12",
+        "96ef9eda.72033",
+        "5388015d.ff79f"
+      ]
+    ]
+  },
+  {
+    "id": "38d70593.a6db12",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 460,
+    "y": 377,
+    "z": "e702f568.a82608",
+    "wires": [
+      [
+        "2b93fa95.52b74e"
+      ]
+    ]
+  },
+  {
+    "id": "96ef9eda.72033",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 457.490966796875,
+    "y": 426.57403564453125,
+    "z": "e702f568.a82608",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "5388015d.ff79f",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 455,
+    "y": 469,
+    "z": "e702f568.a82608",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "2b93fa95.52b74e",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 608,
+    "y": 378,
+    "z": "e702f568.a82608",
+    "wires": [
+      [
+        "79392e3f.01ffc"
+      ]
+    ]
+  },
+  {
+    "id": "79392e3f.01ffc",
+    "type": "for",
+    "name": "for helprconnidx in all-connectivities",
+    "xml": "<for index='helprconnidx' start='0' end='`$tmp.aai.helper-secondary-root-all-connectivities.connectivity_length`' >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 855,
+    "y": 373,
+    "z": "e702f568.a82608",
+    "wires": [
+      [
+        "c9f7846e.c314e8"
+      ]
+    ]
+  },
+  {
+    "id": "c9f7846e.c314e8",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic='true'>",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 1102,
+    "y": 379,
+    "z": "e702f568.a82608",
+    "wires": [
+      [
+        "4ef11ae0.e6fc9c"
+      ]
+    ]
+  },
+  {
+    "id": "6c5df52b.60f0f4",
+    "type": "switchNode",
+    "name": "switch color-aware is SECONDARY-ROOT?",
+    "xml": "\n<switch test=\"`$tmp.aai.helper-secondary-root-all-connectivities.connectivity[$helprconnidx].color-aware == $tmp.SECONDARY-ROOT.uni-p-interface-long`\">\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1726,
+    "y": 685,
+    "z": "e702f568.a82608",
+    "wires": [
+      [
+        "5664c742.62a48"
+      ]
+    ]
+  },
+  {
+    "id": "5664c742.62a48",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1977,
+    "y": 687,
+    "z": "e702f568.a82608",
+    "wires": [
+      [
+        "7c57a413.5a20b4"
+      ]
+    ]
+  },
+  {
+    "id": "7c57a413.5a20b4",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic='true'>",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 2134,
+    "y": 687,
+    "z": "e702f568.a82608",
+    "wires": [
+      [
+        "12b65787.e94718",
+        "74308533.8a66a4",
+        "4a39e664.0fb158"
+      ]
+    ]
+  },
+  {
+    "id": "86a57251.1116d",
+    "type": "set",
+    "name": "unset found-secondary-root-connectivity",
+    "xml": "<set>\n<parameter name='found-secondary-root-connectivity' value=\"false\" />\n",
+    "comments": "",
+    "x": 974,
+    "y": 146,
+    "z": "e702f568.a82608",
+    "wires": []
+  },
+  {
+    "id": "12b65787.e94718",
+    "type": "set",
+    "name": "set found-secondary-root-connectivity=true",
+    "xml": "<set>\n<parameter name='found-secondary-root-connectivity' value=\"true\" />\n",
+    "comments": "",
+    "x": 2395,
+    "y": 635,
+    "z": "e702f568.a82608",
+    "wires": []
+  },
+  {
+    "id": "74308533.8a66a4",
+    "type": "set",
+    "name": "set tmp.aai.SECONDARY-ROOT.connectivity.",
+    "xml": "<set>\n<parameter name='tmp.aai.SECONDARY-ROOT.connectivity.' value=\"`$tmp.aai.helper-secondary-root-all-connectivities.connectivity[$helprconnidx].`\" />\n",
+    "comments": "",
+    "x": 2459,
+    "y": 685,
+    "z": "e702f568.a82608",
+    "wires": []
+  },
+  {
+    "id": "23642fea.37bce8",
+    "type": "set",
+    "name": "unset tmp.aai.SECONDARY-ROOT.connectivity.",
+    "xml": "<set>\n<parameter name='tmp.aai.SECONDARY-ROOT.connectivity.' value=\"\" />\n",
+    "comments": "",
+    "x": 1058,
+    "y": 190,
+    "z": "e702f568.a82608",
+    "wires": []
+  },
+  {
+    "id": "4a39e664.0fb158",
+    "type": "break",
+    "name": "break",
+    "xml": "<break>\n",
+    "comments": "",
+    "x": 2326,
+    "y": 751,
+    "z": "e702f568.a82608",
+    "wires": []
+  },
+  {
+    "id": "31354cfe.c6bf2c",
+    "type": "switchNode",
+    "name": "switch conn type",
+    "xml": "<switch test=\"`$tmp.aai.helper-secondary-root-all-connectivities.connectivity[$helprconnidx].vpn-type`\">\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1723.8832397460938,
+    "y": 602.88330078125,
+    "z": "e702f568.a82608",
+    "wires": [
+      [
+        "f6ed55e.b6125a8"
+      ]
+    ]
+  },
+  {
+    "id": "f6ed55e.b6125a8",
+    "type": "outcome",
+    "name": "secondary-root",
+    "xml": "<outcome value='secondary-root'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1916.8832397460938,
+    "y": 602.8833312988281,
+    "z": "e702f568.a82608",
+    "wires": [
+      [
+        "5d637914.22c3c"
+      ]
+    ]
+  },
+  {
+    "id": "5d637914.22c3c",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 2059.8832397460938,
+    "y": 604.8833312988281,
+    "z": "e702f568.a82608",
+    "wires": [
+      [
+        "6c5df52b.60f0f4"
+      ]
+    ]
+  },
+  {
+    "id": "6091a27b.6e2de4",
+    "type": "set",
+    "name": "unset tmp.aai.helper-secondary-root-all-connectivities",
+    "xml": "<set>\n<parameter name='tmp.aai.helper-secondary-root-all-connectivities.' value=\"\" />\n",
+    "comments": "",
+    "x": 1072.11669921875,
+    "y": 244,
+    "z": "e702f568.a82608",
+    "wires": []
+  },
+  {
+    "id": "4ef11ae0.e6fc9c",
+    "type": "switchNode",
+    "name": "switch $hasSecondary",
+    "xml": "<switch test='`$hasSecondary`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 651.88330078125,
+    "y": 555.88330078125,
+    "z": "e702f568.a82608",
+    "wires": [
+      [
+        "eded3518.cefe88"
+      ]
+    ]
+  },
+  {
+    "id": "eded3518.cefe88",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 842.88330078125,
+    "y": 559.88330078125,
+    "z": "e702f568.a82608",
+    "wires": [
+      [
+        "ee6bd36d.011e28"
+      ]
+    ]
+  },
+  {
+    "id": "ee6bd36d.011e28",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 969.88330078125,
+    "y": 558.88330078125,
+    "z": "e702f568.a82608",
+    "wires": [
+      [
+        "8e3e5eb2.dcd14"
+      ]
+    ]
+  },
+  {
+    "id": "8e3e5eb2.dcd14",
+    "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": 1187.7666015625,
+    "y": 506.7666015625,
+    "z": "e702f568.a82608",
+    "wires": [
+      [
+        "f91553d6.d6433",
+        "d22eed3.8b3e19"
+      ]
+    ]
+  },
+  {
+    "id": "f91553d6.d6433",
+    "type": "outcomeTrue",
+    "name": "false",
+    "xml": "<outcome value='false'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1376.7666015625,
+    "y": 587.7666320800781,
+    "z": "e702f568.a82608",
+    "wires": [
+      [
+        "cf947753.3b5d88"
+      ]
+    ]
+  },
+  {
+    "id": "cf947753.3b5d88",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 1502.7666015625,
+    "y": 587.7666320800781,
+    "z": "e702f568.a82608",
+    "wires": [
+      [
+        "31354cfe.c6bf2c"
+      ]
+    ]
+  },
+  {
+    "id": "d22eed3.8b3e19",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1386.3499145507812,
+    "y": 371.8833312988281,
+    "z": "e702f568.a82608",
+    "wires": [
+      [
+        "2839a240.d257fe"
+      ]
+    ]
+  },
+  {
+    "id": "a6c87432.2611f",
+    "type": "switchNode",
+    "name": "switch color-aware is ROOT?",
+    "xml": "\n<switch test=\"`$tmp.aai.helper-secondary-root-all-connectivities.connectivity[$helprconnidx].color-aware == $tmp.ROOT.uni-p-interface-long`\">\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1711.699951171875,
+    "y": 467.8833312988281,
+    "z": "e702f568.a82608",
+    "wires": [
+      [
+        "f240aaa7.5333e8"
+      ]
+    ]
+  },
+  {
+    "id": "f240aaa7.5333e8",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1962.699951171875,
+    "y": 469.8833312988281,
+    "z": "e702f568.a82608",
+    "wires": [
+      [
+        "54dee507.06db64"
+      ]
+    ]
+  },
+  {
+    "id": "54dee507.06db64",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic='true'>",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 2119.699951171875,
+    "y": 469.8833312988281,
+    "z": "e702f568.a82608",
+    "wires": [
+      [
+        "1a15c16c.3b05bf",
+        "3fecc353.b5f16c",
+        "f36e5149.b9b35"
+      ]
+    ]
+  },
+  {
+    "id": "1a15c16c.3b05bf",
+    "type": "set",
+    "name": "set found-secondary-root-connectivity=true",
+    "xml": "<set>\n<parameter name='found-secondary-root-connectivity' value=\"true\" />\n",
+    "comments": "",
+    "x": 2380.699951171875,
+    "y": 417.8833312988281,
+    "z": "e702f568.a82608",
+    "wires": []
+  },
+  {
+    "id": "3fecc353.b5f16c",
+    "type": "set",
+    "name": "set tmp.aai.SECONDARY-ROOT.connectivity.",
+    "xml": "<set>\n<parameter name='tmp.aai.SECONDARY-ROOT.connectivity.' value=\"`$tmp.aai.helper-secondary-root-all-connectivities.connectivity[$helprconnidx].`\" />\n",
+    "comments": "",
+    "x": 2444.699951171875,
+    "y": 467.8833312988281,
+    "z": "e702f568.a82608",
+    "wires": []
+  },
+  {
+    "id": "f36e5149.b9b35",
+    "type": "break",
+    "name": "break",
+    "xml": "<break>\n",
+    "comments": "",
+    "x": 2311.699951171875,
+    "y": 533.8833312988281,
+    "z": "e702f568.a82608",
+    "wires": []
+  },
+  {
+    "id": "5e104fd0.57bd6",
+    "type": "switchNode",
+    "name": "switch conn type",
+    "xml": "<switch test=\"`$tmp.aai.helper-secondary-root-all-connectivities.connectivity[$helprconnidx].vpn-type`\">\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1736.583251953125,
+    "y": 375.7666015625,
+    "z": "e702f568.a82608",
+    "wires": [
+      [
+        "3d2ab0e2.6993c"
+      ]
+    ]
+  },
+  {
+    "id": "3d2ab0e2.6993c",
+    "type": "outcome",
+    "name": "root",
+    "xml": "<outcome value='root'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1929.583251953125,
+    "y": 375.7666320800781,
+    "z": "e702f568.a82608",
+    "wires": [
+      [
+        "fa1da4c2.b6ad4"
+      ]
+    ]
+  },
+  {
+    "id": "fa1da4c2.b6ad4",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 2072.583251953125,
+    "y": 377.7666320800781,
+    "z": "e702f568.a82608",
+    "wires": [
+      [
+        "a6c87432.2611f"
+      ]
+    ]
+  },
+  {
+    "id": "2839a240.d257fe",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 1538.699951171875,
+    "y": 371.8833312988281,
+    "z": "e702f568.a82608",
+    "wires": [
+      [
+        "5e104fd0.57bd6"
+      ]
+    ]
+  }
+]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-modify.json b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-modify.json
index 2e4b6b66..19a9e993 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": "781e35fa.f2e1d4",
+    "id": "2f28023e.39f0ce",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 173.88333129882812,
-    "y": 149.88333129882812,
-    "z": "1854297c.6f0f4f",
+    "x": 96.5,
+    "y": 107,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "9e11530a.17bcb"
+        "73cc7959.44f0a"
       ]
     ]
   },
   {
-    "id": "9e11530a.17bcb",
+    "id": "73cc7959.44f0a",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -22,8076 +22,10541 @@
     "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": 458.1690216064453,
-    "y": 211.12143993377686,
-    "z": "1854297c.6f0f4f",
+    "x": 380.7856903076172,
+    "y": 168.23810863494873,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "2b94c108.46c67e"
+        "22ecaa15.62efee"
       ]
     ]
   },
   {
-    "id": "2b94c108.46c67e",
+    "id": "22ecaa15.62efee",
     "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": 464.3119354248047,
-    "y": 295.88336181640625,
-    "z": "1854297c.6f0f4f",
+    "x": 386.92860412597656,
+    "y": 253.00003051757812,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "fc45d9d.aa25928"
+        "c060beae.bc9e28"
       ]
     ]
   },
   {
-    "id": "fc45d9d.aa25928",
+    "id": "c060beae.bc9e28",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 813.8833312988281,
-    "y": 354.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 736.5,
+    "y": 312,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "5f20119b.1c25f",
-        "440015de.6e018c",
-        "7415bdce.bb1424"
+        "915751c1.614528",
+        "36f6973a.34e678",
+        "493b4ec5.6de3"
       ]
     ]
   },
   {
-    "id": "5f20119b.1c25f",
+    "id": "915751c1.614528",
     "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": 1115.2168273925781,
-    "y": 625.8136291503906,
-    "z": "1854297c.6f0f4f",
+    "x": 1037.83349609375,
+    "y": 582.9302978515625,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "440015de.6e018c",
+    "id": "36f6973a.34e678",
     "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": 1136.6452941894531,
-    "y": 328.2166442871094,
-    "z": "1854297c.6f0f4f",
+    "x": 1059.261962890625,
+    "y": 285.33331298828125,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "12c8110b.ec9bd7",
-        "bbd39d34.8832e",
-        "23fc32e8.f22086"
+        "488c3b3e.f19244",
+        "775f6bb9.6a72cc",
+        "cd7c45c1.b6f318"
       ]
     ]
   },
   {
-    "id": "12c8110b.ec9bd7",
+    "id": "488c3b3e.f19244",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1361.6452941894531,
-    "y": 186.21664428710938,
-    "z": "1854297c.6f0f4f",
+    "x": 1284.261962890625,
+    "y": 143.33331298828125,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "61f16e51.c24158"
+        "86fe6a1f.5037f8"
       ]
     ]
   },
   {
-    "id": "bbd39d34.8832e",
+    "id": "775f6bb9.6a72cc",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1357.1362609863281,
-    "y": 255.79067993164062,
-    "z": "1854297c.6f0f4f",
+    "x": 1279.7529296875,
+    "y": 212.9073486328125,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "47248fa2.17d9d"
+        "de07150f.9aa728"
       ]
     ]
   },
   {
-    "id": "23fc32e8.f22086",
+    "id": "cd7c45c1.b6f318",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1345.6452941894531,
-    "y": 302.2166442871094,
-    "z": "1854297c.6f0f4f",
+    "x": 1268.261962890625,
+    "y": 259.33331298828125,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "cdbbe291.f3553"
+        "45b0306e.39dc08"
       ]
     ]
   },
   {
-    "id": "493ce64.5d5d418",
+    "id": "354c5c1b.22efdc",
     "type": "comment",
     "name": "new for TransportSlicing",
     "info": "",
     "comments": "",
-    "x": 1115.6452941894531,
-    "y": 216.21664428710938,
-    "z": "1854297c.6f0f4f",
+    "x": 1038.261962890625,
+    "y": 173.33331298828125,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "7415bdce.bb1424",
+    "id": "493b4ec5.6de3",
     "type": "execute",
     "name": "execute properties",
     "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />",
     "comments": "",
     "outputs": 1,
-    "x": 1103.6452941894531,
-    "y": 268.2166442871094,
-    "z": "1854297c.6f0f4f",
+    "x": 1026.261962890625,
+    "y": 225.33331298828125,
+    "z": "4138d8f7.da252",
     "wires": [
       []
     ]
   },
   {
-    "id": "61f16e51.c24158",
+    "id": "86fe6a1f.5037f8",
     "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": 1601.8833312988281,
-    "y": 182.88333129882812,
-    "z": "1854297c.6f0f4f",
+    "x": 1524.5,
+    "y": 140,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "58e97c67.87accc",
-        "d2e64d43.49ac68"
+        "ee0543f9.1cf788",
+        "5497352b.e1aeec"
       ]
     ]
   },
   {
-    "id": "47248fa2.17d9d",
+    "id": "de07150f.9aa728",
     "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": 1511.9457092285156,
-    "y": 258.74310302734375,
-    "z": "1854297c.6f0f4f",
+    "x": 1434.5623779296875,
+    "y": 215.85977172851562,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "cdbbe291.f3553",
+    "id": "45b0306e.39dc08",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 1515.8833312988281,
-    "y": 302.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 1438.5,
+    "y": 260,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "58e97c67.87accc",
+    "id": "ee0543f9.1cf788",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1806.8833312988281,
-    "y": 219.88333129882812,
-    "z": "1854297c.6f0f4f",
+    "x": 1729.5,
+    "y": 177,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "c54a8c68.c345e"
+        "6345f4d0.12f85c"
       ]
     ]
   },
   {
-    "id": "d2e64d43.49ac68",
+    "id": "5497352b.e1aeec",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1816.8833312988281,
-    "y": 146.88333129882812,
-    "z": "1854297c.6f0f4f",
+    "x": 1739.5,
+    "y": 104,
+    "z": "4138d8f7.da252",
     "wires": [
       []
     ]
   },
   {
-    "id": "c54a8c68.c345e",
+    "id": "6345f4d0.12f85c",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1799.8833312988281,
-    "y": 294.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 1722.5,
+    "y": 252,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "27adf24c.af1566",
-        "31a766ce.e0455a",
-        "7436fd76.690054",
-        "2b9d3039.23a428",
-        "2f2ed9c0.e0663e"
+        "c2cf8029.375a4",
+        "3a106a22.349b86",
+        "f24d529e.b55f9",
+        "26407648.4cfd4a",
+        "5e06fc8.b063184"
       ]
     ]
   },
   {
-    "id": "d2a449e8.f07b58",
+    "id": "34fb97ab.b3686",
     "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": 2285.883331298828,
-    "y": 345.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 2208.5,
+    "y": 303,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "41c867c6.b55cd8",
-        "84c1b468.c04558",
-        "621effb3.a9e918"
+        "4a2e58a2.751648",
+        "c91e93c5.362468",
+        "ad2e905e.658598"
       ]
     ]
   },
   {
-    "id": "41c867c6.b55cd8",
+    "id": "4a2e58a2.751648",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2501.883331298828,
-    "y": 412.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 2424.5,
+    "y": 370,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "821dc5ef.6d3aa8"
+        "2d931b81.0000fc"
       ]
     ]
   },
   {
-    "id": "84c1b468.c04558",
+    "id": "c91e93c5.362468",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2502.374298095703,
-    "y": 312.4573059082031,
-    "z": "1854297c.6f0f4f",
+    "x": 2424.990966796875,
+    "y": 269.573974609375,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "4a81091b.110a38"
+        "2c737e52.6b21f2"
       ]
     ]
   },
   {
-    "id": "621effb3.a9e918",
+    "id": "ad2e905e.658598",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2497.883331298828,
-    "y": 361.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 2420.5,
+    "y": 319,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "6269ae05.e67ee8"
+        "81005112.39dbe"
       ]
     ]
   },
   {
-    "id": "27adf24c.af1566",
+    "id": "c2cf8029.375a4",
     "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": 2002.8833312988281,
-    "y": 326.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 1925.5,
+    "y": 284,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "2c28c5a4.c9fc4a",
-        "d2a449e8.f07b58",
-        "42097510.f58b64",
-        "7a55e6a1.70e4b"
+        "9843a.b676f3c68",
+        "34fb97ab.b3686",
+        "cf6d7172.69b4b8",
+        "326038f4.f291a"
       ]
     ]
   },
   {
-    "id": "2c28c5a4.c9fc4a",
+    "id": "9843a.b676f3c68",
     "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": 2282.883331298828,
-    "y": 264.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 2205.5,
+    "y": 222,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "2b9d3039.23a428",
+    "id": "26407648.4cfd4a",
     "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": 1976.8833312988281,
-    "y": 276.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 1899.5,
+    "y": 234,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "31a766ce.e0455a",
+    "id": "3a106a22.349b86",
     "type": "get-resource",
     "name": "get-resource pnfs-list",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"pnfs\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v24/network/pnfs?depth=0'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"ccsdkTopopnfs\" >",
     "comments": "",
     "outputs": 1,
-    "x": 2019.8833312988281,
-    "y": 135.88333129882812,
-    "z": "1854297c.6f0f4f",
+    "x": 1942.5,
+    "y": 93,
+    "z": "4138d8f7.da252",
     "wires": [
       []
     ]
   },
   {
-    "id": "7436fd76.690054",
+    "id": "f24d529e.b55f9",
     "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": 2031.8833312988281,
-    "y": 176.88333129882812,
-    "z": "1854297c.6f0f4f",
+    "x": 1954.5,
+    "y": 134,
+    "z": "4138d8f7.da252",
     "wires": [
       []
     ]
   },
   {
-    "id": "e57021b1.8566f8",
+    "id": "a7bf0e61.b8215",
     "type": "comment",
     "name": "The following two nodes are for PCE",
     "info": "",
     "comments": "",
-    "x": 2056.883331298828,
-    "y": 88.88333129882812,
-    "z": "1854297c.6f0f4f",
+    "x": 1979.5,
+    "y": 46,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "f75cee20.f52e5",
+    "id": "68130b3.2f48af4",
     "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": 1976.8833312988281,
-    "y": 222.88333129882812,
-    "z": "1854297c.6f0f4f",
+    "x": 1899.5,
+    "y": 180,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "4a81091b.110a38",
+    "id": "2c737e52.6b21f2",
     "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": 2680.883331298828,
-    "y": 314.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 2603.5,
+    "y": 272,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "6269ae05.e67ee8",
+    "id": "81005112.39dbe",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 2680.820831298828,
-    "y": 364.0235900878906,
-    "z": "1854297c.6f0f4f",
+    "x": 2603.4375,
+    "y": 321.1402587890625,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "821dc5ef.6d3aa8",
+    "id": "2d931b81.0000fc",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 2682.820831298828,
-    "y": 415.0235900878906,
-    "z": "1854297c.6f0f4f",
+    "x": 2605.4375,
+    "y": 372.1402587890625,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "2337e3a2.faa61c"
+        "4511b10b.b4e2e8"
       ]
     ]
   },
   {
-    "id": "2337e3a2.faa61c",
+    "id": "4511b10b.b4e2e8",
     "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": 2975.820831298828,
-    "y": 362.0235900878906,
-    "z": "1854297c.6f0f4f",
+    "x": 2940.4375,
+    "y": 141.14027404785156,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "cccd155c.90e07",
-        "b9a7ac6e.7fea5",
-        "73057b22.08e1dc"
+        "9fb16699.1235d",
+        "da567395.79b6d8",
+        "8ed0fbe8.03e31"
       ]
     ]
   },
   {
-    "id": "b9a7ac6e.7fea5",
+    "id": "da567395.79b6d8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3249.311798095703,
-    "y": 254.59756469726562,
-    "z": "1854297c.6f0f4f",
+    "x": 3213.928466796875,
+    "y": 33.71424865722656,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "e5cee345.1eaae"
+        "1dbb6caf.82e0eb"
       ]
     ]
   },
   {
-    "id": "e5cee345.1eaae",
+    "id": "1dbb6caf.82e0eb",
     "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": 3426.883331298828,
-    "y": 254.88333129882812,
-    "z": "1854297c.6f0f4f",
+    "x": 3391.5,
+    "y": 34.00001525878906,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "73057b22.08e1dc",
+    "id": "8ed0fbe8.03e31",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3244.820831298828,
-    "y": 304.0235900878906,
-    "z": "1854297c.6f0f4f",
+    "x": 3209.4375,
+    "y": 83.14027404785156,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "f16a75f9.e23598"
+        "1a97687b.99c02"
       ]
     ]
   },
   {
-    "id": "f16a75f9.e23598",
+    "id": "1a97687b.99c02",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3426.820831298828,
-    "y": 304.0235900878906,
-    "z": "1854297c.6f0f4f",
+    "x": 3391.4375,
+    "y": 83.14027404785156,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "cccd155c.90e07",
+    "id": "9fb16699.1235d",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3248.820831298828,
-    "y": 355.0235900878906,
-    "z": "1854297c.6f0f4f",
+    "x": 3213.4375,
+    "y": 134.14027404785156,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "e05a51c3.eb7208"
+        "470c276f.ad2f08"
       ]
     ]
   },
   {
-    "id": "e05a51c3.eb7208",
+    "id": "470c276f.ad2f08",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3428.820831298828,
-    "y": 355.0235900878906,
-    "z": "1854297c.6f0f4f",
+    "x": 3393.4375,
+    "y": 134.14027404785156,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "a185fcaa.c01b7"
+        "ece8c0f8.d3abf8"
       ]
     ]
   },
   {
-    "id": "a185fcaa.c01b7",
+    "id": "ece8c0f8.d3abf8",
     "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": 2994.883331298828,
-    "y": 489.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 2959.5,
+    "y": 269.00001525878906,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "64dc3552.29da24",
-        "1cf4e379.2b6355"
+        "dba346c3.39c8a8",
+        "4ccdd4a0.9c665c"
       ]
     ]
   },
   {
-    "id": "1cf4e379.2b6355",
+    "id": "4ccdd4a0.9c665c",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3304.883331298828,
-    "y": 496.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 3269.5,
+    "y": 276.00001525878906,
+    "z": "4138d8f7.da252",
     "wires": [
       []
     ]
   },
   {
-    "id": "64dc3552.29da24",
+    "id": "dba346c3.39c8a8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3303.883331298828,
-    "y": 550.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 3268.5,
+    "y": 330.00001525878906,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "49cf9d82.f3816c"
+        "e2cad6e.ad95028"
       ]
     ]
   },
   {
-    "id": "61811a9.92ccce4",
+    "id": "fde9905b.0e0dc",
     "type": "outcome",
     "name": "network-policy",
     "xml": "<outcome value='network-policy'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4048.883331298828,
-    "y": 504.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 4013.5,
+    "y": 284.00001525878906,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "5422df0.13119a"
+        "be0ed66c.68b118"
       ]
     ]
   },
   {
-    "id": "5422df0.13119a",
+    "id": "be0ed66c.68b118",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4225.883209228516,
-    "y": 497.8832092285156,
-    "z": "1854297c.6f0f4f",
+    "x": 4190.4998779296875,
+    "y": 276.99989318847656,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "cc385253.b8fbd",
-        "2cd49ffd.326448"
+        "1aebcc98.e81703",
+        "a36c8474.3e9148"
       ]
     ]
   },
   {
-    "id": "49cf9d82.f3816c",
+    "id": "e2cad6e.ad95028",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3467.883331298828,
-    "y": 476.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 3432.5,
+    "y": 256.00001525878906,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "f69edc6a.996158",
-        "7412251.16d085c"
+        "f52b5162.d3155",
+        "28c7d65.67fb0aa"
       ]
     ]
   },
   {
-    "id": "f69edc6a.996158",
+    "id": "f52b5162.d3155",
     "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": 3748.883331298828,
-    "y": 432.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 3713.5,
+    "y": 212.00001525878906,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "ed2a485c.4e373"
+        "40678a93.0b11fc"
       ]
     ]
   },
   {
-    "id": "ed2a485c.4e373",
+    "id": "40678a93.0b11fc",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4010.883331298828,
-    "y": 432.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 3975.5,
+    "y": 212.00001525878906,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "61811a9.92ccce4"
+        "fde9905b.0e0dc"
       ]
     ]
   },
   {
-    "id": "cc385253.b8fbd",
+    "id": "1aebcc98.e81703",
     "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": 4468.883209228516,
-    "y": 454.8832092285156,
-    "z": "1854297c.6f0f4f",
+    "x": 4433.4998779296875,
+    "y": 233.99989318847656,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "2cd49ffd.326448",
+    "id": "a36c8474.3e9148",
     "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": 4457.883209228516,
-    "y": 509.8832092285156,
-    "z": "1854297c.6f0f4f",
+    "x": 4422.4998779296875,
+    "y": 288.99989318847656,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "9972e623.c70578",
-        "34812087.cb8a98",
-        "1b373493.bb5393"
+        "f4703396.8f997",
+        "c4863aea.39d3c",
+        "3f105248.ebf0a6"
       ]
     ]
   },
   {
-    "id": "1b373493.bb5393",
+    "id": "3f105248.ebf0a6",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4710.883331298828,
-    "y": 395.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 4753.5,
+    "y": 197,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "f7f40cf5.3f9508"
+        "f39e3f38.4d2868"
       ]
     ]
   },
   {
-    "id": "f7f40cf5.3f9508",
+    "id": "f39e3f38.4d2868",
     "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": 4859.454864501953,
-    "y": 396.1690979003906,
-    "z": "1854297c.6f0f4f",
+    "x": 4902.071533203125,
+    "y": 197.2857666015625,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "a22797f6.37b0d8",
+    "id": "9b475b7a.781198",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 4858.392364501953,
-    "y": 440.3093566894531,
-    "z": "1854297c.6f0f4f",
+    "x": 4901.009033203125,
+    "y": 241.426025390625,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "34812087.cb8a98",
+    "id": "c4863aea.39d3c",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4699.392364501953,
-    "y": 440.3093566894531,
-    "z": "1854297c.6f0f4f",
+    "x": 4742.009033203125,
+    "y": 241.426025390625,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "a22797f6.37b0d8"
+        "9b475b7a.781198"
       ]
     ]
   },
   {
-    "id": "9972e623.c70578",
+    "id": "f4703396.8f997",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4706.392364501953,
-    "y": 519.3093566894531,
-    "z": "1854297c.6f0f4f",
+    "x": 4749.009033203125,
+    "y": 320.426025390625,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "2ecc1ca4.45238c"
+        "a4728a38.a45e8"
       ]
     ]
   },
   {
-    "id": "2ecc1ca4.45238c",
+    "id": "a4728a38.a45e8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4845.392364501953,
-    "y": 519.3093566894531,
-    "z": "1854297c.6f0f4f",
+    "x": 4888.009033203125,
+    "y": 320.426025390625,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "4189f313.1a9cd4",
-        "b78697ee.5ce55"
+        "6805f17a.2a0698",
+        "a9ae4e95.32ef88"
       ]
     ]
   },
   {
-    "id": "4189f313.1a9cd4",
+    "id": "6805f17a.2a0698",
     "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": 5050.883331298828,
-    "y": 516.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 5093.5,
+    "y": 318,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "b78697ee.5ce55",
+    "id": "a9ae4e95.32ef88",
     "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": 5049.883331298828,
-    "y": 562.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 5092.5,
+    "y": 364,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "7412251.16d085c",
+    "id": "28c7d65.67fb0aa",
     "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": 3565.883331298828,
-    "y": 548.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 3530.5,
+    "y": 328.00001525878906,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "6604e9c7.0c6c6"
+        "ebdf975.aa03968"
       ]
     ]
   },
   {
-    "id": "6604e9c7.0c6c6",
+    "id": "ebdf975.aa03968",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3845.883331298828,
-    "y": 548.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 3810.5,
+    "y": 328.00001525878906,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "85f44348.40e85"
+        "3f67ae4e.a2076a"
       ]
     ]
   },
   {
-    "id": "85f44348.40e85",
+    "id": "3f67ae4e.a2076a",
     "type": "outcome",
     "name": "logical-link",
     "xml": "<outcome value='logical-link'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2258.8834533691406,
-    "y": 801.8834533691406,
-    "z": "1854297c.6f0f4f",
+    "x": 2181.5001220703125,
+    "y": 759.0001220703125,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "4b9c1fcb.91dc9"
+        "f83af2f7.dfb288"
       ]
     ]
   },
   {
-    "id": "4b9c1fcb.91dc9",
+    "id": "f83af2f7.dfb288",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 2435.883331298828,
-    "y": 794.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 2358.5,
+    "y": 752,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "27f44efc.6f6d32",
-        "c7edfd64.b3753"
+        "a0742463.c2c6f8",
+        "25034b30.dd6634"
       ]
     ]
   },
   {
-    "id": "27f44efc.6f6d32",
+    "id": "a0742463.c2c6f8",
     "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": 2678.883331298828,
-    "y": 751.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 2601.5,
+    "y": 709,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "c7edfd64.b3753",
+    "id": "25034b30.dd6634",
     "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": 2667.883331298828,
-    "y": 806.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 2590.5,
+    "y": 764,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "24ace19f.75b966",
-        "ac0fada7.2237a",
-        "7d46d2c9.4b5f9c"
+        "b3267bc2.0ab17",
+        "e3342c37.4e1e3",
+        "349e46c.d16cb3a"
       ]
     ]
   },
   {
-    "id": "24ace19f.75b966",
+    "id": "b3267bc2.0ab17",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2959.374298095703,
-    "y": 785.4573059082031,
-    "z": "1854297c.6f0f4f",
+    "x": 2881.990966796875,
+    "y": 742.573974609375,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "d7ebe78c.3ec37"
+        "504883f4.bc132c"
       ]
     ]
   },
   {
-    "id": "ac0fada7.2237a",
+    "id": "e3342c37.4e1e3",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2947.883331298828,
-    "y": 829.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 2870.5,
+    "y": 787,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "77d529f.fb28458"
+        "6ff791fd.bff34"
       ]
     ]
   },
   {
-    "id": "d7ebe78c.3ec37",
+    "id": "504883f4.bc132c",
     "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": 3107.945831298828,
-    "y": 785.7430725097656,
-    "z": "1854297c.6f0f4f",
+    "x": 3030.5625,
+    "y": 742.8597412109375,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "77d529f.fb28458",
+    "id": "6ff791fd.bff34",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3106.883331298828,
-    "y": 829.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 3029.5,
+    "y": 787,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "7d46d2c9.4b5f9c",
+    "id": "349e46c.d16cb3a",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2954.883331298828,
-    "y": 908.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 2877.5,
+    "y": 866,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "265410a7.36ec88"
+        "947e25fa.d00b28"
       ]
     ]
   },
   {
-    "id": "265410a7.36ec88",
+    "id": "947e25fa.d00b28",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3093.883331298828,
-    "y": 908.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 3016.5,
+    "y": 866,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "98c1de20.9fd92",
-        "22cf748c.dba294",
-        "6d145189.478b8",
-        "8cce98e.0c8f3e8",
-        "d4009f69.0bc89",
-        "9190bf27.d61b08",
-        "1fa44b37.7a7c65",
-        "1ebd0160.929687",
-        "f7e98987.293918",
-        "6b01ec04.e8e8dc",
-        "ce90c6ec.193398",
-        "323cec2c.88d45c",
-        "fba2883c.72d2",
-        "abd6e7f0.9745e8"
+        "b5aabe11.88e5f",
+        "8b8aaeb1.46c568",
+        "32905edb.461e7a",
+        "2f0ef70c.178628",
+        "6eaf37e0.1fb3a8",
+        "1abb3e71.7e1362",
+        "29e42279.9aaa7e",
+        "363ba934.edbd4e",
+        "ec67f0f.b56539",
+        "631e76e1.71afc",
+        "b17f4ff2.75d93",
+        "8048035e.723ef",
+        "d590aba5.94aa48",
+        "44b9c5d0.dda044",
+        "46e10049.e35348",
+        "f55201f.0be188",
+        "6834572.668ee28",
+        "fa7f428c.6d6b2",
+        "8c5d257.6a579d8"
       ]
     ]
   },
   {
-    "id": "ec511c6.7493e6",
+    "id": "479d6fca.4b7c8",
     "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": 3407.883331298828,
-    "y": 714.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 3328.5,
+    "y": 416,
+    "z": "4138d8f7.da252",
     "wires": [
       []
     ]
   },
   {
-    "id": "98c1de20.9fd92",
+    "id": "b5aabe11.88e5f",
     "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": 3388.883331298828,
-    "y": 764.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 3315.4998779296875,
+    "y": 508,
+    "z": "4138d8f7.da252",
     "wires": [
       []
     ]
   },
   {
-    "id": "abd6e7f0.9745e8",
+    "id": "44b9c5d0.dda044",
     "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": 3345.883331298828,
-    "y": 809.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 3272.4998779296875,
+    "y": 553,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "22cf748c.dba294",
+    "id": "8b8aaeb1.46c568",
     "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": 3320.883331298828,
-    "y": 872.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 3247.4998779296875,
+    "y": 616,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "6d145189.478b8",
+    "id": "32905edb.461e7a",
     "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": 3321.883331298828,
-    "y": 927.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 3248.4998779296875,
+    "y": 671,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "8cce98e.0c8f3e8",
+    "id": "2f0ef70c.178628",
     "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": 3337.883331298828,
-    "y": 975.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 3264.4998779296875,
+    "y": 719,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "909d17c4.8ebc6",
-        "f19af18e.9ab1b8",
-        "7d20c22a.cc52a4"
+        "99eab0f2.3508c",
+        "1b8f4bea.ec5e94",
+        "fc9653f8.4449d"
       ]
     ]
   },
   {
-    "id": "d4009f69.0bc89",
+    "id": "6eaf37e0.1fb3a8",
     "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": 3326.883331298828,
-    "y": 1062.8832092285156,
-    "z": "1854297c.6f0f4f",
+    "x": 3259.5,
+    "y": 785.9998779296875,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "9444273f.3b6308",
-        "2c5b38f8.57c148",
-        "b9db8112.11ed58"
+        "e805b604.ab84e",
+        "a86f3b5b.e29e1",
+        "cbb70d3d.0ef6a"
       ]
     ]
   },
   {
-    "id": "909d17c4.8ebc6",
+    "id": "99eab0f2.3508c",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3538.883331298828,
-    "y": 859.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 3505.5,
+    "y": 547,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "c14b1c12.22174"
+        "d6e995cd.85fc"
       ]
     ]
   },
   {
-    "id": "f19af18e.9ab1b8",
+    "id": "1b8f4bea.ec5e94",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3534.392364501953,
-    "y": 909.3093566894531,
-    "z": "1854297c.6f0f4f",
+    "x": 3501.009033203125,
+    "y": 596.426025390625,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "2b40f083.4de84"
+        "e5161935.335138"
       ]
     ]
   },
   {
-    "id": "7d20c22a.cc52a4",
+    "id": "fc9653f8.4449d",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3538.392364501953,
-    "y": 962.3093566894531,
-    "z": "1854297c.6f0f4f",
+    "x": 3505.009033203125,
+    "y": 649.426025390625,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "aaa35683.7d2c38"
+        "867b315e.a11f4"
       ]
     ]
   },
   {
-    "id": "c14b1c12.22174",
+    "id": "d6e995cd.85fc",
     "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": 3687.454864501953,
-    "y": 859.1690979003906,
-    "z": "1854297c.6f0f4f",
+    "x": 3654.071533203125,
+    "y": 546.2857666015625,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "2b40f083.4de84",
+    "id": "e5161935.335138",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3677.392364501953,
-    "y": 909.3093566894531,
-    "z": "1854297c.6f0f4f",
+    "x": 3644.009033203125,
+    "y": 596.426025390625,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "9444273f.3b6308",
+    "id": "e805b604.ab84e",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3549.883331298828,
-    "y": 1032.8832092285156,
-    "z": "1854297c.6f0f4f",
+    "x": 3509.5,
+    "y": 702.9998779296875,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "106ff1ef.63ffd6"
+        "f25db7d5.d2a2a"
       ]
     ]
   },
   {
-    "id": "2c5b38f8.57c148",
+    "id": "a86f3b5b.e29e1",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3545.392364501953,
-    "y": 1082.3092346191406,
-    "z": "1854297c.6f0f4f",
+    "x": 3505.009033203125,
+    "y": 752.4259033203125,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "ce83157c.4b6778"
+        "86e45032.893578"
       ]
     ]
   },
   {
-    "id": "b9db8112.11ed58",
+    "id": "cbb70d3d.0ef6a",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3546.392364501953,
-    "y": 1135.3092346191406,
-    "z": "1854297c.6f0f4f",
+    "x": 3488.009033203125,
+    "y": 800.4259033203125,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "a56ebadb.ee398"
+        "20619d71.889cda"
       ]
     ]
   },
   {
-    "id": "106ff1ef.63ffd6",
+    "id": "f25db7d5.d2a2a",
     "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": 3698.454864501953,
-    "y": 1032.1689758300781,
-    "z": "1854297c.6f0f4f",
+    "x": 3658.071533203125,
+    "y": 702.28564453125,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "ce83157c.4b6778",
+    "id": "86e45032.893578",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3688.392364501953,
-    "y": 1082.3092346191406,
-    "z": "1854297c.6f0f4f",
+    "x": 3648.009033203125,
+    "y": 752.4259033203125,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "aaa35683.7d2c38",
+    "id": "867b315e.a11f4",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3699.883331298828,
-    "y": 961.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 3666.5,
+    "y": 649,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "bc98fef2.b2548"
+        "2bd95045.b71158"
       ]
     ]
   },
   {
-    "id": "a56ebadb.ee398",
+    "id": "20619d71.889cda",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3699.883331298828,
-    "y": 1134.8832092285156,
-    "z": "1854297c.6f0f4f",
+    "x": 3641.5,
+    "y": 799.9998779296875,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "80324f63.fa516"
+        "41de01b2.960a08"
       ]
     ]
   },
   {
-    "id": "bc98fef2.b2548",
+    "id": "2bd95045.b71158",
     "type": "switchNode",
     "name": "switch nr type",
     "xml": "<switch test='`$tmp.aai.network-route-one.type`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3871.883331298828,
-    "y": 961.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 3838.5,
+    "y": 649,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "49900721.03dea8",
-        "7a97b419.9c3254"
+        "6f8555c6.ec1a0c",
+        "994a0acf.d3aed8",
+        "26a90c3.2a56674"
       ]
     ]
   },
   {
-    "id": "80324f63.fa516",
+    "id": "41de01b2.960a08",
     "type": "switchNode",
     "name": "switch nr type",
     "xml": "<switch test='`$tmp.aai.network-route-two.type`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3872.883331298828,
-    "y": 1134.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 3833.5,
+    "y": 734,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "9dd66c65.827358",
-        "1559fb7e.bddfc5"
+        "4b5b1a17.b9df6c",
+        "d7a475f3.ea12c",
+        "16154f9d.14a3b"
       ]
     ]
   },
   {
-    "id": "49900721.03dea8",
+    "id": "6f8555c6.ec1a0c",
     "type": "outcome",
     "name": "ROOT",
     "xml": "<outcome value='ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4047.883331298828,
-    "y": 940.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 3999.49951171875,
+    "y": 385,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "9c76efc2.c7f458"
+        "62760f41.c93a2"
       ]
     ]
   },
   {
-    "id": "7a97b419.9c3254",
+    "id": "994a0acf.d3aed8",
     "type": "outcome",
     "name": "LEAF",
     "xml": "<outcome value='LEAF'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4049.883331298828,
-    "y": 994.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 4001.49951171875,
+    "y": 439,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "36b200ce.3626f"
+        "273e3fee.2bc13"
       ]
     ]
   },
   {
-    "id": "9dd66c65.827358",
+    "id": "4b5b1a17.b9df6c",
     "type": "outcome",
     "name": "ROOT",
     "xml": "<outcome value='ROOT'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4048.883331298828,
-    "y": 1104.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 4014.499267578125,
+    "y": 607,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "f7a8d104.b779c8"
+        "244a1c4c.c64574"
       ]
     ]
   },
   {
-    "id": "1559fb7e.bddfc5",
+    "id": "d7a475f3.ea12c",
     "type": "outcome",
     "name": "LEAF",
     "xml": "<outcome value='LEAF'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4050.883331298828,
-    "y": 1158.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 4016.499267578125,
+    "y": 661,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "2781339a.2c9d8c"
+        "f48105e4.f03428"
       ]
     ]
   },
   {
-    "id": "a64deb38.79c21",
+    "id": "92f3b868.34ce6",
     "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": 4357.883331298828,
-    "y": 892.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 4309.49951171875,
+    "y": 337,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "d00069b9.08211",
+    "id": "b6002239.68b828",
     "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": 4350.883331298828,
-    "y": 990.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 4302.49951171875,
+    "y": 435,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "e2a3248.b77d4d8",
+    "id": "55137534.cd97cc",
     "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": 4350.883331298828,
-    "y": 1077.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 4378.499267578125,
+    "y": 634,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "69fc971e.d1c948",
+    "id": "ba173e3c.d3cf48",
     "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": 4354.883331298828,
-    "y": 1170.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 4382.499267578125,
+    "y": 727,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "79a28b11.e62b74",
+    "id": "4d8d5caa.cdd3ac",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3581.883331298828,
-    "y": 1579.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 3460.5,
+    "y": 1150,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "4a634c2c.1a75ec"
+        "6c40f2a8.47da04"
       ]
     ]
   },
   {
-    "id": "940be839.4c9f2",
+    "id": "f63967f8.5c1d2",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3591.374298095703,
-    "y": 1622.4573669433594,
-    "z": "1854297c.6f0f4f",
+    "x": 3469.990966796875,
+    "y": 1192.5740356445312,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "87a8481c.69d658"
+        "cba887b8.3ba25"
       ]
     ]
   },
   {
-    "id": "a420af0c.05d778",
+    "id": "f4c1be52.25da4",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3579.883331298828,
-    "y": 1668.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 3458.5,
+    "y": 1239,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "2583b063.d99b38"
+        "43b1688f.a5b798"
       ]
     ]
   },
   {
-    "id": "2f08f142.24c856",
+    "id": "f87008d1.14dd28",
     "type": "comment",
     "name": "Question?",
     "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
     "comments": "",
-    "x": 3281.883331298828,
-    "y": 1541.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 3160.5,
+    "y": 1112,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "1fa44b37.7a7c65",
+    "id": "29e42279.9aaa7e",
     "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": 3324.883331298828,
-    "y": 1606.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 3203.5,
+    "y": 1177,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "79a28b11.e62b74",
-        "940be839.4c9f2",
-        "a420af0c.05d778"
+        "4d8d5caa.cdd3ac",
+        "f63967f8.5c1d2",
+        "f4c1be52.25da4"
       ]
     ]
   },
   {
-    "id": "9190bf27.d61b08",
+    "id": "1abb3e71.7e1362",
     "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": 3325.883331298828,
-    "y": 1276.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 3192.5,
+    "y": 1027,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "d3643022.187b08",
-        "f8e2bf22.0eeef"
+        "252648ef.3d7f4",
+        "296ca11d.a31fd6"
       ]
     ]
   },
   {
-    "id": "f8e2bf22.0eeef",
+    "id": "296ca11d.a31fd6",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3548.883331298828,
-    "y": 1262.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 3415.5,
+    "y": 1013,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "624eaece.91144"
+        "2479711d.5bdd66"
       ]
     ]
   },
   {
-    "id": "d3643022.187b08",
+    "id": "252648ef.3d7f4",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3550.883331298828,
-    "y": 1295.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 3417.5,
+    "y": 1046,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "c2708361.dc58a8"
+        "90f53fd9.1cbe8"
       ]
     ]
   },
   {
-    "id": "4a634c2c.1a75ec",
+    "id": "6c40f2a8.47da04",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3754.549835205078,
-    "y": 1578.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 3633.16650390625,
+    "y": 1149,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "a3465897.dfb6c",
-        "6701a8e7.d232d8"
+        "1415c282.916e3d",
+        "2cb5ed40.b34f42"
       ]
     ]
   },
   {
-    "id": "87a8481c.69d658",
+    "id": "cba887b8.3ba25",
     "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": 3744.9457092285156,
-    "y": 1625.7431030273438,
-    "z": "1854297c.6f0f4f",
+    "x": 3623.5623779296875,
+    "y": 1195.8597717285156,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "2583b063.d99b38",
+    "id": "43b1688f.a5b798",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3748.883331298828,
-    "y": 1669.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 3627.5,
+    "y": 1240,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "a3465897.dfb6c",
+    "id": "1415c282.916e3d",
     "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": 4018.883331298828,
-    "y": 1562.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 3897.5,
+    "y": 1200,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "345ba8bf.bbff3",
-        "cd05726a.f82838"
+        "3e280d70.843922",
+        "95fc8503.11868"
       ]
     ]
   },
   {
-    "id": "cd05726a.f82838",
+    "id": "95fc8503.11868",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4241.883331298828,
-    "y": 1517.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 4073.5,
+    "y": 1250,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "2d1297aa.955328"
+        "dc902b38.0c7748"
       ]
     ]
   },
   {
-    "id": "345ba8bf.bbff3",
+    "id": "3e280d70.843922",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4243.883331298828,
-    "y": 1581.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 4075.5,
+    "y": 1314,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "c1965743.4c3d48"
+        "23310562.1afb82"
       ]
     ]
   },
   {
-    "id": "c1965743.4c3d48",
+    "id": "23310562.1afb82",
     "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": 4405.883331298828,
-    "y": 1577.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 4237.5,
+    "y": 1310,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "2d1297aa.955328",
+    "id": "dc902b38.0c7748",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4406.883331298828,
-    "y": 1514.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 4238.5,
+    "y": 1247,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "2cdfacb5.3a35a4",
-        "3e9d9121.36c9d6"
+        "cee16453.63cf3",
+        "84ccdaef.588b08"
       ]
     ]
   },
   {
-    "id": "8deb3478.19bbc8",
-    "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\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='vpn-type' value='`$prop.sotn.vpnType`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 4020.883331298828,
-    "y": 1721.8833312988281,
-    "z": "1854297c.6f0f4f",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "97704f04.65be9",
-    "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": 4065.883331298828,
-    "y": 1631.8833312988281,
-    "z": "1854297c.6f0f4f",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "d3e16022.86087",
-    "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": 4148.883331298828,
-    "y": 1769.8833312988281,
-    "z": "1854297c.6f0f4f",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "c2708361.dc58a8",
+    "id": "90f53fd9.1cbe8",
     "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": 3693.883331298828,
-    "y": 1292.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 3560.5,
+    "y": 1043,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "624eaece.91144",
+    "id": "2479711d.5bdd66",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3696.883331298828,
-    "y": 1255.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 3563.5,
+    "y": 1006,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "72c971d0.4048b8",
-        "afa94a20.a982b"
+        "e0731aec.1d3d18",
+        "ff49f858.b54118"
       ]
     ]
   },
   {
-    "id": "72c971d0.4048b8",
+    "id": "e0731aec.1d3d18",
     "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": 3870.883331298828,
-    "y": 1211.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 3737.5,
+    "y": 962,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "6701a8e7.d232d8",
+    "id": "2cb5ed40.b34f42",
     "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": 3972.883331298828,
-    "y": 1846.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 3609.5,
+    "y": 1331,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "db5b6ad5.7610d"
+        "f5d98ba7.1e5cb8"
       ]
     ]
   },
   {
-    "id": "db5b6ad5.7610d",
+    "id": "f5d98ba7.1e5cb8",
     "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": 4178.883331298828,
-    "y": 1846.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 3890.5,
+    "y": 1326,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "91f60d7.c7d4bf"
+        "287b5bf8.99c79c"
       ]
     ]
   },
   {
-    "id": "91f60d7.c7d4bf",
+    "id": "287b5bf8.99c79c",
     "type": "outcome",
     "name": "tunnel-termination-point",
     "xml": "<outcome value='tunnel-termination-point'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4394.168975830078,
-    "y": 1846.7051086425781,
-    "z": "1854297c.6f0f4f",
+    "x": 4201.78564453125,
+    "y": 1400.82177734375,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "f6e4c256.99ed68"
+        "70c360c1.95da08"
       ]
     ]
   },
   {
-    "id": "afa94a20.a982b",
+    "id": "ff49f858.b54118",
     "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": 3885.883331298828,
-    "y": 1322.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 3752.5,
+    "y": 1073,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "1979ced2.4d0299",
-        "9890a5f2.a73b18",
-        "d6c935ad.2c18"
+        "dadb26c7.629ca8",
+        "f63867c7.23e9a8",
+        "b7f169a7.e4cea8"
       ]
     ]
   },
   {
-    "id": "1979ced2.4d0299",
+    "id": "dadb26c7.629ca8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4081.3834533691406,
-    "y": 1274.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 3948.0001220703125,
+    "y": 1025,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "d4f7d32a.177f28"
+        "56281278.4a732c"
       ]
     ]
   },
   {
-    "id": "9890a5f2.a73b18",
+    "id": "f63867c7.23e9a8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4073.3834533691406,
-    "y": 1329.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 3940.0001220703125,
+    "y": 1080,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "4c3f3b2.6283544"
+        "d5d18730.ffaa"
       ]
     ]
   },
   {
-    "id": "d6c935ad.2c18",
+    "id": "b7f169a7.e4cea8",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4078.3834533691406,
-    "y": 1386.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 3945.0001220703125,
+    "y": 1137,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "13564645.a1e6da"
+        "5b7993c9.ffe6c4"
       ]
     ]
   },
   {
-    "id": "13564645.a1e6da",
+    "id": "5b7993c9.ffe6c4",
     "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": 4230.383453369141,
-    "y": 1387.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 4097.0001220703125,
+    "y": 1138,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "4c3f3b2.6283544",
+    "id": "d5d18730.ffaa",
     "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": 4241.383453369141,
-    "y": 1332.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 4108.0001220703125,
+    "y": 1083,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "d4f7d32a.177f28",
+    "id": "56281278.4a732c",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4225.765777587891,
-    "y": 1272.5390014648438,
-    "z": "1854297c.6f0f4f",
+    "x": 4092.3824462890625,
+    "y": 1022.6556701660156,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "755f8d33.dd06bc"
+        "98511029.380fd"
       ]
     ]
   },
   {
-    "id": "755f8d33.dd06bc",
+    "id": "98511029.380fd",
     "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": 4409.883331298828,
-    "y": 1286.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 4315.500244140625,
+    "y": 1161,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "910fe315.8317e8"
+        "1e482e0.3b3ba52"
       ]
     ]
   },
   {
-    "id": "3e9d9121.36c9d6",
+    "id": "84ccdaef.588b08",
     "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": 4576.883331298828,
-    "y": 1472.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 4408.5,
+    "y": 1205,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "2cdfacb5.3a35a4",
+    "id": "cee16453.63cf3",
     "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": 4577.883331298828,
-    "y": 1580.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 4409.5,
+    "y": 1313,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "80df0a60.dec0f8",
+    "id": "d2b67ee9.016d4",
     "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": 4578.883331298828,
-    "y": 1529.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 4410.5,
+    "y": 1262,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "f6e4c256.99ed68",
+    "id": "70c360c1.95da08",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4601.000518798828,
-    "y": 1847.2236633300781,
-    "z": "1854297c.6f0f4f",
+    "x": 4408.6171875,
+    "y": 1401.34033203125,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "a4a05745.968c7",
-        "d1e00a0e.d2e56",
-        "d1a2356d.4786a8"
+        "8b810a1.45408f8",
+        "389752e1.54c2be",
+        "e0be029e.19d278"
       ]
     ]
   },
   {
-    "id": "a4a05745.968c7",
+    "id": "8b810a1.45408f8",
     "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": 4816.000518798828,
-    "y": 1809.2236633300781,
-    "z": "1854297c.6f0f4f",
+    "x": 4623.6171875,
+    "y": 1363.34033203125,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "d1e00a0e.d2e56",
+    "id": "389752e1.54c2be",
     "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": 4813.000518798828,
-    "y": 1848.2236633300781,
-    "z": "1854297c.6f0f4f",
+    "x": 4620.6171875,
+    "y": 1402.34033203125,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "17a4f2c1.f6b375"
+        "38942ae1.d34c76"
       ]
     ]
   },
   {
-    "id": "d1a2356d.4786a8",
+    "id": "e0be029e.19d278",
     "type": "break",
     "name": "break",
     "xml": "<break>\n",
     "comments": "",
-    "x": 4768.500518798828,
-    "y": 1890.2236633300781,
-    "z": "1854297c.6f0f4f",
+    "x": 4576.1171875,
+    "y": 1444.34033203125,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "17a4f2c1.f6b375",
+    "id": "38942ae1.d34c76",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4993.500518798828,
-    "y": 1847.2236633300781,
-    "z": "1854297c.6f0f4f",
+    "x": 4801.1171875,
+    "y": 1401.34033203125,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "ba138e8e.753b68"
+        "418b10aa.3bf41"
       ]
     ]
   },
   {
-    "id": "8d6faffb.891c08",
+    "id": "28737ab1.66c06e",
     "type": "outcome",
     "name": "esr-thirdparty-sdnc",
     "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4807.883331298828,
-    "y": 1290.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 4713.500244140625,
+    "y": 1165,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "17552ef5.2956f9"
+        "813fb276.a89d38"
       ]
     ]
   },
   {
-    "id": "17552ef5.2956f9",
+    "id": "813fb276.a89d38",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4984.883331298828,
-    "y": 1282.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 4890.500244140625,
+    "y": 1157,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "55d02530.edc7ec",
-        "14cede7e.dd48aa"
+        "5ba45898.1ae6d8",
+        "82500988.df7418"
       ]
     ]
   },
   {
-    "id": "910fe315.8317e8",
+    "id": "1e482e0.3b3ba52",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4604.883331298828,
-    "y": 1286.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 4510.500244140625,
+    "y": 1161,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "8d6faffb.891c08",
-        "fe294daa.41d368"
+        "28737ab1.66c06e",
+        "431c2963.374ce8"
       ]
     ]
   },
   {
-    "id": "fe294daa.41d368",
+    "id": "431c2963.374ce8",
     "type": "outcome",
     "name": "network-resource",
     "xml": "<outcome value='network-resource'>",
     "comments": "",
     "outputs": 1,
-    "x": 4810.883331298828,
-    "y": 1364.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 4579.500244140625,
+    "y": 1235,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "d9a2dd9b.e37c68"
+        "d3fb7afe.dba838"
       ]
     ]
   },
   {
-    "id": "d9a2dd9b.e37c68",
+    "id": "d3fb7afe.dba838",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4987.883331298828,
-    "y": 1356.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 4775.500244140625,
+    "y": 1235,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "7ccc9bf1.00634c"
+        "40663368.ea789c"
       ]
     ]
   },
   {
-    "id": "ba138e8e.753b68",
+    "id": "418b10aa.3bf41",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5151.500518798828,
-    "y": 1847.2236633300781,
-    "z": "1854297c.6f0f4f",
+    "x": 4959.1171875,
+    "y": 1401.34033203125,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "949f2da8.99048"
+        "ec468881.ecbf18"
       ]
     ]
   },
   {
-    "id": "949f2da8.99048",
+    "id": "ec468881.ecbf18",
     "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": 5358.500518798828,
-    "y": 1847.2236633300781,
-    "z": "1854297c.6f0f4f",
+    "x": 5166.1171875,
+    "y": 1401.34033203125,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "14cede7e.dd48aa",
+    "id": "82500988.df7418",
     "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": 5192.883331298828,
-    "y": 1289.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 5115.500244140625,
+    "y": 1153,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "b2a3145.b7edbe8",
-        "e74729d.3422f58",
-        "409c0b0b.c89e64"
+        "9dd65188.ffecf",
+        "e0664fc.7b8393",
+        "b7a2fd6c.7b7688"
       ]
     ]
   },
   {
-    "id": "55d02530.edc7ec",
+    "id": "5ba45898.1ae6d8",
     "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": 5222.883331298828,
-    "y": 1237.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 5145.500244140625,
+    "y": 1101,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "b2a3145.b7edbe8",
+    "id": "9dd65188.ffecf",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5402.883331298828,
-    "y": 1280.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 5325.500244140625,
+    "y": 1144,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "4b8f6adb.6d0404"
+        "2d529b4.18963e4"
       ]
     ]
   },
   {
-    "id": "e74729d.3422f58",
+    "id": "e0664fc.7b8393",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5394.883331298828,
-    "y": 1335.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 5317.500244140625,
+    "y": 1199,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "19136c8e.dcdfbb"
+        "3aa5c8f4.350c08"
       ]
     ]
   },
   {
-    "id": "409c0b0b.c89e64",
+    "id": "b7a2fd6c.7b7688",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5399.883331298828,
-    "y": 1392.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 5322.500244140625,
+    "y": 1256,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "e2070656.8dd03"
+        "2908da09.77d2fe"
       ]
     ]
   },
   {
-    "id": "e2070656.8dd03",
+    "id": "2908da09.77d2fe",
     "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": 5551.883331298828,
-    "y": 1393.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 5474.500244140625,
+    "y": 1257,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "19136c8e.dcdfbb",
+    "id": "3aa5c8f4.350c08",
     "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": 5562.883331298828,
-    "y": 1338.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 5485.500244140625,
+    "y": 1202,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "4b8f6adb.6d0404",
+    "id": "2d529b4.18963e4",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 5547.265655517578,
-    "y": 1278.5390014648438,
-    "z": "1854297c.6f0f4f",
+    "x": 5469.882568359375,
+    "y": 1141.6556701660156,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "c2a5af15.443d8"
+        "e508aa99.ed11b8"
       ]
     ]
   },
   {
-    "id": "7ccc9bf1.00634c",
+    "id": "40663368.ea789c",
     "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": 5222.883331298828,
-    "y": 1480.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 5038.500244140625,
+    "y": 1238,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "c2a5af15.443d8",
+    "id": "e508aa99.ed11b8",
     "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": 5761.883331298828,
-    "y": 1274.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 5656.500244140625,
+    "y": 1138,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "4eba14c8.80a994",
+    "id": "e66147a6.9621b",
     "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": 4345.883331298828,
-    "y": 928.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 4297.49951171875,
+    "y": 373,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "620253a.9c2552c",
+    "id": "7411318a.e1b958",
     "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": 4336.883331298828,
-    "y": 1026.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 4288.49951171875,
+    "y": 471,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "9c76efc2.c7f458",
+    "id": "62760f41.c93a2",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4170.883331298828,
-    "y": 934.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 4122.49951171875,
+    "y": 379,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "a64deb38.79c21",
-        "4eba14c8.80a994"
+        "92f3b868.34ce6",
+        "e66147a6.9621b"
       ]
     ]
   },
   {
-    "id": "36b200ce.3626f",
+    "id": "273e3fee.2bc13",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4176.883331298828,
-    "y": 998.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 4128.49951171875,
+    "y": 443,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "d00069b9.08211",
-        "620253a.9c2552c"
+        "b6002239.68b828",
+        "7411318a.e1b958"
       ]
     ]
   },
   {
-    "id": "f7a8d104.b779c8",
+    "id": "244a1c4c.c64574",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4176.883331298828,
-    "y": 1104.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 4142.499267578125,
+    "y": 607,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "e2a3248.b77d4d8",
-        "bcbbe769.3c0e1"
+        "55137534.cd97cc",
+        "94e7efd7.f5ec88"
       ]
     ]
   },
   {
-    "id": "2781339a.2c9d8c",
+    "id": "f48105e4.f03428",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4179.883331298828,
-    "y": 1157.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 4145.499267578125,
+    "y": 660,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "69fc971e.d1c948",
-        "6070cd17.b28d74"
+        "ba173e3c.d3cf48",
+        "9c20a9f9.7c2ff"
       ]
     ]
   },
   {
-    "id": "bcbbe769.3c0e1",
+    "id": "94e7efd7.f5ec88",
     "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": 4336.883331298828,
-    "y": 1117.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 4364.499267578125,
+    "y": 674,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "6070cd17.b28d74",
+    "id": "9c20a9f9.7c2ff",
     "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": 4339.883331298828,
-    "y": 1208.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 4367.499267578125,
+    "y": 765,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "ef6aaa0a.46635",
+    "id": "124feda4.be759a",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3711.883331298828,
-    "y": 2418.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 3523.5,
+    "y": 1711,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "a10bbf1c.524bd",
-        "27427337.3be9a4"
+        "e1f69d4c.5b8868",
+        "d4ae5d82.aab8b"
       ]
     ]
   },
   {
-    "id": "a6501243.d121f",
+    "id": "7a356795.78dec",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3539.216827392578,
-    "y": 2419.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 3350.83349609375,
+    "y": 1712,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "ef6aaa0a.46635"
+        "124feda4.be759a"
       ]
     ]
   },
   {
-    "id": "aaec6d99.4c304",
+    "id": "c62c11ee.d3432",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3548.707794189453,
-    "y": 2462.4573669433594,
-    "z": "1854297c.6f0f4f",
+    "x": 3360.324462890625,
+    "y": 1754.5740356445312,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "47f8697d.df9998"
+        "4d29ec31.00d144"
       ]
     ]
   },
   {
-    "id": "e6e0568a.7d4f68",
+    "id": "fa667208.2a7ec",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3537.216827392578,
-    "y": 2508.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 3348.83349609375,
+    "y": 1801,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "2963b336.e3bc8c"
+        "577a09e9.8378d8"
       ]
     ]
   },
   {
-    "id": "47f8697d.df9998",
+    "id": "4d29ec31.00d144",
     "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": 3702.2792053222656,
-    "y": 2465.7431030273438,
-    "z": "1854297c.6f0f4f",
+    "x": 3513.8958740234375,
+    "y": 1757.8597717285156,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "2963b336.e3bc8c",
+    "id": "577a09e9.8378d8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 3706.216827392578,
-    "y": 2509.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 3517.83349609375,
+    "y": 1802,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "a10bbf1c.524bd",
+    "id": "e1f69d4c.5b8868",
     "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": 3998.216827392578,
-    "y": 2422.8834533691406,
-    "z": "1854297c.6f0f4f",
+    "x": 3809.83349609375,
+    "y": 1715.0001220703125,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "b2433bfc.a285b",
-        "e32efd70.259f3"
+        "67e03e9f.e657f8",
+        "8f6dd9a8.907078"
       ]
     ]
   },
   {
-    "id": "e32efd70.259f3",
+    "id": "8f6dd9a8.907078",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4221.216827392578,
-    "y": 2377.8834533691406,
-    "z": "1854297c.6f0f4f",
+    "x": 4032.83349609375,
+    "y": 1670.0001220703125,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "e33d7c06.1215a"
+        "9d5c402b.afbc18"
       ]
     ]
   },
   {
-    "id": "b2433bfc.a285b",
+    "id": "67e03e9f.e657f8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4223.216827392578,
-    "y": 2441.8834533691406,
-    "z": "1854297c.6f0f4f",
+    "x": 4034.83349609375,
+    "y": 1734.0001220703125,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "96c9f851.720ff"
+        "b1dc0c2e.2db02"
       ]
     ]
   },
   {
-    "id": "96c9f851.720ff",
+    "id": "b1dc0c2e.2db02",
     "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": 4382.216827392578,
-    "y": 2460.8834533691406,
-    "z": "1854297c.6f0f4f",
+    "x": 4193.83349609375,
+    "y": 1753.0001220703125,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "e33d7c06.1215a",
+    "id": "9d5c402b.afbc18",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4386.216827392578,
-    "y": 2374.8834533691406,
-    "z": "1854297c.6f0f4f",
+    "x": 4197.83349609375,
+    "y": 1667.0001220703125,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "64140131.87f6a",
-        "d9669ac1.5a2d68"
+        "eb823b6e.5b1b68",
+        "d1229eee.7607f"
       ]
     ]
   },
   {
-    "id": "e5d24864.c4d21",
-    "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<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\n\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='vpn-type' value='`$prop.sotn.vpnType`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 4000.216827392578,
-    "y": 2581.8834533691406,
-    "z": "1854297c.6f0f4f",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "f6b5343f.392d9",
-    "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": 4045.216827392578,
-    "y": 2491.8834533691406,
-    "z": "1854297c.6f0f4f",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "cfe86ca7.011b18",
-    "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": 4127.216827392578,
-    "y": 2646.8834533691406,
-    "z": "1854297c.6f0f4f",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "f7e98987.293918",
+    "id": "ec67f0f.b56539",
     "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": 3311.216827392578,
-    "y": 2454.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 3122.83349609375,
+    "y": 1747,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "a6501243.d121f",
-        "aaec6d99.4c304",
-        "e6e0568a.7d4f68"
+        "7a356795.78dec",
+        "c62c11ee.d3432",
+        "fa667208.2a7ec"
       ]
     ]
   },
   {
-    "id": "d0c5015f.630ad",
+    "id": "ef79491a.ef1ed",
     "type": "comment",
     "name": "Question?",
     "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
     "comments": "",
-    "x": 3272.216827392578,
-    "y": 2398.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 3083.83349609375,
+    "y": 1691,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "1ebd0160.929687",
+    "id": "363ba934.edbd4e",
     "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.216827392578,
-    "y": 2117.8832092285156,
-    "z": "1854297c.6f0f4f",
+    "x": 3135.83349609375,
+    "y": 1493,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "28ff08ce.889b38",
-        "1b36a02a.8e3468"
+        "fab0a5fc.8009e8",
+        "1a41312c.3b3677"
       ]
     ]
   },
   {
-    "id": "1b36a02a.8e3468",
+    "id": "1a41312c.3b3677",
     "type": "failure",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3552.216827392578,
-    "y": 2103.8832092285156,
-    "z": "1854297c.6f0f4f",
+    "x": 3358.83349609375,
+    "y": 1479,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "314f424e.949456"
+        "41d39e09.02c3d8"
       ]
     ]
   },
   {
-    "id": "28ff08ce.889b38",
+    "id": "fab0a5fc.8009e8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3554.216827392578,
-    "y": 2136.8832092285156,
-    "z": "1854297c.6f0f4f",
+    "x": 3360.83349609375,
+    "y": 1512,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "c351a018.b67f98"
+        "31a06a0b.93432e"
       ]
     ]
   },
   {
-    "id": "c351a018.b67f98",
+    "id": "31a06a0b.93432e",
     "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.216827392578,
-    "y": 2133.8832092285156,
-    "z": "1854297c.6f0f4f",
+    "x": 3503.83349609375,
+    "y": 1509,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "314f424e.949456",
+    "id": "41d39e09.02c3d8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3700.216827392578,
-    "y": 2096.8832092285156,
-    "z": "1854297c.6f0f4f",
+    "x": 3506.83349609375,
+    "y": 1472,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "8065ca34.19e0e",
-        "27c4c436.c4a394"
+        "12fe71d9.7bf9be",
+        "c47ac813.f199b8"
       ]
     ]
   },
   {
-    "id": "8065ca34.19e0e",
+    "id": "12fe71d9.7bf9be",
     "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.216827392578,
-    "y": 2099.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 3700.83349609375,
+    "y": 1475.0001220703125,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "27427337.3be9a4",
+    "id": "d4ae5d82.aab8b",
     "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": 3957.216827392578,
-    "y": 2731.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 3753.83349609375,
+    "y": 1834,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "b95f783a.80c45"
+        "7b8dd371.aa4964"
       ]
     ]
   },
   {
-    "id": "b95f783a.80c45",
+    "id": "7b8dd371.aa4964",
     "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": 4163.216827392578,
-    "y": 2731.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 3959.83349609375,
+    "y": 1834,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "fdd7c5c3.71bfe8"
+        "e78bd2af.32742"
       ]
     ]
   },
   {
-    "id": "fdd7c5c3.71bfe8",
+    "id": "e78bd2af.32742",
     "type": "outcome",
     "name": "tunnel-termination-point",
     "xml": "<outcome value='tunnel-termination-point'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4380.502471923828,
-    "y": 2730.705108642578,
-    "z": "1854297c.6f0f4f",
+    "x": 4177.119140625,
+    "y": 1832.82177734375,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "240f5a27.c1a7a6"
+        "231ad36e.3e7974"
       ]
     ]
   },
   {
-    "id": "27c4c436.c4a394",
+    "id": "c47ac813.f199b8",
     "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.216827392578,
-    "y": 2167.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 3722.83349609375,
+    "y": 1543.0001220703125,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "47b31581.268b0c",
-        "43867bdb.1b0d54",
-        "bbdefe01.0e663"
+        "14953bcb.0f686c",
+        "5a2f3f75.0fbf6",
+        "61553bc7.07748c"
       ]
     ]
   },
   {
-    "id": "47b31581.268b0c",
+    "id": "14953bcb.0f686c",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4111.716949462891,
-    "y": 2119.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 3918.3336181640625,
+    "y": 1495.0001220703125,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "bdcfd968.805c18"
+        "e9311021.d720e8"
       ]
     ]
   },
   {
-    "id": "43867bdb.1b0d54",
+    "id": "5a2f3f75.0fbf6",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4103.716949462891,
-    "y": 2174.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 3910.3336181640625,
+    "y": 1550.0001220703125,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "a95a4d5b.d3114"
+        "4fbd5f1f.bd6168"
       ]
     ]
   },
   {
-    "id": "bbdefe01.0e663",
+    "id": "61553bc7.07748c",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4108.716949462891,
-    "y": 2231.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 3915.3336181640625,
+    "y": 1607.0001220703125,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "64398d6f.e5c684"
+        "ccee2aed.1d2c48"
       ]
     ]
   },
   {
-    "id": "64398d6f.e5c684",
+    "id": "ccee2aed.1d2c48",
     "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": 4260.716949462891,
-    "y": 2232.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 4067.3336181640625,
+    "y": 1608.0001220703125,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "a95a4d5b.d3114",
+    "id": "4fbd5f1f.bd6168",
     "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": 4271.716949462891,
-    "y": 2177.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 4078.3336181640625,
+    "y": 1553.0001220703125,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "bdcfd968.805c18",
+    "id": "e9311021.d720e8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4256.099273681641,
-    "y": 2117.5390014648438,
-    "z": "1854297c.6f0f4f",
+    "x": 4062.7159423828125,
+    "y": 1492.6557922363281,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "6d52f6e9.bcbf28"
+        "12595c91.b718eb"
       ]
     ]
   },
   {
-    "id": "64140131.87f6a",
+    "id": "eb823b6e.5b1b68",
     "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": 4556.216827392578,
-    "y": 2335.8834533691406,
-    "z": "1854297c.6f0f4f",
+    "x": 4367.83349609375,
+    "y": 1628.0001220703125,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "d9669ac1.5a2d68",
+    "id": "d1229eee.7607f",
     "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": 4557.216827392578,
-    "y": 2440.8834533691406,
-    "z": "1854297c.6f0f4f",
+    "x": 4368.83349609375,
+    "y": 1733.0001220703125,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "9ddf3bf9.57ff3",
+    "id": "8d0a9501.e59f28",
     "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": 4552.216827392578,
-    "y": 2389.8834533691406,
-    "z": "1854297c.6f0f4f",
+    "x": 4363.83349609375,
+    "y": 1682.0001220703125,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "240f5a27.c1a7a6",
+    "id": "231ad36e.3e7974",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4587.334014892578,
-    "y": 2720.2237854003906,
-    "z": "1854297c.6f0f4f",
+    "x": 4383.95068359375,
+    "y": 1822.3404541015625,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "801a071e.c98f98",
-        "45d249d1.4a712",
-        "37813776.11957"
+        "16f2e433.3291b4",
+        "80f33246.16c218",
+        "51170c35.40a6bc"
       ]
     ]
   },
   {
-    "id": "801a071e.c98f98",
+    "id": "16f2e433.3291b4",
     "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": 4802.334014892578,
-    "y": 2682.2237854003906,
-    "z": "1854297c.6f0f4f",
+    "x": 4598.95068359375,
+    "y": 1784.3404541015625,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "45d249d1.4a712",
+    "id": "80f33246.16c218",
     "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": 4799.334014892578,
-    "y": 2721.2237854003906,
-    "z": "1854297c.6f0f4f",
+    "x": 4595.95068359375,
+    "y": 1823.3404541015625,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "d7c43050.0743b"
+        "ec1220f2.c0002"
       ]
     ]
   },
   {
-    "id": "37813776.11957",
+    "id": "51170c35.40a6bc",
     "type": "break",
     "name": "break",
     "xml": "<break>\n",
     "comments": "",
-    "x": 4754.834014892578,
-    "y": 2763.2237854003906,
-    "z": "1854297c.6f0f4f",
+    "x": 4551.45068359375,
+    "y": 1865.3404541015625,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "d7c43050.0743b",
+    "id": "ec1220f2.c0002",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4979.834014892578,
-    "y": 2720.2237854003906,
-    "z": "1854297c.6f0f4f",
+    "x": 4776.45068359375,
+    "y": 1822.3404541015625,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "161c6e5f.bccb42"
+        "757e93f0.7ee45c"
       ]
     ]
   },
   {
-    "id": "161c6e5f.bccb42",
+    "id": "757e93f0.7ee45c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5137.834014892578,
-    "y": 2720.2237854003906,
-    "z": "1854297c.6f0f4f",
+    "x": 4934.45068359375,
+    "y": 1822.3404541015625,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "268de5ce.943522"
+        "c7244ae.af2a238"
       ]
     ]
   },
   {
-    "id": "268de5ce.943522",
+    "id": "c7244ae.af2a238",
     "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": 5344.834014892578,
-    "y": 2720.2237854003906,
-    "z": "1854297c.6f0f4f",
+    "x": 5141.45068359375,
+    "y": 1822.3404541015625,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "5dd066fb.8bb21",
+    "id": "7e549eab.8dbb18",
     "type": "outcome",
     "name": "esr-thirdparty-sdnc",
     "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4838.216827392578,
-    "y": 2135.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 4644.83349609375,
+    "y": 1511.0001220703125,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "4dd18012.7f83e"
+        "1d3b129c.b2a675"
       ]
     ]
   },
   {
-    "id": "4dd18012.7f83e",
+    "id": "1d3b129c.b2a675",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5015.216827392578,
-    "y": 2127.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 4821.83349609375,
+    "y": 1503.0001220703125,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "cb357072.40504",
-        "41f4620d.06ac64"
+        "b6b58a8c.8e7ea8",
+        "dc3d97ac.463e28"
       ]
     ]
   },
   {
-    "id": "6d52f6e9.bcbf28",
+    "id": "12595c91.b718eb",
     "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.216827392578,
-    "y": 2131.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 4246.83349609375,
+    "y": 1507.0001220703125,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "1558a590.3c3faa"
+        "a772c4a4.38145"
       ]
     ]
   },
   {
-    "id": "1558a590.3c3faa",
+    "id": "a772c4a4.38145",
     "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.216827392578,
-    "y": 2131.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 4441.83349609375,
+    "y": 1507.0001220703125,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "5dd066fb.8bb21",
-        "a026e3da.a47c68"
+        "7e549eab.8dbb18",
+        "aea7a178.f6fc4"
       ]
     ]
   },
   {
-    "id": "41f4620d.06ac64",
+    "id": "dc3d97ac.463e28",
     "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.216827392578,
-    "y": 2134.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 5029.83349609375,
+    "y": 1510.0001220703125,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "304be603.33560a",
-        "7b7d3ebe.8d439",
-        "4d809924.5591a8"
+        "3bf3e082.eea5e8",
+        "58cb7d25.d2da94",
+        "d2f7fa01.93a528"
       ]
     ]
   },
   {
-    "id": "e13819fd.c513e8",
+    "id": "a307fd53.34615",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5017.216827392578,
-    "y": 2200.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 4823.83349609375,
+    "y": 1576.0001220703125,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "b46e83ff.b91008"
+        "ca73ba2d.29c1c8"
       ]
     ]
   },
   {
-    "id": "a026e3da.a47c68",
+    "id": "aea7a178.f6fc4",
     "type": "outcome",
     "name": "network-resource",
     "xml": "<outcome value='network-resource'>",
     "comments": "",
     "outputs": 1,
-    "x": 4840.216827392578,
-    "y": 2208.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 4646.83349609375,
+    "y": 1584.0001220703125,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "e13819fd.c513e8"
+        "a307fd53.34615"
       ]
     ]
   },
   {
-    "id": "cb357072.40504",
+    "id": "b6b58a8c.8e7ea8",
     "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.216827392578,
-    "y": 2082.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 5059.83349609375,
+    "y": 1458.0001220703125,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "b46e83ff.b91008",
+    "id": "ca73ba2d.29c1c8",
     "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.216827392578,
-    "y": 2324.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 5005.83349609375,
+    "y": 1640.0001220703125,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "304be603.33560a",
+    "id": "3bf3e082.eea5e8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5433.216827392578,
-    "y": 2125.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 5239.83349609375,
+    "y": 1501.0001220703125,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "d9386700.ef3558"
+        "36f4f947.29aeae"
       ]
     ]
   },
   {
-    "id": "7b7d3ebe.8d439",
+    "id": "58cb7d25.d2da94",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5425.216827392578,
-    "y": 2180.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 5231.83349609375,
+    "y": 1556.0001220703125,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "b1a122b9.2b3df"
+        "b7803a75.d7ec1"
       ]
     ]
   },
   {
-    "id": "4d809924.5591a8",
+    "id": "d2f7fa01.93a528",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5430.216827392578,
-    "y": 2237.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 5236.83349609375,
+    "y": 1613.0001220703125,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "7206a51a.368f14"
+        "8d6cbae8.86128"
       ]
     ]
   },
   {
-    "id": "7206a51a.368f14",
+    "id": "8d6cbae8.86128",
     "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.216827392578,
-    "y": 2238.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 5388.83349609375,
+    "y": 1614.0001220703125,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "b1a122b9.2b3df",
+    "id": "b7803a75.d7ec1",
     "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.216827392578,
-    "y": 2183.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 5399.83349609375,
+    "y": 1559.0001220703125,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "d9386700.ef3558",
+    "id": "36f4f947.29aeae",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 5577.599151611328,
-    "y": 2123.5390014648438,
-    "z": "1854297c.6f0f4f",
+    "x": 5384.2158203125,
+    "y": 1498.6557922363281,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "c475367c.4940f8"
+        "b6324aba.def4e"
       ]
     ]
   },
   {
-    "id": "c475367c.4940f8",
+    "id": "b6324aba.def4e",
     "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.216827392578,
-    "y": 2119.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 5598.83349609375,
+    "y": 1495.0001220703125,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "6b01ec04.e8e8dc",
+    "id": "631e76e1.71afc",
     "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": 3290.883331298828,
-    "y": 1729.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 3187.5,
+    "y": 1317,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "6404a595.2767cc",
+    "id": "d1d7f338.2c48e",
     "type": "comment",
     "name": "This is it (should be)",
     "info": "",
     "comments": "",
-    "x": 4512.883331298828,
-    "y": 1012.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 4464.49951171875,
+    "y": 457,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "fdf288f5.399238",
+    "id": "df68ae5a.c6abe",
     "type": "comment",
     "name": "This is it (should be)",
     "info": "",
     "comments": "",
-    "x": 4504.883331298828,
-    "y": 1102.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 4532.499267578125,
+    "y": 659,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "ce90c6ec.193398",
+    "id": "b17f4ff2.75d93",
     "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": 3271.883331298828,
-    "y": 2585.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 3083.5,
+    "y": 1878,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "323cec2c.88d45c",
+    "id": "8048035e.723ef",
     "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": 3422.883331298828,
-    "y": 2833.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 3345.5,
+    "y": 2791,
+    "z": "4138d8f7.da252",
     "wires": [
       []
     ]
   },
   {
-    "id": "fba2883c.72d2",
+    "id": "d590aba5.94aa48",
     "type": "switchNode",
     "name": "switch found-middle-man?",
     "xml": "<switch test='`$found-middle-man`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3299.883331298828,
-    "y": 2943.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 3222.5,
+    "y": 2901,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "b06a53c9.6a23c",
-        "52a66ca0.57e87c"
+        "507ab41.362cbcc",
+        "63f9a6e5.2f9178"
       ]
     ]
   },
   {
-    "id": "b06a53c9.6a23c",
+    "id": "507ab41.362cbcc",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3483.883331298828,
-    "y": 2922.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 3406.5,
+    "y": 2880,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "d4c9f2dc.11912"
+        "28f5fd24.d628ea"
       ]
     ]
   },
   {
-    "id": "52a66ca0.57e87c",
+    "id": "63f9a6e5.2f9178",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3019.883331298828,
-    "y": 4508.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 2942.5,
+    "y": 4466,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "7ebd19ad.940af8"
+        "db2110db.2b1778"
       ]
     ]
   },
   {
-    "id": "d74b6b50.22dd88",
+    "id": "9f11b3.a8080e5",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 3530.883331298828,
-    "y": 5093.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 3453.5,
+    "y": 5051,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "b3935092.c652b8",
-        "28b03e50.9f7992",
-        "980b4828.96504",
-        "17af28da.ceda4f",
-        "2c43e5ee.399d8a"
+        "40ac4d15.a539ec",
+        "577ac65e.4cd8e8",
+        "c33c721b.c24a68",
+        "e8ff43f0.c9213",
+        "c23415ae.23176",
+        "b27458da.77b73"
       ]
     ]
   },
   {
-    "id": "d4c9f2dc.11912",
+    "id": "28f5fd24.d628ea",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 6602.883331298828,
-    "y": 2952.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 6119.5,
+    "y": 1700,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "1d7e1faa.548828",
-        "85f258da.5f0598",
-        "4b074654.080e5",
-        "5d8ffada.d10fc4",
-        "ea403b0c.aaf7e",
-        "1235d80a.544f18",
-        "af33968a.8315c",
-        "9cfe0ae9.258d58",
-        "65dbbd5b.a49b4c",
-        "1d15547d.10576c",
-        "89a6c1ea.eb5688",
-        "2f9ad2ef.1013a6",
-        "a5dc8f9.8a79df",
-        "e38bf422.7c8768",
-        "43d0f5c9.60220c",
-        "2b09e0eb.8326d",
-        "1698c025.c5ee78",
-        "1d008796.234d18",
-        "76e889a9.7e8db8"
+        "4783da3c.fb84a4",
+        "bb88421.9f996c",
+        "55b1d688.471dd",
+        "31123019.0abe4",
+        "1759beb1.f3c1d1",
+        "98f705b0.6bc73",
+        "b6e856a5.c69918",
+        "277a36b1.830aba",
+        "f9e2137d.7a2d78",
+        "3298314.8dc664e",
+        "cfdca91b.21bde",
+        "a46de057.2f2f3",
+        "2c505364.e529bc",
+        "5713069a.52e6e",
+        "736cdf51.8421c8",
+        "a19bdc2c.350be8",
+        "829d6c73.aa7da8",
+        "57d8804.ea8d28",
+        "39b6682a.960bc",
+        "858f96c1.79cbc",
+        "1b0442b9.4b628d",
+        "c1546bd.e66d418"
       ]
     ]
   },
   {
-    "id": "65dbbd5b.a49b4c",
+    "id": "f9e2137d.7a2d78",
     "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": 6913.883331298828,
-    "y": 3307.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 6490.5,
+    "y": 1623,
+    "z": "4138d8f7.da252",
     "wires": [
       []
     ]
   },
   {
-    "id": "1d7e1faa.548828",
+    "id": "4783da3c.fb84a4",
     "type": "save",
     "name": "save connectivity resource in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainB-uuid`' />\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' -->\n<!--      key='connectivity.connectivity-id = $tmp.ROOT.uni-p-interface-long'>-->\n<!--<parameter name='connectivity-id' value='`$tmp.ROOT.uni-p-interface-long`' />-->\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\n<parameter name='color-aware' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='vpn-type' value='root' />\n\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 6867.883331298828,
-    "y": 3405.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 6444.5,
+    "y": 1721,
+    "z": "4138d8f7.da252",
     "wires": [
       []
     ]
   },
   {
-    "id": "85f258da.5f0598",
+    "id": "bb88421.9f996c",
     "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": 7003.883331298828,
-    "y": 3452.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 6580.5,
+    "y": 1768,
+    "z": "4138d8f7.da252",
     "wires": [
       []
     ]
   },
   {
-    "id": "7c12d148.f08d78",
+    "id": "a3afcd58.883878",
     "type": "comment",
     "name": "Create ROOT connectivity",
     "info": "",
     "comments": "",
-    "x": 6834.883331298828,
-    "y": 3256.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 6411.5,
+    "y": 1572,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "8342cd90.5a2f6",
+    "id": "47893e3d.7abf68",
     "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": 7360.883331298828,
-    "y": 3747.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 6907.5,
+    "y": 2308,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "4b074654.080e5",
+    "id": "55b1d688.471dd",
     "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": 6924.883331298828,
-    "y": 3786.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 6471.5,
+    "y": 2347,
+    "z": "4138d8f7.da252",
     "wires": [
       []
     ]
   },
   {
-    "id": "5d8ffada.d10fc4",
+    "id": "31123019.0abe4",
     "type": "save",
     "name": "save connectivity resource in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-middle-man-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-middle-man-uuid`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<!--The followings are not needed for the middle-man-connectivity-->\n<!--<parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />-->\n<!--<parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />-->\n<!--<parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />-->\n<!--<parameter name='access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />-->\n<!--<parameter name='access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />-->\n<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\n<parameter name='color-aware' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='vpn-type' value='mdsc' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 6872.883331298828,
-    "y": 3837.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 6419.5,
+    "y": 2398,
+    "z": "4138d8f7.da252",
     "wires": [
       []
     ]
   },
   {
-    "id": "ea403b0c.aaf7e",
+    "id": "1759beb1.f3c1d1",
     "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": 7008.883331298828,
-    "y": 3884.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 6555.5,
+    "y": 2445,
+    "z": "4138d8f7.da252",
     "wires": [
       []
     ]
   },
   {
-    "id": "18aaa2dc.b37a3d",
+    "id": "71216be9.ff79f4",
     "type": "comment",
     "name": "Create MIDDLE-MAN connectivity",
     "info": "",
     "comments": "",
-    "x": 6865.883331298828,
-    "y": 3746.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 6412.5,
+    "y": 2307,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "b8a58f62.fd6f68",
+    "id": "3446875.4213df8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 7295.883331298828,
-    "y": 3943.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 6842.5,
+    "y": 2504,
+    "z": "4138d8f7.da252",
     "wires": [
       []
     ]
   },
   {
-    "id": "1235d80a.544f18",
+    "id": "98f705b0.6bc73",
     "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": 6886.883331298828,
-    "y": 3990.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 6433.5,
+    "y": 2551,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "caaa8d0a.a400c",
-        "ba918a95.063018",
-        "73076382.d5d394"
+        "4cd47e4a.423aa8",
+        "dbf8ee5e.1c40a8",
+        "e7f2720f.fd9208"
       ]
     ]
   },
   {
-    "id": "caaa8d0a.a400c",
+    "id": "4cd47e4a.423aa8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 7133.883331298828,
-    "y": 3944.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 6680.5,
+    "y": 2505,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "b8a58f62.fd6f68"
+        "3446875.4213df8"
       ]
     ]
   },
   {
-    "id": "ba918a95.063018",
+    "id": "dbf8ee5e.1c40a8",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 7134.374298095703,
-    "y": 3990.4573669433594,
-    "z": "1854297c.6f0f4f",
+    "x": 6680.990966796875,
+    "y": 2550.5740356445312,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "70335d13.df0d4c"
+        "5c2d61a6.b888d8"
       ]
     ]
   },
   {
-    "id": "73076382.d5d394",
+    "id": "e7f2720f.fd9208",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 7131.883331298828,
-    "y": 4033.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 6678.5,
+    "y": 2594,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "3d4cb88b.ddae8"
+        "7deb6a39.1c780c"
       ]
     ]
   },
   {
-    "id": "70335d13.df0d4c",
+    "id": "5c2d61a6.b888d8",
     "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": 7296.945709228516,
-    "y": 3990.7431030273438,
-    "z": "1854297c.6f0f4f",
+    "x": 6843.5623779296875,
+    "y": 2550.8597717285156,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "3d4cb88b.ddae8",
+    "id": "7deb6a39.1c780c",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 7300.883331298828,
-    "y": 4034.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 6847.5,
+    "y": 2595,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "43d0f5c9.60220c",
+    "id": "736cdf51.8421c8",
     "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": 6943.883331298828,
-    "y": 4269.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 6487.5,
+    "y": 2867,
+    "z": "4138d8f7.da252",
     "wires": [
       []
     ]
   },
   {
-    "id": "2b09e0eb.8326d",
+    "id": "a19bdc2c.350be8",
     "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": 6946.883331298828,
-    "y": 4314.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 6490.5,
+    "y": 2912,
+    "z": "4138d8f7.da252",
     "wires": [
       []
     ]
   },
   {
-    "id": "1d008796.234d18",
+    "id": "57d8804.ea8d28",
     "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": 6935.883331298828,
-    "y": 4105.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 6482.5,
+    "y": 2666,
+    "z": "4138d8f7.da252",
     "wires": [
       []
     ]
   },
   {
-    "id": "76e889a9.7e8db8",
+    "id": "39b6682a.960bc",
     "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": 6937.883331298828,
-    "y": 4152.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 6484.5,
+    "y": 2713,
+    "z": "4138d8f7.da252",
     "wires": [
       []
     ]
   },
   {
-    "id": "2304ec84.74d9f4",
+    "id": "35de923d.3dc786",
     "type": "comment",
     "name": "The following two will be done in F1",
     "info": "",
     "comments": "",
-    "x": 6859.883331298828,
-    "y": 4222.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 6403.5,
+    "y": 2820,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "175b5cd1.9f40e3",
+    "id": "64b6242c.0fc1a4",
     "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": 4489.883087158203,
-    "y": 5373.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 4403.500244140625,
+    "y": 5213,
+    "z": "4138d8f7.da252",
     "wires": [
       []
     ]
   },
   {
-    "id": "b3935092.c652b8",
+    "id": "40ac4d15.a539ec",
     "type": "switchNode",
     "name": "switch no-pce-call",
     "xml": "<switch test='`$no-pce-call`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3745.883331298828,
-    "y": 5074.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 3668.5,
+    "y": 5032,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "b8e9bffb.cdc88",
-        "256198d1.5f7cf8"
+        "243fddd4.c99fc2",
+        "ed2a1041.39364"
       ]
     ]
   },
   {
-    "id": "256198d1.5f7cf8",
+    "id": "ed2a1041.39364",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3917.883331298828,
-    "y": 5071.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 3840.5,
+    "y": 5029,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "30a42efe.828c8a"
+        "f749d2c9.24f0b"
       ]
     ]
   },
   {
-    "id": "b8e9bffb.cdc88",
+    "id": "243fddd4.c99fc2",
     "type": "outcomeFalse",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3869.883331298828,
-    "y": 5918.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 3792.5,
+    "y": 5876,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "2ed5b6b9.722642"
+        "a2f25d49.46cd88"
       ]
     ]
   },
   {
-    "id": "9dc6e8a7.9c1158",
+    "id": "54d55fbb.9ecd9",
     "type": "comment",
     "name": "1 --> PCE is needed",
     "info": "",
     "comments": "",
-    "x": 3930.883331298828,
-    "y": 5041.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 3853.5,
+    "y": 4999,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "e1ff48b3.343b9",
+    "id": "2bf8aac8.9b318e",
     "type": "comment",
     "name": "2 --> no need to call PCE",
     "info": "",
     "comments": "",
-    "x": 3940.883331298828,
-    "y": 5876.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 3863.5,
+    "y": 5834,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "af33968a.8315c",
+    "id": "b6e856a5.c69918",
     "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": 6943.883331298828,
-    "y": 4378.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 6489.5,
+    "y": 3046,
+    "z": "4138d8f7.da252",
     "wires": [
       []
     ]
   },
   {
-    "id": "30a42efe.828c8a",
+    "id": "f749d2c9.24f0b",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4093.883331298828,
-    "y": 5073.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 4016.5,
+    "y": 5031,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "2892dc09.31fadc",
-        "afa31c79.54acd8",
-        "e8807ba5.c313d8",
-        "f07ffbda.6acb28",
-        "78d94074.f38b7",
-        "95bef4a8.5a7ff8",
-        "175b5cd1.9f40e3"
+        "b146a69c.13b518",
+        "436ccdfb.1e8f5c",
+        "124f51e3.777566",
+        "91ebdf82.9979e",
+        "3da01b2d.c332ec",
+        "59b34ffd.7f824",
+        "64b6242c.0fc1a4",
+        "cb7342b9.a9c168",
+        "7a7c44d8.30aa44"
       ]
     ]
   },
   {
-    "id": "d52f0d8d.4208d8",
+    "id": "f96e508.5132a3",
     "type": "comment",
     "name": "Use the middle-man-conn.eth-srv-name for the LEAF connectivity's eth srv name",
     "info": "",
     "comments": "",
-    "x": 5537.883087158203,
-    "y": 4998.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 5460.499755859375,
+    "y": 4956,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "2892dc09.31fadc",
+    "id": "b146a69c.13b518",
     "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": 4484.883087158203,
-    "y": 5676.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 4262.500244140625,
+    "y": 5712,
+    "z": "4138d8f7.da252",
     "wires": [
       []
     ]
   },
   {
-    "id": "9cfe0ae9.258d58",
+    "id": "277a36b1.830aba",
     "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": 6919.883331298828,
-    "y": 3646.883331298828,
-    "z": "1854297c.6f0f4f",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "753d3ee1.bef8a",
-    "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 = $prop.connectivity-domainA-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.LEAF.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.LEAF.uni-p-interface-long`\" />",
-    "comments": "",
-    "outputs": 1,
-    "x": 3403.883331298828,
-    "y": 1835.8833312988281,
-    "z": "1854297c.6f0f4f",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "564c1334.4c1554",
-    "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-p-interface-short`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 3310.883331298828,
-    "y": 1782.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 6496.5,
+    "y": 1962,
+    "z": "4138d8f7.da252",
     "wires": [
       []
     ]
   },
   {
-    "id": "514b6193.3ff5b",
+    "id": "467249d9.2faa78",
     "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": 6969.883331298828,
-    "y": 3349.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 6546.5,
+    "y": 1665,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "1d15547d.10576c",
+    "id": "3298314.8dc664e",
     "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": 6916.883331298828,
-    "y": 2937.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 6493.5,
+    "y": 1253,
+    "z": "4138d8f7.da252",
     "wires": [
       []
     ]
   },
   {
-    "id": "89a6c1ea.eb5688",
+    "id": "cfdca91b.21bde",
     "type": "save",
     "name": "save connectivity resource in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='vpn-type' value='leaf' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 6864.883331298828,
-    "y": 2985.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 6441.5,
+    "y": 1301,
+    "z": "4138d8f7.da252",
     "wires": [
       []
     ]
   },
   {
-    "id": "2f9ad2ef.1013a6",
+    "id": "a46de057.2f2f3",
     "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": 6992.883331298828,
-    "y": 3032.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 6569.5,
+    "y": 1348,
+    "z": "4138d8f7.da252",
     "wires": [
       []
     ]
   },
   {
-    "id": "baf2c2db.c807d8",
+    "id": "f85b4c38.36c218",
     "type": "comment",
     "name": "Create LEAF connectivity",
     "info": "",
     "comments": "",
-    "x": 6829.883331298828,
-    "y": 2895.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 6406.5,
+    "y": 1211,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "a5dc8f9.8a79df",
+    "id": "2c505364.e529bc",
     "type": "save",
     "name": "save LEAF UNI in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.LEAF.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='data-source' value='`$gfp`' />",
     "comments": "",
     "outputs": 1,
-    "x": 6826.883331298828,
-    "y": 3123.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 6403.5,
+    "y": 1439,
+    "z": "4138d8f7.da252",
     "wires": [
       []
     ]
   },
   {
-    "id": "e38bf422.7c8768",
+    "id": "5713069a.52e6e",
     "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": 6919.883331298828,
-    "y": 3176.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 6496.5,
+    "y": 1492,
+    "z": "4138d8f7.da252",
     "wires": [
       []
     ]
   },
   {
-    "id": "5474c24a.9f6dac",
+    "id": "9a759e0c.1860c8",
     "type": "comment",
     "name": "Create LEAF UNI",
     "info": "",
     "comments": "",
-    "x": 6810.883331298828,
-    "y": 3079.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 6387.5,
+    "y": 1395,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "63adea28.503954",
+    "id": "147d7127.d8042f",
     "type": "comment",
     "name": "Create ROOT UNI",
     "info": "",
     "comments": "",
-    "x": 6816.883331298828,
-    "y": 3529.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 6393.5,
+    "y": 1845,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "f07ffbda.6acb28",
+    "id": "91ebdf82.9979e",
     "type": "save",
     "name": "save LEAF UNI in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.LEAF.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='data-source' value='`$gfp`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 4406.883087158203,
-    "y": 5006.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 4329.499755859375,
+    "y": 4964,
+    "z": "4138d8f7.da252",
     "wires": [
       []
     ]
   },
   {
-    "id": "5623ebdb.1a4534",
+    "id": "148c6264.137e86",
     "type": "comment",
     "name": "Create LEAF UNI",
     "info": "",
     "comments": "",
-    "x": 4390.883087158203,
-    "y": 4962.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 4313.499755859375,
+    "y": 4920,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "4b470452.112d8c",
+    "id": "c1a606a9.56c798",
     "type": "comment",
     "name": "Create LEAF connectivity",
     "info": "",
     "comments": "",
-    "x": 5137.883087158203,
-    "y": 4993.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 5060.499755859375,
+    "y": 4951,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "effc1efd.4a1d3",
+    "id": "fd2b62b6.10b14",
     "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": 5224.883087158203,
-    "y": 5035.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 5147.499755859375,
+    "y": 4993,
+    "z": "4138d8f7.da252",
     "wires": [
       []
     ]
   },
   {
-    "id": "5c8eea0c.68cc14",
+    "id": "f21eb35f.395438",
     "type": "save",
     "name": "save connectivity resource in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />\n<parameter name='etht-svc-name' value='`$middle-man-conn.etht-svc-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='vpn-type' value='leaf' />\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
     "comments": "",
     "outputs": 1,
-    "x": 5172.883087158203,
-    "y": 5083.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 5095.499755859375,
+    "y": 5041,
+    "z": "4138d8f7.da252",
     "wires": [
       []
     ]
   },
   {
-    "id": "e7adda57.489d68",
+    "id": "59f69d26.ab3de4",
     "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": 5300.883087158203,
-    "y": 5130.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 5223.499755859375,
+    "y": 5088,
+    "z": "4138d8f7.da252",
     "wires": [
       []
     ]
   },
   {
-    "id": "95bef4a8.5a7ff8",
+    "id": "59b34ffd.7f824",
     "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": 4477.883087158203,
-    "y": 5415.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 4391.500244140625,
+    "y": 5255,
+    "z": "4138d8f7.da252",
     "wires": [
       []
     ]
   },
   {
-    "id": "63c65355.a8cec4",
+    "id": "9d4ad6d0.458de8",
     "type": "comment",
     "name": "populate connectivity-B variable in the context map",
     "info": "",
     "comments": "",
-    "x": 4460.883087158203,
-    "y": 5477.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 4374.500244140625,
+    "y": 5317,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "afa31c79.54acd8",
+    "id": "436ccdfb.1e8f5c",
     "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": 4571.883087158203,
-    "y": 5519.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 4485.500244140625,
+    "y": 5359,
+    "z": "4138d8f7.da252",
     "wires": [
       []
     ]
   },
   {
-    "id": "be0ea96a.8229",
+    "id": "3e23ff77.47e2b",
     "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": 5019.883087158203,
-    "y": 5572.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 4942.499755859375,
+    "y": 5530,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "4ebf5b73.f18c34",
+    "id": "ff11fb03.980398",
     "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": 4329.883087158203,
-    "y": 6270.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 4252.499755859375,
+    "y": 6228,
+    "z": "4138d8f7.da252",
     "wires": [
       []
     ]
   },
   {
-    "id": "58b6c88a.c0b81",
+    "id": "4e6fe55.c2f201c",
     "type": "save",
     "name": "save LEAF UNI in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.LEAF.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='data-source' value='`$gfp`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 4262.883087158203,
-    "y": 6224.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 4185.499755859375,
+    "y": 6182,
+    "z": "4138d8f7.da252",
     "wires": [
       []
     ]
   },
   {
-    "id": "cd721269.4316d8",
+    "id": "79eda8bd.206ac",
     "type": "comment",
     "name": "Create LEAF UNI",
     "info": "",
     "comments": "",
-    "x": 4211.883087158203,
-    "y": 6175.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 4134.499755859375,
+    "y": 6133,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "be012245.15127",
+    "id": "2a4071b4.a3adee",
     "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": 4994.883331298828,
-    "y": 6381.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 4917.5,
+    "y": 6339,
+    "z": "4138d8f7.da252",
     "wires": [
       []
     ]
   },
   {
-    "id": "e8807ba5.c313d8",
+    "id": "124f51e3.777566",
     "type": "switchNode",
     "name": "switch found-root-connectivity",
     "xml": "\n<switch test=\"`$found-root-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4398.883087158203,
-    "y": 5576.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 4312.500244140625,
+    "y": 5416,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "572d7988.ef657",
-        "f53c00f0.cf63b8"
+        "ce39c047.e7ad38",
+        "bd96b648.334cf8"
       ]
     ]
   },
   {
-    "id": "572d7988.ef657",
+    "id": "ce39c047.e7ad38",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4609.883087158203,
-    "y": 5576.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 4523.500244140625,
+    "y": 5416,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "a96de56.d3d4f18"
+        "acd66ccf.e95b3"
       ]
     ]
   },
   {
-    "id": "a96de56.d3d4f18",
+    "id": "acd66ccf.e95b3",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4765.883087158203,
-    "y": 5572.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 4679.500244140625,
+    "y": 5412,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "be0ea96a.8229",
-        "d676c28d.645a28",
-        "bc2e1526.9ae628"
+        "3e23ff77.47e2b",
+        "1f30d01.395cc3",
+        "58a0b8d5.3916c8"
       ]
     ]
   },
   {
-    "id": "f53c00f0.cf63b8",
+    "id": "bd96b648.334cf8",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4605.883087158203,
-    "y": 5624.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 4519.500244140625,
+    "y": 5464,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "d258f77c.8cc748"
+        "2c5c5163.2ee716"
       ]
     ]
   },
   {
-    "id": "d258f77c.8cc748",
+    "id": "2c5c5163.2ee716",
     "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": 4753.883087158203,
-    "y": 5619.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 4667.500244140625,
+    "y": 5459,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "5438b6e6.1482f8",
+    "id": "8af1d85e.882ed",
     "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": 5261.883087158203,
-    "y": 5201.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 5184.499755859375,
+    "y": 5159,
+    "z": "4138d8f7.da252",
     "wires": [
       []
     ]
   },
   {
-    "id": "42097510.f58b64",
+    "id": "cf6d7172.69b4b8",
     "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": 2428.883331298828,
-    "y": 160.88333129882812,
-    "z": "1854297c.6f0f4f",
+    "x": 2351.5,
+    "y": 118,
+    "z": "4138d8f7.da252",
     "wires": [
       []
     ]
   },
   {
-    "id": "7a55e6a1.70e4b",
+    "id": "326038f4.f291a",
     "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": 2362.883331298828,
-    "y": 196.88333129882812,
-    "z": "1854297c.6f0f4f",
+    "x": 2285.5,
+    "y": 154,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "bf79a82b.b4ff98",
+    "id": "2bce3640.48de4a",
     "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": 2547.883331298828,
-    "y": 123.88333129882812,
-    "z": "1854297c.6f0f4f",
+    "x": 2470.5,
+    "y": 81,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "7675dfe3.26b5f8",
+    "id": "7170f2f2.71fadc",
     "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": 4296.883087158203,
-    "y": 6336.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 4219.499755859375,
+    "y": 6294,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "ce5c7ab5.bd83c8",
+    "id": "2402858c.2e7c4a",
     "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": 4429.883087158203,
-    "y": 6384.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 4352.499755859375,
+    "y": 6342,
+    "z": "4138d8f7.da252",
     "wires": [
       []
     ]
   },
   {
-    "id": "60efc6f5.6c666",
+    "id": "2fcf2035.98d3c",
     "type": "switchNode",
     "name": "switch found-connectivity?",
     "xml": "\n<switch test=\"`$found-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4248.883087158203,
-    "y": 6442.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 4171.499755859375,
+    "y": 6400,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "f080a66c.4f7ec8",
-        "652b319b.ab8708"
+        "c3761e40.b25338",
+        "ce543bbd.a7b0f8"
       ]
     ]
   },
   {
-    "id": "f080a66c.4f7ec8",
+    "id": "c3761e40.b25338",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4441.883087158203,
-    "y": 6443.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 4364.499755859375,
+    "y": 6401,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "10a44adb.d38a25"
+        "70442e7d.0be548"
       ]
     ]
   },
   {
-    "id": "10a44adb.d38a25",
+    "id": "70442e7d.0be548",
     "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": 4597.883087158203,
-    "y": 6440.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 4520.499755859375,
+    "y": 6398,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "652b319b.ab8708",
+    "id": "ce543bbd.a7b0f8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4445.883087158203,
-    "y": 6487.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 4368.499755859375,
+    "y": 6445,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "a7138657.394d98"
+        "47cf8ce2.24939c"
       ]
     ]
   },
   {
-    "id": "a7138657.394d98",
+    "id": "47cf8ce2.24939c",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4584.883087158203,
-    "y": 6482.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 4507.499755859375,
+    "y": 6440,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "be012245.15127",
-        "cc830633.a13cc",
-        "cd9f0573.3ee2f8",
-        "a5be208e.ddaeb8",
-        "eaad5657.8cd72",
-        "eb39c4f9.289008",
-        "f25bfca7.d75338",
-        "ea968dfa.497e7",
-        "11d506a.c6a64f9",
-        "d968015c.39cda8",
-        "54a65e87.65172",
-        "11c77751.f259a1",
-        "9efae615.dd5ab"
+        "2a4071b4.a3adee",
+        "ca3ef968.6dda08",
+        "9655804c.a8367",
+        "94748373.e9e958",
+        "a0da2cb6.f8de08",
+        "5744849a.cc54ac",
+        "4e084c4a.411b3c",
+        "9bb50a9.812c6f8",
+        "5a3abbf9.5bd584",
+        "860af8d0.fc96e8",
+        "f942597e.1aa18",
+        "fc4aa587.17d69",
+        "afa717d0.25e7a8"
       ]
     ]
   },
   {
-    "id": "f25bfca7.d75338",
+    "id": "4e084c4a.411b3c",
     "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": 4781.883087158203,
-    "y": 7161.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 4704.499755859375,
+    "y": 7119,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "3dba1ed8.091bf2",
-        "7f8f7997.fe796",
-        "d8010c15.3a2778"
+        "b531f7cf.459858",
+        "14585404.95eb44",
+        "91bd86e2.073e5"
       ]
     ]
   },
   {
-    "id": "3dba1ed8.091bf2",
+    "id": "b531f7cf.459858",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4976.88330078125,
-    "y": 7137.88330078125,
-    "z": "1854297c.6f0f4f",
+    "x": 4899.499969482422,
+    "y": 7094.999969482422,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "1b65a6f4.4e2729"
+        "7a861e6f.3259d"
       ]
     ]
   },
   {
-    "id": "7f8f7997.fe796",
+    "id": "14585404.95eb44",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4969.374267578125,
-    "y": 7174.457336425781,
-    "z": "1854297c.6f0f4f",
+    "x": 4891.990936279297,
+    "y": 7131.574005126953,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "403902c8.70c854"
+        "7b4d1550.4d39b4"
       ]
     ]
   },
   {
-    "id": "d8010c15.3a2778",
+    "id": "91bd86e2.073e5",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4966.88330078125,
-    "y": 7217.88330078125,
-    "z": "1854297c.6f0f4f",
+    "x": 4889.499969482422,
+    "y": 7174.999969482422,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "ab2fcd35.01c098"
+        "c9793222.0d19b8"
       ]
     ]
   },
   {
-    "id": "1b65a6f4.4e2729",
+    "id": "7a861e6f.3259d",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5148.88330078125,
-    "y": 7135.88330078125,
-    "z": "1854297c.6f0f4f",
+    "x": 5071.499969482422,
+    "y": 7092.999969482422,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "c7100026.09f848"
+        "96392b44.e759e"
       ]
     ]
   },
   {
-    "id": "403902c8.70c854",
+    "id": "7b4d1550.4d39b4",
     "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": 5131.9456787109375,
-    "y": 7174.743072509766,
-    "z": "1854297c.6f0f4f",
+    "x": 5054.562347412109,
+    "y": 7131.8597412109375,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "ab2fcd35.01c098",
+    "id": "c9793222.0d19b8",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 5133.88330078125,
-    "y": 7216.88330078125,
-    "z": "1854297c.6f0f4f",
+    "x": 5056.499969482422,
+    "y": 7173.999969482422,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "c7100026.09f848",
+    "id": "96392b44.e759e",
     "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": 5389.883087158203,
-    "y": 7169.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 5312.499755859375,
+    "y": 7127,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "746d723d.92756c"
+        "dcbe395c.2f719"
       ]
     ]
   },
   {
-    "id": "746d723d.92756c",
+    "id": "dcbe395c.2f719",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5626.883087158203,
-    "y": 7165.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 5549.499755859375,
+    "y": 7123,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "c84e8944.ab748"
+        "d5739a70.ba04c"
       ]
     ]
   },
   {
-    "id": "9e3ec759.f9e0d",
+    "id": "6bd2c51b.a65de4",
     "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": 5893.883087158203,
-    "y": 7131.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 5816.499755859375,
+    "y": 7089,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "4fee4c24.360bcc",
-        "4314046.5a68afc"
+        "c0446363.1c2dd",
+        "c5d80881.fdd1f"
       ]
     ]
   },
   {
-    "id": "4fee4c24.360bcc",
+    "id": "c0446363.1c2dd",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6074.883087158203,
-    "y": 7157.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 5997.499755859375,
+    "y": 7115,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "c84e8944.ab748"
+        "d5739a70.ba04c"
       ]
     ]
   },
   {
-    "id": "4314046.5a68afc",
+    "id": "c5d80881.fdd1f",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6073.883087158203,
-    "y": 7110.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 5996.499755859375,
+    "y": 7068,
+    "z": "4138d8f7.da252",
     "wires": [
       []
     ]
   },
   {
-    "id": "c84e8944.ab748",
+    "id": "d5739a70.ba04c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4590.88330078125,
-    "y": 7305.88330078125,
-    "z": "1854297c.6f0f4f",
+    "x": 4513.499969482422,
+    "y": 7262.999969482422,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "cbf296b5.4a44d"
+        "edcf20b8.e61748"
       ]
     ]
   },
   {
-    "id": "1eeaf51a.0f85d3",
+    "id": "4fecf72f.04fbc",
     "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": 5666.883087158203,
-    "y": 7337.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 5589.499755859375,
+    "y": 7295,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "75dd5c17.2526e4",
+    "id": "c1969b50.1f4a7",
     "type": "comment",
     "name": "find all OTNs that have srcTtpOtnLayer and increase their bandwidth",
     "info": "",
     "comments": "",
-    "x": 4879.88330078125,
-    "y": 7073.88330078125,
-    "z": "1854297c.6f0f4f",
+    "x": 4802.499969482422,
+    "y": 7030.999969482422,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "eb39c4f9.289008",
+    "id": "5744849a.cc54ac",
     "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": 4763.883087158203,
-    "y": 6957.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 4686.499755859375,
+    "y": 6915,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "5dce4a96.7e6e5c",
+    "id": "3d6f4e35.1dbdf2",
     "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": 5108.883087158203,
-    "y": 6788.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 5031.499755859375,
+    "y": 6746,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "f4b6cbdd.4872c"
+        "1b824e77.058e42"
       ]
     ]
   },
   {
-    "id": "f4b6cbdd.4872c",
+    "id": "1b824e77.058e42",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5328.883087158203,
-    "y": 6794.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 5251.499755859375,
+    "y": 6752,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "49771dd5.9b717c"
+        "2ab4f0b.650811"
       ]
     ]
   },
   {
-    "id": "49771dd5.9b717c",
+    "id": "2ab4f0b.650811",
     "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": 5513.883087158203,
-    "y": 6793.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 5436.499755859375,
+    "y": 6751,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "444eff53.bd878"
+        "a23d4d14.87325"
       ]
     ]
   },
   {
-    "id": "444eff53.bd878",
+    "id": "a23d4d14.87325",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5705.883087158203,
-    "y": 6796.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 5628.499755859375,
+    "y": 6754,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "149f57f1.fd7a"
+        "2907eab4.583386"
       ]
     ]
   },
   {
-    "id": "149f57f1.fd7a",
+    "id": "2907eab4.583386",
     "type": "set",
     "name": "set otnTopoIdSrc",
     "xml": "<set>\n<parameter name='otnTopoIdSrc' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />\n",
     "comments": "",
-    "x": 5914.883087158203,
-    "y": 6794.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 5837.499755859375,
+    "y": 6752,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "ea968dfa.497e7",
+    "id": "9bb50a9.812c6f8",
     "type": "for",
     "name": "for netwidx..allNetworksList_length",
     "xml": "<for index='netwidx' start='0' end='`$allNetworksList.network-resource_length`' >",
     "comments": "",
     "outputs": 1,
-    "x": 4815.883087158203,
-    "y": 6782.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 4738.499755859375,
+    "y": 6740,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "5dce4a96.7e6e5c"
+        "3d6f4e35.1dbdf2"
       ]
     ]
   },
   {
-    "id": "cd9f0573.3ee2f8",
+    "id": "9655804c.a8367",
     "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": 4823.883087158203,
-    "y": 6675.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 4746.499755859375,
+    "y": 6633,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "e6c84893.53204",
-        "5e294103.3f0c78",
-        "8261318b.eb457"
+        "e3853ecb.86ffa8",
+        "e9c51b36.8628d",
+        "65b57cea.285c3c"
       ]
     ]
   },
   {
-    "id": "e6c84893.53204",
+    "id": "e3853ecb.86ffa8",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5059.883087158203,
-    "y": 6658.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 4982.499755859375,
+    "y": 6616,
+    "z": "4138d8f7.da252",
     "wires": [
       []
     ]
   },
   {
-    "id": "5e294103.3f0c78",
+    "id": "e9c51b36.8628d",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5056.883087158203,
-    "y": 6699.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 4979.499755859375,
+    "y": 6657,
+    "z": "4138d8f7.da252",
     "wires": [
       []
     ]
   },
   {
-    "id": "8261318b.eb457",
+    "id": "65b57cea.285c3c",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5070.883087158203,
-    "y": 6739.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 4993.499755859375,
+    "y": 6697,
+    "z": "4138d8f7.da252",
     "wires": [
       []
     ]
   },
   {
-    "id": "a5be208e.ddaeb8",
+    "id": "94748373.e9e958",
     "type": "set",
     "name": "unset parameters",
     "xml": "<set>\n<parameter name='tmp.pce-src-node.' value='' />\n",
     "comments": "",
-    "x": 4759.883087158203,
-    "y": 6834.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 4682.499755859375,
+    "y": 6792,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "eaad5657.8cd72",
+    "id": "a0da2cb6.f8de08",
     "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": 4767.883087158203,
-    "y": 6892.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 4690.499755859375,
+    "y": 6850,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "cc830633.a13cc",
+    "id": "ca3ef968.6dda08",
     "type": "set",
     "name": "unset parameters",
     "xml": "<set>\n<parameter name='allNetworksList.' value='' />\n",
     "comments": "",
-    "x": 4772.883087158203,
-    "y": 6632.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 4695.499755859375,
+    "y": 6590,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "904e1ae5.bbd558",
+    "id": "85cec0fe.92a4b",
     "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": 4887.883087158203,
-    "y": 6584.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 4810.499755859375,
+    "y": 6542,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "cbf296b5.4a44d",
+    "id": "edcf20b8.e61748",
     "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": 4880.88330078125,
-    "y": 7300.88330078125,
-    "z": "1854297c.6f0f4f",
+    "x": 4803.499969482422,
+    "y": 7257.999969482422,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "a993ecb7.4e75a",
-        "50a501d.eb089"
+        "e8e7019e.0ce4e8",
+        "cf2cb292.2ab218"
       ]
     ]
   },
   {
-    "id": "a993ecb7.4e75a",
+    "id": "e8e7019e.0ce4e8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5136.88330078125,
-    "y": 7272.88330078125,
-    "z": "1854297c.6f0f4f",
+    "x": 5059.499969482422,
+    "y": 7229.999969482422,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "2f3de295.447b1e"
+        "2fafeba7.6be734"
       ]
     ]
   },
   {
-    "id": "50a501d.eb089",
+    "id": "cf2cb292.2ab218",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5136.88330078125,
-    "y": 7321.88330078125,
-    "z": "1854297c.6f0f4f",
+    "x": 5059.499969482422,
+    "y": 7278.999969482422,
+    "z": "4138d8f7.da252",
     "wires": [
       []
     ]
   },
   {
-    "id": "ed22a86b.d791b8",
+    "id": "997dfd42.35e9c",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5402.88330078125,
-    "y": 7313.88330078125,
-    "z": "1854297c.6f0f4f",
+    "x": 5325.499969482422,
+    "y": 7270.999969482422,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "5c9c1b49.b9b35c",
-        "1eeaf51a.0f85d3",
-        "e4035d6c.e05158"
+        "fd323ea3.0ba61",
+        "4fecf72f.04fbc",
+        "8645a39d.96b86"
       ]
     ]
   },
   {
-    "id": "f63796a1.344c48",
+    "id": "81edaff5.fe8de8",
     "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": 5794.883087158203,
-    "y": 7391.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 5717.499755859375,
+    "y": 7349,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "e4035d6c.e05158",
+    "id": "8645a39d.96b86",
     "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": 5764.883087158203,
-    "y": 7451.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 5687.499755859375,
+    "y": 7409,
+    "z": "4138d8f7.da252",
     "wires": [
       []
     ]
   },
   {
-    "id": "5c9c1b49.b9b35c",
+    "id": "fd323ea3.0ba61",
     "type": "set",
     "name": "unset tmp.aai.the-vpn-binding",
     "xml": "<set>\n<parameter name='tmp.aai.the-vpn-binding.' value=\"\" />\n",
     "comments": "",
-    "x": 5671.883087158203,
-    "y": 7279.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 5594.499755859375,
+    "y": 7237,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "2ed5b6b9.722642",
+    "id": "a2f25d49.46cd88",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4021.883331298828,
-    "y": 5917.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 3944.5,
+    "y": 5875,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "58b6c88a.c0b81",
-        "7675dfe3.26b5f8",
-        "ce5c7ab5.bd83c8",
-        "60efc6f5.6c666",
-        "4ebf5b73.f18c34"
+        "4e6fe55.c2f201c",
+        "7170f2f2.71fadc",
+        "2402858c.2e7c4a",
+        "2fcf2035.98d3c",
+        "ff11fb03.980398"
       ]
     ]
   },
   {
-    "id": "8e0e6c35.35f418",
+    "id": "d7183096.a014a",
     "type": "set",
     "name": "unset otnTopoIdSrc",
     "xml": "<set>\n<parameter name='otnTopoIdSrc' value='' />\n",
     "comments": "",
-    "x": 4764.883087158203,
-    "y": 6732.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 4687.499755859375,
+    "y": 6690,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "11d506a.c6a64f9",
+    "id": "5a3abbf9.5bd584",
     "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": 4887.883331298828,
-    "y": 6462.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 4810.5,
+    "y": 6420,
+    "z": "4138d8f7.da252",
     "wires": [
       []
     ]
   },
   {
-    "id": "4d39072e.34b5f8",
+    "id": "48e1585a.35691",
     "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": 5024.883331298828,
-    "y": 6412.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 4947.5,
+    "y": 6370,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "1698c025.c5ee78",
+    "id": "829d6c73.aa7da8",
     "type": "save",
     "name": "save ROOT UNI in AAI",
     "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.ROOT.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.ROOT.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />\n<parameter name='data-source' value='`$gfp`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 6832.883331298828,
-    "y": 3588.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 6409.5,
+    "y": 1904,
+    "z": "4138d8f7.da252",
     "wires": [
       []
     ]
   },
   {
-    "id": "63d6aa7c.b5a514",
+    "id": "261b01ae.fe9b36",
     "type": "comment",
     "name": "NOT NEEDED ANYMORE?",
     "info": "",
     "comments": "",
-    "x": 4038.883331298828,
-    "y": 1813.8833312988281,
-    "z": "1854297c.6f0f4f",
+    "x": 3675.5,
+    "y": 1298,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "3aa74194.8661ee",
+    "id": "f92c744c.f5b4a8",
     "type": "comment",
     "name": "NOT NEEDED ANYMORE?",
     "info": "",
     "comments": "",
-    "x": 4016.883331298828,
-    "y": 2683.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 3813.5,
+    "y": 1786,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "b098a36d.e0c3e",
+    "id": "a9675d4a.27492",
     "type": "comment",
     "name": "TEMPORARY REMOVING THE FOLLOWING TWO NODES",
     "info": "",
     "comments": "",
-    "x": 6823.883331298828,
-    "y": 4055.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 6370.5,
+    "y": 2616,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "2f2ed9c0.e0663e",
-    "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": 3528.883331298828,
-    "y": 6057.883331298828,
-    "z": "1854297c.6f0f4f",
-    "wires": [
-      []
-    ]
-  },
-  {
-    "id": "28b03e50.9f7992",
+    "id": "577ac65e.4cd8e8",
     "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": 3739.883331298828,
-    "y": 4934.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 3662.5,
+    "y": 4892,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "980b4828.96504",
+    "id": "c33c721b.c24a68",
     "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": 3872.883331298828,
-    "y": 4982.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 3795.5,
+    "y": 4940,
+    "z": "4138d8f7.da252",
     "wires": [
       []
     ]
   },
   {
-    "id": "78d94074.f38b7",
+    "id": "3da01b2d.c332ec",
     "type": "switchNode",
     "name": "switch found-connectivity?",
     "xml": "\n<switch test=\"`$found-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4417.883087158203,
-    "y": 5062.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 4340.499755859375,
+    "y": 5020,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "bc43fa2d.411608",
-        "7dd6f63d.8487f"
+        "67f3fde2.d1c4bc",
+        "830cc023.8d75b8"
       ]
     ]
   },
   {
-    "id": "bc43fa2d.411608",
+    "id": "67f3fde2.d1c4bc",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4610.883087158203,
-    "y": 5063.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 4533.499755859375,
+    "y": 5021,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "c471dfd.f92dba"
+        "97ecf17d.e53ae8"
       ]
     ]
   },
   {
-    "id": "7dd6f63d.8487f",
+    "id": "830cc023.8d75b8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4614.883087158203,
-    "y": 5107.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 4537.499755859375,
+    "y": 5065,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "a8ff6a7c.81ae98"
+        "e6486dc.92da59"
       ]
     ]
   },
   {
-    "id": "a8ff6a7c.81ae98",
+    "id": "e6486dc.92da59",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4753.883087158203,
-    "y": 5102.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 4676.499755859375,
+    "y": 5060,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "a2ef082b.b2f048",
-        "fa92cb40.708c7",
-        "c4bba10e.ae5948"
+        "f9d2f7c1.e8a63",
+        "2f9c4db0.869cca",
+        "cfcbce5e.a3353"
       ]
     ]
   },
   {
-    "id": "c471dfd.f92dba",
+    "id": "97ecf17d.e53ae8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4753.883087158203,
-    "y": 5059.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 4676.499755859375,
+    "y": 5017,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "effc1efd.4a1d3",
-        "5c8eea0c.68cc14",
-        "e7adda57.489d68",
-        "5438b6e6.1482f8"
+        "fd2b62b6.10b14",
+        "f21eb35f.395438",
+        "59f69d26.ab3de4",
+        "8af1d85e.882ed"
       ]
     ]
   },
   {
-    "id": "a2ef082b.b2f048",
+    "id": "f9d2f7c1.e8a63",
     "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": 5147.883087158203,
-    "y": 5353.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 5070.499755859375,
+    "y": 5311,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "963dc7de.4f275",
+    "id": "a14dbd8f.fd09c8",
     "type": "comment",
     "name": "populate connectivity-A variable in the context map",
     "info": "",
     "comments": "",
-    "x": 5154.883087158203,
-    "y": 5307.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 5077.499755859375,
+    "y": 5265,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "d968015c.39cda8",
+    "id": "860af8d0.fc96e8",
     "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": 4944.88330078125,
-    "y": 7022.88330078125,
-    "z": "1854297c.6f0f4f",
+    "x": 4867.499969482422,
+    "y": 6979.999969482422,
+    "z": "4138d8f7.da252",
     "wires": [
       []
     ]
   },
   {
-    "id": "fa92cb40.708c7",
+    "id": "2f9c4db0.869cca",
     "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": 5266.883087158203,
-    "y": 5406.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 5189.499755859375,
+    "y": 5364,
+    "z": "4138d8f7.da252",
     "wires": [
       []
     ]
   },
   {
-    "id": "d676c28d.645a28",
+    "id": "1f30d01.395cc3",
     "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": 5148.883087158203,
-    "y": 5624.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 5071.499755859375,
+    "y": 5582,
+    "z": "4138d8f7.da252",
     "wires": [
       []
     ]
   },
   {
-    "id": "3d7bbeb8.4fb6ea",
+    "id": "f7b3410e.fff05",
     "type": "comment",
     "name": "Update ROOT UNI's bw",
     "info": "",
     "comments": "",
-    "x": 3703.883331298828,
-    "y": 4532.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 3617.5,
+    "y": 4341,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "b16bd91d.551568",
+    "id": "7607e020.fe77f",
     "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": 4037.883331298828,
-    "y": 4715.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 3951.5,
+    "y": 4524,
+    "z": "4138d8f7.da252",
     "wires": [
       []
     ]
   },
   {
-    "id": "17af28da.ceda4f",
+    "id": "e8ff43f0.c9213",
     "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": 3649.883331298828,
-    "y": 4582.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 3563.5,
+    "y": 4391,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "1c28f8e9.5cfb07",
-        "7bdf0726.9bbbb8",
-        "d03c4576.8b0b7"
+        "3f20a2e3.9197ce",
+        "836b51a4.29ff7",
+        "a19206dd.24a2b8"
       ]
     ]
   },
   {
-    "id": "7bdf0726.9bbbb8",
+    "id": "836b51a4.29ff7",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3877.374298095703,
-    "y": 4555.457305908203,
-    "z": "1854297c.6f0f4f",
+    "x": 3790.990966796875,
+    "y": 4363.573974609375,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "6a9d8f.c783f27"
+        "cc477903.35a1a8"
       ]
     ]
   },
   {
-    "id": "d03c4576.8b0b7",
+    "id": "a19206dd.24a2b8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3872.883331298828,
-    "y": 4599.883270263672,
-    "z": "1854297c.6f0f4f",
+    "x": 3786.5,
+    "y": 4407.999938964844,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "732d0fc7.ef1e4"
+        "9ac9aba4.1e8ac"
       ]
     ]
   },
   {
-    "id": "6a9d8f.c783f27",
+    "id": "cc477903.35a1a8",
     "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": 4039.945831298828,
-    "y": 4554.743011474609,
-    "z": "1854297c.6f0f4f",
+    "x": 3953.5625,
+    "y": 4362.859680175781,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "732d0fc7.ef1e4",
+    "id": "9ac9aba4.1e8ac",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 4040.883331298828,
-    "y": 4599.883270263672,
-    "z": "1854297c.6f0f4f",
+    "x": 3954.5,
+    "y": 4407.999938964844,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "2b632ac5.849276",
+    "id": "44a45bc4.fd8d24",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3825.883331298828,
-    "y": 4672.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 3739.5,
+    "y": 4481,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "d3a7ff82.f011",
-        "b16bd91d.551568"
+        "8f06a9d6.e85d2",
+        "7607e020.fe77f"
       ]
     ]
   },
   {
-    "id": "1c28f8e9.5cfb07",
+    "id": "3f20a2e3.9197ce",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3656.883331298828,
-    "y": 4672.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 3570.5,
+    "y": 4481,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "2b632ac5.849276"
+        "44a45bc4.fd8d24"
       ]
     ]
   },
   {
-    "id": "d3a7ff82.f011",
+    "id": "8f06a9d6.e85d2",
     "type": "set",
     "name": "set new bw",
     "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.rootuni.data-source + $gfp`' />\n",
     "comments": "",
-    "x": 4014.883331298828,
-    "y": 4664.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 3928.5,
+    "y": 4473,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "2c43e5ee.399d8a",
+    "id": "c23415ae.23176",
     "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": 3847.883331298828,
-    "y": 4810.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 3770.5,
+    "y": 4768,
+    "z": "4138d8f7.da252",
     "wires": [
       []
     ]
   },
   {
-    "id": "97722063.27aea",
+    "id": "cb253b17.73576",
     "type": "comment",
     "name": "We are doing modify but middle man does not exist ==> it is definitely a new logical link",
     "info": "",
     "comments": "",
-    "x": 3630.883331298828,
-    "y": 2893.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 3553.5,
+    "y": 2851,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "65778a7a.89ed44",
+    "id": "9d7a29e5.a75ec",
     "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": 3485.883331298828,
-    "y": 4460.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 2758.5,
+    "y": 4413,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "a2d538df.980d68",
+    "id": "8b862d24.0bbe68",
     "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": 3258.883331298828,
-    "y": 4728.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 3181.5,
+    "y": 4686,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "43a12633.7a37a8",
-        "6d14b300.778b24"
+        "b605d8db.884f2",
+        "fdd54f31.8fbee"
       ]
     ]
   },
   {
-    "id": "7ebd19ad.940af8",
+    "id": "db2110db.2b1778",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 3090.883331298828,
-    "y": 4731.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 3013.5,
+    "y": 4689,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "a2d538df.980d68"
+        "8b862d24.0bbe68"
       ]
     ]
   },
   {
-    "id": "6d14b300.778b24",
+    "id": "fdd54f31.8fbee",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3421.883331298828,
-    "y": 4747.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 3344.5,
+    "y": 4705,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "d74b6b50.22dd88"
+        "9f11b3.a8080e5"
       ]
     ]
   },
   {
-    "id": "43a12633.7a37a8",
+    "id": "b605d8db.884f2",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3457.883331298828,
-    "y": 3354.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 3380.5,
+    "y": 3312,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "fd9ecd52.f0eec"
+        "947600ba.b5e73"
       ]
     ]
   },
   {
-    "id": "58f27ca9.e6694c",
+    "id": "4f6ce4fa.367e24",
     "type": "switchNode",
     "name": "switch leafuni.data-source == gfp",
     "xml": "<switch test='`$tmp.aai.leafuni.data-source == $gfp`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3773.883331298828,
-    "y": 3406.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 3729.5,
+    "y": 3154,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "f8970eb9.db20d",
-        "767d527f.e764f4"
+        "cc96bd45.2e2b6",
+        "f9a0faf9.5c3dc8"
       ]
     ]
   },
   {
-    "id": "f8970eb9.db20d",
+    "id": "cc96bd45.2e2b6",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3978.883331298828,
-    "y": 3402.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 3934.5,
+    "y": 3150,
+    "z": "4138d8f7.da252",
     "wires": [
       []
     ]
   },
   {
-    "id": "767d527f.e764f4",
+    "id": "f9a0faf9.5c3dc8",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3980.883331298828,
-    "y": 3452.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 3936.5,
+    "y": 3200,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "e0571d8f.b0d5c"
+        "7a40f51a.96d7fc"
       ]
     ]
   },
   {
-    "id": "e0571d8f.b0d5c",
+    "id": "7a40f51a.96d7fc",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4136.883331298828,
-    "y": 3458.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 4092.5,
+    "y": 3206,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "29bbf41c.92a224",
-        "892518e7.2c6e68",
-        "36c28209.5e5a0e",
-        "b822f518.1b138"
+        "2c2d832.1ec14fc",
+        "16e3f1c0.bf6bbe",
+        "3515662b.208b2a",
+        "271e520.e6acbae"
       ]
     ]
   },
   {
-    "id": "29bbf41c.92a224",
+    "id": "2c2d832.1ec14fc",
     "type": "set",
     "name": "set bwModified",
     "xml": "<set>\n<parameter name='bwModified' value=\"true\" />\n\n\n",
     "comments": "",
-    "x": 4362.883575439453,
-    "y": 3199.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 4318.500244140625,
+    "y": 2947,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "f218f6e.d910588",
+    "id": "f6d89aab.47f778",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4894.883056640625,
-    "y": 4286.88330078125,
-    "z": "1854297c.6f0f4f",
+    "x": 4817.499725341797,
+    "y": 4243.999969482422,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "a5aad4b.a7f08a8",
-        "7594985d.bdad18"
+        "f49c2dcf.bc27d8",
+        "cc8917f6.431d58"
       ]
     ]
   },
   {
-    "id": "7594985d.bdad18",
+    "id": "cc8917f6.431d58",
     "type": "set",
     "name": "unset tmp.aai.vpn-binding",
     "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value='' />\n",
     "comments": "",
-    "x": 5096.8828125,
-    "y": 4253.88330078125,
-    "z": "1854297c.6f0f4f",
+    "x": 5019.499481201172,
+    "y": 4210.999969482422,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "a04d2a4d.17b14",
+    "id": "a80257aa.4070f",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 4780.88330078125,
-    "y": 4463.883056640625,
-    "z": "1854297c.6f0f4f",
+    "x": 4703.499969482422,
+    "y": 4420.999725341797,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "3892fdc5.2518b2",
+    "id": "d0212ac6.85c08",
     "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": 4777.9454345703125,
-    "y": 4412.743072509766,
-    "z": "1854297c.6f0f4f",
+    "x": 4700.562103271484,
+    "y": 4369.8597412109375,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "809a6f2e.e2cff",
+    "id": "efad35a4.dd1e7",
     "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": 4360.883056640625,
-    "y": 4286.88330078125,
-    "z": "1854297c.6f0f4f",
+    "x": 4283.499725341797,
+    "y": 4243.999969482422,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "663c1b4b.a64fcc"
+        "bbd4adaa.78aa88"
       ]
     ]
   },
   {
-    "id": "663c1b4b.a64fcc",
+    "id": "bbd4adaa.78aa88",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.the-connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4565.883056640625,
-    "y": 4286.88330078125,
-    "z": "1854297c.6f0f4f",
+    "x": 4488.499725341797,
+    "y": 4243.999969482422,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "4c765f5a.bea65"
+        "7d1062e5.6c959c"
       ]
     ]
   },
   {
-    "id": "4c765f5a.bea65",
+    "id": "7d1062e5.6c959c",
     "type": "outcome",
     "name": "vpn-binding",
     "xml": "<outcome value='vpn-binding'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4731.883056640625,
-    "y": 4286.88330078125,
-    "z": "1854297c.6f0f4f",
+    "x": 4654.499725341797,
+    "y": 4243.999969482422,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "f218f6e.d910588"
+        "f6d89aab.47f778"
       ]
     ]
   },
   {
-    "id": "a5aad4b.a7f08a8",
+    "id": "f49c2dcf.bc27d8",
     "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": 4403.883056640625,
-    "y": 4364.88330078125,
-    "z": "1854297c.6f0f4f",
+    "x": 4326.499725341797,
+    "y": 4321.999969482422,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "6b0b4a54.7d0dd4",
-        "c44b1722.eadf8",
-        "30cd81de.fee396"
+        "2b073b5b.643194",
+        "ffd59a4c.14fa7",
+        "2abdbd7a.263a72"
       ]
     ]
   },
   {
-    "id": "6b0b4a54.7d0dd4",
+    "id": "2b073b5b.643194",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4614.883056640625,
-    "y": 4366.88330078125,
-    "z": "1854297c.6f0f4f",
+    "x": 4537.499725341797,
+    "y": 4323.999969482422,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "d1d7ad20.29b52"
+        "b25769d8.6df3c8"
       ]
     ]
   },
   {
-    "id": "c44b1722.eadf8",
+    "id": "ffd59a4c.14fa7",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4615.3740234375,
-    "y": 4412.457336425781,
-    "z": "1854297c.6f0f4f",
+    "x": 4537.990692138672,
+    "y": 4369.574005126953,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "3892fdc5.2518b2"
+        "d0212ac6.85c08"
       ]
     ]
   },
   {
-    "id": "30cd81de.fee396",
+    "id": "2abdbd7a.263a72",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4612.883056640625,
-    "y": 4455.88330078125,
-    "z": "1854297c.6f0f4f",
+    "x": 4535.499725341797,
+    "y": 4412.999969482422,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "a04d2a4d.17b14"
+        "a80257aa.4070f"
       ]
     ]
   },
   {
-    "id": "fd9ecd52.f0eec",
+    "id": "947600ba.b5e73",
     "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": 3647.883331298828,
-    "y": 3249.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 3603.5,
+    "y": 2997,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "3062cdfd.42c69a",
-        "db9f52e5.d7dfa8",
-        "aae84cfb.f1edc"
+        "6a786745.af48",
+        "a633d7c2.0708",
+        "f368276f.48f958"
       ]
     ]
   },
   {
-    "id": "db9f52e5.d7dfa8",
+    "id": "a633d7c2.0708",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3875.374298095703,
-    "y": 3222.457305908203,
-    "z": "1854297c.6f0f4f",
+    "x": 3830.990966796875,
+    "y": 2969.573974609375,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "557116c4.068f88"
+        "30a6f1cd.e89f6e"
       ]
     ]
   },
   {
-    "id": "aae84cfb.f1edc",
+    "id": "f368276f.48f958",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3870.883331298828,
-    "y": 3266.883270263672,
-    "z": "1854297c.6f0f4f",
+    "x": 3826.5,
+    "y": 3013.9999389648438,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "270e15a6.70575a"
+        "868e3def.777d88"
       ]
     ]
   },
   {
-    "id": "557116c4.068f88",
+    "id": "30a6f1cd.e89f6e",
     "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": 4037.945831298828,
-    "y": 3221.7430114746094,
-    "z": "1854297c.6f0f4f",
+    "x": 3993.5625,
+    "y": 2968.8596801757812,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "270e15a6.70575a",
+    "id": "868e3def.777d88",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 4038.883331298828,
-    "y": 3266.883270263672,
-    "z": "1854297c.6f0f4f",
+    "x": 3994.5,
+    "y": 3013.9999389648438,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "3062cdfd.42c69a",
+    "id": "6a786745.af48",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3882.883331298828,
-    "y": 3316.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 3838.5,
+    "y": 3064,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "58f27ca9.e6694c"
+        "4f6ce4fa.367e24"
       ]
     ]
   },
   {
-    "id": "d823dcb2.3ea1b",
+    "id": "e1ab631b.742fc",
     "type": "comment",
     "name": "Find LEAF and ROOT connectivity, then find vpn-bindings of each. adjust bw",
     "info": "",
     "comments": "",
-    "x": 3772.7666625976562,
-    "y": 3507.7666625976562,
-    "z": "1854297c.6f0f4f",
+    "x": 3728.383331298828,
+    "y": 3254.883331298828,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "a7eccb2d.bd2018",
+    "id": "9ac35f29.2f46a8",
     "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": 3787.483428955078,
-    "y": 3859.566680908203,
-    "z": "1854297c.6f0f4f",
+    "x": 3710.10009765625,
+    "y": 3816.683349609375,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "a53a5ddb.dd60f",
+    "id": "3dda5d6b.eae642",
     "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": 3925.483428955078,
-    "y": 3917.566680908203,
-    "z": "1854297c.6f0f4f",
+    "x": 3848.10009765625,
+    "y": 3874.683349609375,
+    "z": "4138d8f7.da252",
     "wires": [
       []
     ]
   },
   {
-    "id": "892518e7.2c6e68",
+    "id": "16e3f1c0.bf6bbe",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 3503.483428955078,
-    "y": 3598.966583251953,
-    "z": "1854297c.6f0f4f",
+    "x": 3426.10009765625,
+    "y": 3556.083251953125,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "b4ed3622.c08",
-        "c0c356fb.babc",
-        "67daf127.7e6a38"
+        "616a588c.b788e8",
+        "23b69bc.0871b64",
+        "92806e4e.351398"
       ]
     ]
   },
   {
-    "id": "fce3ea32.0915b",
+    "id": "14abd55c.d773d3",
     "type": "switchNode",
     "name": "switch found-connectivity?",
     "xml": "\n<switch test=\"`$found-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3744.483428955078,
-    "y": 4027.366729736328,
-    "z": "1854297c.6f0f4f",
+    "x": 3667.10009765625,
+    "y": 3984.4833984375,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "fda5acc2.f20fe",
-        "e480dda8.f10d98"
+        "5c65738b.87fde4",
+        "f1d641f8.d259a8"
       ]
     ]
   },
   {
-    "id": "fda5acc2.f20fe",
+    "id": "5c65738b.87fde4",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3937.483428955078,
-    "y": 4028.366729736328,
-    "z": "1854297c.6f0f4f",
+    "x": 3860.10009765625,
+    "y": 3985.4833984375,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "90393c50.c5c688"
+        "65a9280d.a9da1"
       ]
     ]
   },
   {
-    "id": "e480dda8.f10d98",
+    "id": "f1d641f8.d259a8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3941.483428955078,
-    "y": 4072.366729736328,
-    "z": "1854297c.6f0f4f",
+    "x": 3864.10009765625,
+    "y": 4029.4833984375,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "c7e0a8ee.d6f32"
+        "5b392e39.74c58"
       ]
     ]
   },
   {
-    "id": "c7e0a8ee.d6f32",
+    "id": "5b392e39.74c58",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4080.483428955078,
-    "y": 4067.366729736328,
-    "z": "1854297c.6f0f4f",
+    "x": 4003.10009765625,
+    "y": 4024.4833984375,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "809a6f2e.e2cff"
+        "efad35a4.dd1e7"
       ]
     ]
   },
   {
-    "id": "90393c50.c5c688",
+    "id": "65a9280d.a9da1",
     "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": 4081.483428955078,
-    "y": 4024.566680908203,
-    "z": "1854297c.6f0f4f",
+    "x": 4004.10009765625,
+    "y": 3981.683349609375,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "36c28209.5e5a0e",
+    "id": "3515662b.208b2a",
     "type": "switchNode",
     "name": "switch leafuni.data-source > gfp",
     "xml": "<switch test='`$tmp.aai.leafuni.data-source > $gfp`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4396.600372314453,
-    "y": 3456.166778564453,
-    "z": "1854297c.6f0f4f",
+    "x": 4352.217041015625,
+    "y": 3203.283447265625,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "beb5c16.4204b4",
-        "cf431e74.d4d548"
+        "d3894fc3.10eb48",
+        "b517f9eb.6c257"
       ]
     ]
   },
   {
-    "id": "beb5c16.4204b4",
+    "id": "d3894fc3.10eb48",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4595.767364501953,
-    "y": 3522.766632080078,
-    "z": "1854297c.6f0f4f",
+    "x": 4551.384033203125,
+    "y": 3269.88330078125,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "105d466c.be1d02"
+        "d481f8d7.46db"
       ]
     ]
   },
   {
-    "id": "cf431e74.d4d548",
+    "id": "b517f9eb.6c257",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4617.767364501953,
-    "y": 3367.766632080078,
-    "z": "1854297c.6f0f4f",
+    "x": 4573.384033203125,
+    "y": 3114.88330078125,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "8c32ddc1.dc0d4"
+        "543771c5.3e82b"
       ]
     ]
   },
   {
-    "id": "b822f518.1b138",
+    "id": "271e520.e6acbae",
     "type": "save",
     "name": "update LEAF UNI in AAI",
     "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.LEAF.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.LEAF.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n<parameter name='data-source' value='`$gfp`' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 4395.600372314453,
-    "y": 3311.366729736328,
-    "z": "1854297c.6f0f4f",
+    "x": 4351.217041015625,
+    "y": 3058.4833984375,
+    "z": "4138d8f7.da252",
     "wires": [
       []
     ]
   },
   {
-    "id": "3f7a0e0a.9d9b82",
+    "id": "5841cd16.599de4",
     "type": "comment",
     "name": "update LEAF UNI with the new bw",
     "info": "",
     "comments": "",
-    "x": 4411.767364501953,
-    "y": 3264.766632080078,
-    "z": "1854297c.6f0f4f",
+    "x": 4367.384033203125,
+    "y": 3011.88330078125,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "fd150e87.231aa",
+    "id": "c6724a1e.a746a",
     "type": "comment",
     "name": "Update ROOT UNI's bw",
     "info": "",
     "comments": "",
-    "x": 5080.533966064453,
-    "y": 3241.766632080078,
-    "z": "1854297c.6f0f4f",
+    "x": 4922.14990234375,
+    "y": 2466.88330078125,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "c5a29e92.7207c",
+    "id": "f5319096.b377c8",
     "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": 5682.533966064453,
-    "y": 3346.766632080078,
-    "z": "1854297c.6f0f4f",
+    "x": 5524.14990234375,
+    "y": 2571.88330078125,
+    "z": "4138d8f7.da252",
     "wires": [
       []
     ]
   },
   {
-    "id": "be41e2f.9cfd32",
+    "id": "1d10f282.65ef3d",
     "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": 5072.533721923828,
-    "y": 3287.766632080078,
-    "z": "1854297c.6f0f4f",
+    "x": 4914.149658203125,
+    "y": 2512.88330078125,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "2e2379b.d7f7006",
-        "db5acda.eac92b",
-        "bc7f8b0.aa27df8"
+        "e6ffa5af.877ac",
+        "53ba0501.50937c",
+        "f8ebf6c0.ef2f7"
       ]
     ]
   },
   {
-    "id": "db5acda.eac92b",
+    "id": "53ba0501.50937c",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5300.024688720703,
-    "y": 3260.340606689453,
-    "z": "1854297c.6f0f4f",
+    "x": 5141.640625,
+    "y": 2485.457275390625,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "ac17b57a.282248"
+        "25bf7485.4207ec"
       ]
     ]
   },
   {
-    "id": "bc7f8b0.aa27df8",
+    "id": "f8ebf6c0.ef2f7",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5295.533721923828,
-    "y": 3304.766571044922,
-    "z": "1854297c.6f0f4f",
+    "x": 5137.149658203125,
+    "y": 2529.8832397460938,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "57de8cb.81497f4"
+        "8cc56294.07b6a"
       ]
     ]
   },
   {
-    "id": "ac17b57a.282248",
+    "id": "25bf7485.4207ec",
     "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": 5462.596221923828,
-    "y": 3259.6263122558594,
-    "z": "1854297c.6f0f4f",
+    "x": 5304.212158203125,
+    "y": 2484.7429809570312,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "57de8cb.81497f4",
+    "id": "8cc56294.07b6a",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 5463.533721923828,
-    "y": 3304.766571044922,
-    "z": "1854297c.6f0f4f",
+    "x": 5305.149658203125,
+    "y": 2529.8832397460938,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "9014714c.903978",
+    "id": "29839d19.ca2152",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5460.533721923828,
-    "y": 3354.766632080078,
-    "z": "1854297c.6f0f4f",
+    "x": 5302.149658203125,
+    "y": 2579.88330078125,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "cb023eec.a5c808",
-        "c5a29e92.7207c"
+        "4a49d064.4801a8",
+        "f5319096.b377c8"
       ]
     ]
   },
   {
-    "id": "2e2379b.d7f7006",
+    "id": "e6ffa5af.877ac",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5291.533721923828,
-    "y": 3354.766632080078,
-    "z": "1854297c.6f0f4f",
+    "x": 5133.149658203125,
+    "y": 2579.88330078125,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "9014714c.903978"
+        "29839d19.ca2152"
       ]
     ]
   },
   {
-    "id": "cb023eec.a5c808",
+    "id": "4a49d064.4801a8",
     "type": "set",
     "name": "set new bw",
     "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.rootuni.data-source + $tmp.delta`' />\n",
     "comments": "",
-    "x": 5642.534454345703,
-    "y": 3296.766632080078,
-    "z": "1854297c.6f0f4f",
+    "x": 5484.150390625,
+    "y": 2521.88330078125,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "6d766032.1486b8",
+    "id": "fc1d58de.266bc8",
     "type": "comment",
     "name": "bw+ has increased ",
     "info": "",
     "comments": "",
-    "x": 4609.766662597656,
-    "y": 3329.7666625976562,
-    "z": "1854297c.6f0f4f",
+    "x": 4565.383331298828,
+    "y": 3076.883331298828,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "56336637.740a88",
+    "id": "81aa1dbe.56ac78",
     "type": "comment",
     "name": "bw- has decreased",
     "info": "",
     "comments": "",
-    "x": 4608.600372314453,
-    "y": 3486.566680908203,
-    "z": "1854297c.6f0f4f",
+    "x": 4564.217041015625,
+    "y": 3233.683349609375,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "e142830c.8ce718",
+    "id": "175559ed.ae176e",
     "type": "comment",
     "name": "Update ROOT UNI's bw",
     "info": "",
     "comments": "",
-    "x": 5057.600372314453,
-    "y": 3444.566680908203,
-    "z": "1854297c.6f0f4f",
+    "x": 5013.21630859375,
+    "y": 2806.683349609375,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "253cc252.2e7476",
+    "id": "b4d05ea3.ef437",
     "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": 5659.600372314453,
-    "y": 3549.566680908203,
-    "z": "1854297c.6f0f4f",
+    "x": 5615.21630859375,
+    "y": 2911.683349609375,
+    "z": "4138d8f7.da252",
     "wires": [
       []
     ]
   },
   {
-    "id": "e936a38f.06f2b",
+    "id": "909ddf1c.4247f",
     "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": 5049.600128173828,
-    "y": 3490.566680908203,
-    "z": "1854297c.6f0f4f",
+    "x": 5005.216064453125,
+    "y": 2852.683349609375,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "6f1b7a54.b4f3a4",
-        "7ba2b9f4.ea954",
-        "c55de303.d0cb4"
+        "6ec56bfe.bf9374",
+        "ac80268f.768e5",
+        "a8e739ac.bd4b"
       ]
     ]
   },
   {
-    "id": "7ba2b9f4.ea954",
+    "id": "ac80268f.768e5",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5277.091094970703,
-    "y": 3463.140655517578,
-    "z": "1854297c.6f0f4f",
+    "x": 5232.70703125,
+    "y": 2825.25732421875,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "426bf991.15b6a8"
+        "c8c7d986.838778"
       ]
     ]
   },
   {
-    "id": "c55de303.d0cb4",
+    "id": "a8e739ac.bd4b",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5272.600128173828,
-    "y": 3507.566619873047,
-    "z": "1854297c.6f0f4f",
+    "x": 5228.216064453125,
+    "y": 2869.6832885742188,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "fe0c112c.8fb4f"
+        "3dcb1fdf.a3fec"
       ]
     ]
   },
   {
-    "id": "426bf991.15b6a8",
+    "id": "c8c7d986.838778",
     "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": 5439.662628173828,
-    "y": 3462.4263610839844,
-    "z": "1854297c.6f0f4f",
+    "x": 5395.278564453125,
+    "y": 2824.5430297851562,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "fe0c112c.8fb4f",
+    "id": "3dcb1fdf.a3fec",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 5440.600128173828,
-    "y": 3507.566619873047,
-    "z": "1854297c.6f0f4f",
+    "x": 5396.216064453125,
+    "y": 2869.6832885742188,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "4702676.988cf18",
+    "id": "9b0bdc3d.6e83d8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 5437.600128173828,
-    "y": 3557.566680908203,
-    "z": "1854297c.6f0f4f",
+    "x": 5393.216064453125,
+    "y": 2919.683349609375,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "2f82a117.e4a2be",
-        "253cc252.2e7476"
+        "e12fb18d.e25528",
+        "b4d05ea3.ef437"
       ]
     ]
   },
   {
-    "id": "6f1b7a54.b4f3a4",
+    "id": "6ec56bfe.bf9374",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5268.600128173828,
-    "y": 3557.566680908203,
-    "z": "1854297c.6f0f4f",
+    "x": 5224.216064453125,
+    "y": 2919.683349609375,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "4702676.988cf18"
+        "9b0bdc3d.6e83d8"
       ]
     ]
   },
   {
-    "id": "2f82a117.e4a2be",
+    "id": "e12fb18d.e25528",
     "type": "set",
     "name": "set new bw",
     "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.rootuni.data-source - $tmp.delta`' />\n",
     "comments": "",
-    "x": 5619.600860595703,
-    "y": 3499.566680908203,
-    "z": "1854297c.6f0f4f",
+    "x": 5575.216796875,
+    "y": 2861.683349609375,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "f5580ce3.db6eb8",
+    "id": "77cc19f0.65a298",
     "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": 4974.600128173828,
-    "y": 3403.566680908203,
-    "z": "1854297c.6f0f4f",
+    "x": 4930.216064453125,
+    "y": 2765.683349609375,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "105d466c.be1d02",
+    "id": "d481f8d7.46db",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4767.766662597656,
-    "y": 3511.7666625976562,
-    "z": "1854297c.6f0f4f",
+    "x": 4723.383331298828,
+    "y": 3258.883331298828,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "f5580ce3.db6eb8",
-        "e936a38f.06f2b"
+        "77cc19f0.65a298",
+        "909ddf1c.4247f",
+        "d39256ff.c99e4"
       ]
     ]
   },
   {
-    "id": "8c32ddc1.dc0d4",
+    "id": "543771c5.3e82b",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4788.500030517578,
-    "y": 3338.566680908203,
-    "z": "1854297c.6f0f4f",
+    "x": 4744.11669921875,
+    "y": 3085.683349609375,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "b0b6c683.a43628",
-        "be41e2f.9cfd32"
+        "9e50adf.3f804d",
+        "1d10f282.65ef3d",
+        "3c12d321.f6ab2c"
       ]
     ]
   },
   {
-    "id": "b0b6c683.a43628",
+    "id": "9e50adf.3f804d",
     "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": 4987.333526611328,
-    "y": 3156.366729736328,
-    "z": "1854297c.6f0f4f",
+    "x": 4878.949462890625,
+    "y": 2391.4833984375,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "c2cf98a5.f5859",
+    "id": "d7fa5270.13e728",
     "type": "comment",
     "name": "Update ROOT UNI's bw",
     "info": "",
     "comments": "",
-    "x": 4382.649932861328,
-    "y": 3411.566680908203,
-    "z": "1854297c.6f0f4f",
+    "x": 4338.2666015625,
+    "y": 3158.683349609375,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "53815df2.f3fe8c",
+    "id": "fea06caf.d7087",
     "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": 3884.9833984375,
-    "y": 4190.3671875,
-    "z": "1854297c.6f0f4f",
+    "x": 3807.600067138672,
+    "y": 4147.483856201172,
+    "z": "4138d8f7.da252",
     "wires": [
       []
     ]
   },
   {
-    "id": "1f65c294.737a2d",
+    "id": "5c1ea12c.02fb18",
     "type": "switchNode",
     "name": "switch found-root-connectivity",
     "xml": "\n<switch test=\"`$found-root-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 3719.9833984375,
-    "y": 4262.567138671875,
-    "z": "1854297c.6f0f4f",
+    "x": 3642.600067138672,
+    "y": 4219.683807373047,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "d304f78f.a9e16",
-        "fe02c5f8.83fd58"
+        "b82e9023.76f9f8",
+        "f2f0e3e2.cfb0a8"
       ]
     ]
   },
   {
-    "id": "d304f78f.a9e16",
+    "id": "b82e9023.76f9f8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3930.9833984375,
-    "y": 4262.567138671875,
-    "z": "1854297c.6f0f4f",
+    "x": 3853.600067138672,
+    "y": 4219.683807373047,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "632bbee5.d51fe8"
+        "4d4a5650.900498"
       ]
     ]
   },
   {
-    "id": "fe02c5f8.83fd58",
+    "id": "f2f0e3e2.cfb0a8",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 3926.9833984375,
-    "y": 4310.567138671875,
-    "z": "1854297c.6f0f4f",
+    "x": 3849.600067138672,
+    "y": 4267.683807373047,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "670f8deb.e1038c"
+        "87662134.188498"
       ]
     ]
   },
   {
-    "id": "632bbee5.d51fe8",
+    "id": "4d4a5650.900498",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4086.9833984375,
-    "y": 4258.567138671875,
-    "z": "1854297c.6f0f4f",
+    "x": 4009.600067138672,
+    "y": 4215.683807373047,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "e27123aa.cc28d"
+        "cdbc2fd5.f72b4"
       ]
     ]
   },
   {
-    "id": "670f8deb.e1038c",
+    "id": "87662134.188498",
     "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": 4074.9833984375,
-    "y": 4305.567138671875,
-    "z": "1854297c.6f0f4f",
+    "x": 3997.600067138672,
+    "y": 4262.683807373047,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "88c84935.d74a7",
+    "id": "2111dda1.fcbdb2",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4927.949493408203,
-    "y": 4572.765899658203,
-    "z": "1854297c.6f0f4f",
+    "x": 4850.566162109375,
+    "y": 4529.882568359375,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "c788c95c.77178",
-        "1fda418f.a21f6e"
+        "4fae975f.53fc68",
+        "c1f934d5.cc0aa8"
       ]
     ]
   },
   {
-    "id": "1fda418f.a21f6e",
+    "id": "c1f934d5.cc0aa8",
     "type": "set",
     "name": "unset tmp.aai.vpn-binding",
     "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value='' />\n",
     "comments": "",
-    "x": 5170.949737548828,
-    "y": 4541.765899658203,
-    "z": "1854297c.6f0f4f",
+    "x": 5093.56640625,
+    "y": 4498.882568359375,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "bffc0dc9.a62e08",
+    "id": "cf80b7cc.7e2e9",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4787.949493408203,
-    "y": 4682.765899658203,
-    "z": "1854297c.6f0f4f",
+    "x": 4710.566162109375,
+    "y": 4639.882568359375,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "1b45b5a2.80df72"
+        "94dec63b.8ae1e"
       ]
     ]
   },
   {
-    "id": "5a207984.9538",
+    "id": "840bbd02.3035a",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 4775.949737548828,
-    "y": 4775.766143798828,
-    "z": "1854297c.6f0f4f",
+    "x": 4698.56640625,
+    "y": 4732.8828125,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "ff47d1c6.a1d1",
+    "id": "cdbcda75.ac4888",
     "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": 4778.011871337891,
-    "y": 4730.625671386719,
-    "z": "1854297c.6f0f4f",
+    "x": 4700.6285400390625,
+    "y": 4687.742340087891,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "e27123aa.cc28d",
+    "id": "cdbc2fd5.f72b4",
     "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": 4393.949493408203,
-    "y": 4572.765899658203,
-    "z": "1854297c.6f0f4f",
+    "x": 4316.566162109375,
+    "y": 4529.882568359375,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "bdd7e518.23e34"
+        "bc868ed9.895db8"
       ]
     ]
   },
   {
-    "id": "bdd7e518.23e34",
+    "id": "bc868ed9.895db8",
     "type": "switchNode",
     "name": "switch related-to",
     "xml": "<switch test='`$tmp.aai.ROOT.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4598.949493408203,
-    "y": 4572.765899658203,
-    "z": "1854297c.6f0f4f",
+    "x": 4521.566162109375,
+    "y": 4529.882568359375,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "e5bca59.0771c58"
+        "7ae6a8de.c87848"
       ]
     ]
   },
   {
-    "id": "e5bca59.0771c58",
+    "id": "7ae6a8de.c87848",
     "type": "outcome",
     "name": "vpn-binding",
     "xml": "<outcome value='vpn-binding'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4764.949493408203,
-    "y": 4572.765899658203,
-    "z": "1854297c.6f0f4f",
+    "x": 4687.566162109375,
+    "y": 4529.882568359375,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "88c84935.d74a7"
+        "2111dda1.fcbdb2"
       ]
     ]
   },
   {
-    "id": "c788c95c.77178",
+    "id": "4fae975f.53fc68",
     "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": 4403.949493408203,
-    "y": 4682.765899658203,
-    "z": "1854297c.6f0f4f",
+    "x": 4326.566162109375,
+    "y": 4639.882568359375,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "9cbfda8d.34d6e8",
-        "7093291a.080b6",
-        "8f2c4a9c.eaf89"
+        "c295dc4d.214d28",
+        "c45fd018.eeb138",
+        "e9db7616.b3ebb8"
       ]
     ]
   },
   {
-    "id": "9cbfda8d.34d6e8",
+    "id": "c295dc4d.214d28",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4614.949493408203,
-    "y": 4684.765899658203,
-    "z": "1854297c.6f0f4f",
+    "x": 4537.566162109375,
+    "y": 4641.882568359375,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "bffc0dc9.a62e08"
+        "cf80b7cc.7e2e9"
       ]
     ]
   },
   {
-    "id": "7093291a.080b6",
+    "id": "c45fd018.eeb138",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4615.440460205078,
-    "y": 4730.339935302734,
-    "z": "1854297c.6f0f4f",
+    "x": 4538.05712890625,
+    "y": 4687.456604003906,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "ff47d1c6.a1d1"
+        "cdbcda75.ac4888"
       ]
     ]
   },
   {
-    "id": "8f2c4a9c.eaf89",
+    "id": "e9db7616.b3ebb8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4612.949493408203,
-    "y": 4773.765899658203,
-    "z": "1854297c.6f0f4f",
+    "x": 4535.566162109375,
+    "y": 4730.882568359375,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "5a207984.9538"
+        "840bbd02.3035a"
       ]
     ]
   },
   {
-    "id": "31c1ab24.2782c4",
+    "id": "297b4ae7.8b9706",
     "type": "comment",
     "name": "Temporary skipping this check - to support multiple instances in one slice",
     "info": "",
     "comments": "",
-    "x": 6023.766387939453,
-    "y": 7071.966827392578,
-    "z": "1854297c.6f0f4f",
+    "x": 5946.383056640625,
+    "y": 7029.08349609375,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "3272cf3c.df27d8",
+    "id": "457d3858.29d0e",
     "type": "comment",
     "name": "find all OTNs that have srcTtpOtnLayer and increase their bandwidth",
     "info": "",
     "comments": "",
-    "x": 5292.2333984375,
-    "y": 4303.16650390625,
-    "z": "1854297c.6f0f4f",
+    "x": 5214.850067138672,
+    "y": 4260.283172607422,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "d1d7ad20.29b52",
+    "id": "b25769d8.6df3c8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4794.233642578125,
-    "y": 4369.16650390625,
-    "z": "1854297c.6f0f4f",
+    "x": 4716.850311279297,
+    "y": 4326.283172607422,
+    "z": "4138d8f7.da252",
     "wires": [
       []
     ]
   },
   {
-    "id": "3f823260.f76936",
+    "id": "201cbbc6.38c61c",
     "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": 5325.2333984375,
-    "y": 4371.16650390625,
-    "z": "1854297c.6f0f4f",
+    "x": 5247.850067138672,
+    "y": 4328.283172607422,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "de937f43.9aff7",
-        "af59f95b.0de0c8"
+        "823be1e9.77a818",
+        "82dbf116.45c298"
       ]
     ]
   },
   {
-    "id": "de937f43.9aff7",
+    "id": "823be1e9.77a818",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5450.2333984375,
-    "y": 4269.166259765625,
-    "z": "1854297c.6f0f4f",
+    "x": 5372.850067138672,
+    "y": 4226.282928466797,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "31c7669e.9273ea"
+        "ea4b8bb2.02c728"
       ]
     ]
   },
   {
-    "id": "af59f95b.0de0c8",
+    "id": "82dbf116.45c298",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5569.233428955078,
-    "y": 4343.166290283203,
-    "z": "1854297c.6f0f4f",
+    "x": 5491.85009765625,
+    "y": 4300.282958984375,
+    "z": "4138d8f7.da252",
     "wires": [
       []
     ]
   },
   {
-    "id": "361b2cba.676744",
+    "id": "12318d1c.9b97cb",
     "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": 4537.916534423828,
-    "y": 3914.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 4460.533203125,
+    "y": 3872,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "37ee69b4.cc11f6",
+    "id": "1c49d26a.15504e",
     "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": 4882.916534423828,
-    "y": 3776.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 4805.533203125,
+    "y": 3734,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "35c1fec6.57172a"
+        "ee8d9735.9d0e18"
       ]
     ]
   },
   {
-    "id": "a8388031.3aed68",
+    "id": "75d5369a.76387",
     "type": "for",
     "name": "for netwidx..allNetworksList_length",
     "xml": "<for index='netwidx' start='0' end='`$allNetworksList.network-resource_length`' >",
     "comments": "",
     "outputs": 1,
-    "x": 4589.916534423828,
-    "y": 3770.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 4512.533203125,
+    "y": 3728,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "37ee69b4.cc11f6"
+        "1c49d26a.15504e"
       ]
     ]
   },
   {
-    "id": "a8458e1d.db654",
+    "id": "2e9ad10b.18ccd6",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4844.916534423828,
-    "y": 3727.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 4767.533203125,
+    "y": 3685,
+    "z": "4138d8f7.da252",
     "wires": [
       []
     ]
   },
   {
-    "id": "f592965f.32c0e8",
+    "id": "8bf9488.63f0cb8",
     "type": "set",
     "name": "unset parameters",
     "xml": "<set>\n<parameter name='tmp.pce-src-node.' value='' />\n",
     "comments": "",
-    "x": 4533.916534423828,
-    "y": 3822.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 4456.533203125,
+    "y": 3780,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "5ddf33c1.65a594",
+    "id": "4168ca78.86bd8c",
     "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": 4541.916534423828,
-    "y": 3867.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 4464.533203125,
+    "y": 3825,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "76b17a13.8ea0bc",
+    "id": "6e2860cf.ccae3",
     "type": "set",
     "name": "unset otnTopoIdSrc",
     "xml": "<set>\n<parameter name='otnTopoIdSrc' value='' />\n",
     "comments": "",
-    "x": 4538.916534423828,
-    "y": 3720.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 4461.533203125,
+    "y": 3678,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "35c1fec6.57172a",
+    "id": "ee8d9735.9d0e18",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4791.916534423828,
-    "y": 3844.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 4714.533203125,
+    "y": 3802,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "a725ab73.c73ac"
+        "16183a46.3a0a2e"
       ]
     ]
   },
   {
-    "id": "a725ab73.c73ac",
+    "id": "16183a46.3a0a2e",
     "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": 4976.916534423828,
-    "y": 3843.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 4899.533203125,
+    "y": 3801,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "d15b8b2d.be0c58"
+        "9cdceec0.5d3c1"
       ]
     ]
   },
   {
-    "id": "d15b8b2d.be0c58",
+    "id": "9cdceec0.5d3c1",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5168.916534423828,
-    "y": 3846.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 5091.533203125,
+    "y": 3804,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "8eebb571.fd6c9"
+        "a8a5fc36.2f7d"
       ]
     ]
   },
   {
-    "id": "8eebb571.fd6c9",
+    "id": "a8a5fc36.2f7d",
     "type": "set",
     "name": "set otnTopoIdSrc",
     "xml": "<set>\n<parameter name='otnTopoIdSrc' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />\n",
     "comments": "",
-    "x": 5340.916534423828,
-    "y": 3842.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 5263.533203125,
+    "y": 3800,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "4b7e80ea.96d268",
+    "id": "eb8710b8.36ef48",
     "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": 4716.916534423828,
-    "y": 3957.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 4639.533203125,
+    "y": 3915,
+    "z": "4138d8f7.da252",
     "wires": [
       []
     ]
   },
   {
-    "id": "b4ed3622.c08",
+    "id": "616a588c.b788e8",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4233.916534423828,
-    "y": 3742.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 4156.533203125,
+    "y": 3700,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "26ef8b2b.34003c",
-        "269ffcd4.c70e7c",
-        "f592965f.32c0e8",
-        "5ddf33c1.65a594",
-        "361b2cba.676744",
-        "a8388031.3aed68",
-        "4b7e80ea.96d268"
+        "711898b1.a3a988",
+        "c5e1be90.cd78d",
+        "8bf9488.63f0cb8",
+        "4168ca78.86bd8c",
+        "12318d1c.9b97cb",
+        "75d5369a.76387",
+        "eb8710b8.36ef48"
       ]
     ]
   },
   {
-    "id": "ce279396.ecc818",
+    "id": "d9429d2a.b15568",
     "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": 4218.916534423828,
-    "y": 3676.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 4141.533203125,
+    "y": 3634,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "269ffcd4.c70e7c",
+    "id": "c5e1be90.cd78d",
     "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": 4597.916534423828,
-    "y": 3663.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 4520.533203125,
+    "y": 3621,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "2b1251d3.218d36",
-        "69b1ddc7.bc8184",
-        "a8458e1d.db654"
+        "d0e253fc.83209",
+        "415d3771.16041",
+        "2e9ad10b.18ccd6"
       ]
     ]
   },
   {
-    "id": "2b1251d3.218d36",
+    "id": "d0e253fc.83209",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4833.916534423828,
-    "y": 3646.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 4756.533203125,
+    "y": 3604,
+    "z": "4138d8f7.da252",
     "wires": [
       []
     ]
   },
   {
-    "id": "69b1ddc7.bc8184",
+    "id": "415d3771.16041",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4830.916534423828,
-    "y": 3687.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 4753.533203125,
+    "y": 3645,
+    "z": "4138d8f7.da252",
     "wires": [
       []
     ]
   },
   {
-    "id": "26ef8b2b.34003c",
+    "id": "711898b1.a3a988",
     "type": "set",
     "name": "unset parameters",
     "xml": "<set>\n<parameter name='allNetworksList.' value='' />\n",
     "comments": "",
-    "x": 4546.916534423828,
-    "y": 3620.883331298828,
-    "z": "1854297c.6f0f4f",
+    "x": 4469.533203125,
+    "y": 3578,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "a7d12ef0.b4e948",
+    "id": "6bda79b8.645a68",
     "type": "comment",
     "name": "find all OTNs that have srcTtpOtnLayer and increase their bandwidth",
     "info": "",
     "comments": "",
-    "x": 5276.316436767578,
-    "y": 4670.283233642578,
-    "z": "1854297c.6f0f4f",
+    "x": 5198.93310546875,
+    "y": 4627.39990234375,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "1b45b5a2.80df72",
+    "id": "94dec63b.8ae1e",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5065.316436767578,
-    "y": 4732.283233642578,
-    "z": "1854297c.6f0f4f",
+    "x": 4987.93310546875,
+    "y": 4689.39990234375,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "ed1b64d5.33faa"
+        "5b09d63.4152d28"
       ]
     ]
   },
   {
-    "id": "ed1b64d5.33faa",
+    "id": "5b09d63.4152d28",
     "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": 5309.316436767578,
-    "y": 4738.283233642578,
-    "z": "1854297c.6f0f4f",
+    "x": 5231.93310546875,
+    "y": 4695.39990234375,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "230e8d7f.cf5b82",
-        "8c0eb7af.7df34"
+        "4ce07cc6.c3d424",
+        "f554a368.1a08c8"
       ]
     ]
   },
   {
-    "id": "230e8d7f.cf5b82",
+    "id": "4ce07cc6.c3d424",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5540.316436767578,
-    "y": 4716.283233642578,
-    "z": "1854297c.6f0f4f",
+    "x": 5462.93310546875,
+    "y": 4673.39990234375,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "626950bd.12ae3"
+        "e736f8f3.ed2808"
       ]
     ]
   },
   {
-    "id": "8c0eb7af.7df34",
+    "id": "f554a368.1a08c8",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5545.316436767578,
-    "y": 4783.283233642578,
-    "z": "1854297c.6f0f4f",
+    "x": 5467.93310546875,
+    "y": 4740.39990234375,
+    "z": "4138d8f7.da252",
     "wires": [
       []
     ]
   },
   {
-    "id": "a8be8ed1.6d85c",
+    "id": "4a82e0bf.f144f",
     "type": "switchNode",
     "name": "switch tmp.isBwIncreased",
     "xml": "<switch test=\"`$tmp.isBwIncreased`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5794.2001953125,
-    "y": 4280.965576171875,
-    "z": "1854297c.6f0f4f",
+    "x": 5716.816864013672,
+    "y": 4238.082244873047,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "5f515b8.97d0aa4",
-        "e3c5fe18.dd7758"
+        "8b36e42.8d18318",
+        "9e33af49.9f241"
       ]
     ]
   },
   {
-    "id": "5f515b8.97d0aa4",
+    "id": "8b36e42.8d18318",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5949.200225830078,
-    "y": 4208.965850830078,
-    "z": "1854297c.6f0f4f",
+    "x": 5871.81689453125,
+    "y": 4166.08251953125,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "b9ddbbac.4ceb18"
+        "b40b55f7.23af98"
       ]
     ]
   },
   {
-    "id": "e3c5fe18.dd7758",
+    "id": "9e33af49.9f241",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5950.200225830078,
-    "y": 4341.965850830078,
-    "z": "1854297c.6f0f4f",
+    "x": 5872.81689453125,
+    "y": 4299.08251953125,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "7f4f722.c77710c"
+        "b38dd55a.418b38"
       ]
     ]
   },
   {
-    "id": "b9ddbbac.4ceb18",
+    "id": "b40b55f7.23af98",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 6094.200225830078,
-    "y": 4208.966094970703,
-    "z": "1854297c.6f0f4f",
+    "x": 6016.81689453125,
+    "y": 4166.082763671875,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "c99d2def.311358",
-        "6bec6ba7.e1cedc"
+        "3913dc06.a223d4",
+        "839acfd7.2291a"
       ]
     ]
   },
   {
-    "id": "c99d2def.311358",
+    "id": "3913dc06.a223d4",
     "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": 6387.200225830078,
-    "y": 4186.965850830078,
-    "z": "1854297c.6f0f4f",
+    "x": 6309.81689453125,
+    "y": 4144.08251953125,
+    "z": "4138d8f7.da252",
     "wires": [
       []
     ]
   },
   {
-    "id": "6bec6ba7.e1cedc",
+    "id": "839acfd7.2291a",
     "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": 6338.850128173828,
-    "y": 4234.282745361328,
-    "z": "1854297c.6f0f4f",
+    "x": 6261.466796875,
+    "y": 4191.3994140625,
+    "z": "4138d8f7.da252",
     "wires": [
       []
     ]
   },
   {
-    "id": "9711fbcd.9495e8",
+    "id": "4d10eebf.474a88",
     "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": 6412.2001953125,
-    "y": 4135.965576171875,
-    "z": "1854297c.6f0f4f",
+    "x": 6334.816864013672,
+    "y": 4093.082244873047,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "7f4f722.c77710c",
+    "id": "b38dd55a.418b38",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 6106.200225830078,
-    "y": 4340.966094970703,
-    "z": "1854297c.6f0f4f",
+    "x": 6028.81689453125,
+    "y": 4298.082763671875,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "59431729.1fb158",
-        "1fc311b.d897f6e"
+        "8675cc13.463188",
+        "35c1f8d2.a502"
       ]
     ]
   },
   {
-    "id": "59431729.1fb158",
+    "id": "8675cc13.463188",
     "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": 6399.200225830078,
-    "y": 4318.965850830078,
-    "z": "1854297c.6f0f4f",
+    "x": 6321.81689453125,
+    "y": 4276.08251953125,
+    "z": "4138d8f7.da252",
     "wires": [
       []
     ]
   },
   {
-    "id": "1fc311b.d897f6e",
+    "id": "35c1f8d2.a502",
     "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": 6350.850128173828,
-    "y": 4366.282745361328,
-    "z": "1854297c.6f0f4f",
+    "x": 6273.466796875,
+    "y": 4323.3994140625,
+    "z": "4138d8f7.da252",
     "wires": [
       []
     ]
   },
   {
-    "id": "1617355e.191edb",
+    "id": "b5ed36f4.c5e02",
     "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": 6423.200225830078,
-    "y": 4279.965850830078,
-    "z": "1854297c.6f0f4f",
+    "x": 6345.81689453125,
+    "y": 4237.08251953125,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "626950bd.12ae3",
+    "id": "e736f8f3.ed2808",
     "type": "switchNode",
     "name": "switch tmp.isBwIncreased",
     "xml": "<switch test=\"`$tmp.isBwIncreased`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5745.433135986328,
-    "y": 4723.166534423828,
-    "z": "1854297c.6f0f4f",
+    "x": 5668.0498046875,
+    "y": 4680.283203125,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "a17c6b6f.2c879",
-        "a4050844.87c708"
+        "c39fa1bf.775f28",
+        "760b6a69.a4fd14"
       ]
     ]
   },
   {
-    "id": "a17c6b6f.2c879",
+    "id": "c39fa1bf.775f28",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5940.433135986328,
-    "y": 4651.166534423828,
-    "z": "1854297c.6f0f4f",
+    "x": 5863.0498046875,
+    "y": 4608.283203125,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "cccf95aa.d66d78"
+        "903811e2.41d4e8"
       ]
     ]
   },
   {
-    "id": "a4050844.87c708",
+    "id": "760b6a69.a4fd14",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5941.433135986328,
-    "y": 4784.166534423828,
-    "z": "1854297c.6f0f4f",
+    "x": 5864.0498046875,
+    "y": 4741.283203125,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "90ce4884.5c53c8"
+        "8a352d04.a7b5f"
       ]
     ]
   },
   {
-    "id": "cccf95aa.d66d78",
+    "id": "903811e2.41d4e8",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 6085.433135986328,
-    "y": 4651.166778564453,
-    "z": "1854297c.6f0f4f",
+    "x": 6008.0498046875,
+    "y": 4608.283447265625,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "c37b260.db0c1d8",
-        "742aa3a0.c04704"
+        "dd052918.eeeec8",
+        "5b6d1623.4afde8"
       ]
     ]
   },
   {
-    "id": "c37b260.db0c1d8",
+    "id": "dd052918.eeeec8",
     "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": 6378.433135986328,
-    "y": 4629.166534423828,
-    "z": "1854297c.6f0f4f",
+    "x": 6301.0498046875,
+    "y": 4586.283203125,
+    "z": "4138d8f7.da252",
     "wires": [
       []
     ]
   },
   {
-    "id": "742aa3a0.c04704",
+    "id": "5b6d1623.4afde8",
     "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": 6330.083038330078,
-    "y": 4676.483428955078,
-    "z": "1854297c.6f0f4f",
+    "x": 6252.69970703125,
+    "y": 4633.60009765625,
+    "z": "4138d8f7.da252",
     "wires": [
       []
     ]
   },
   {
-    "id": "5708f1c2.de612",
+    "id": "f8433708.1cf278",
     "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": 6402.433135986328,
-    "y": 4590.166534423828,
-    "z": "1854297c.6f0f4f",
+    "x": 6325.0498046875,
+    "y": 4547.283203125,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "90ce4884.5c53c8",
+    "id": "8a352d04.a7b5f",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 6097.433135986328,
-    "y": 4783.166778564453,
-    "z": "1854297c.6f0f4f",
+    "x": 6020.0498046875,
+    "y": 4740.283447265625,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "9bebcf2c.a35908",
-        "bf7ecccc.77e158"
+        "1797ce6f.bf55da",
+        "f850925d.eaddb8"
       ]
     ]
   },
   {
-    "id": "9bebcf2c.a35908",
+    "id": "1797ce6f.bf55da",
     "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": 6390.433135986328,
-    "y": 4761.166534423828,
-    "z": "1854297c.6f0f4f",
+    "x": 6313.0498046875,
+    "y": 4718.283203125,
+    "z": "4138d8f7.da252",
     "wires": [
       []
     ]
   },
   {
-    "id": "bf7ecccc.77e158",
+    "id": "f850925d.eaddb8",
     "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": 6342.083038330078,
-    "y": 4808.483428955078,
-    "z": "1854297c.6f0f4f",
+    "x": 6264.69970703125,
+    "y": 4765.60009765625,
+    "z": "4138d8f7.da252",
     "wires": [
       []
     ]
   },
   {
-    "id": "898aa8ca.144488",
+    "id": "98f83ad6.f376c",
     "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": 6414.433135986328,
-    "y": 4722.166534423828,
-    "z": "1854297c.6f0f4f",
+    "x": 6337.0498046875,
+    "y": 4679.283203125,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "3302d733.17cb08",
+    "id": "f3a92d2f.d14e78",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 5153.283233642578,
-    "y": 5463.366729736328,
-    "z": "1854297c.6f0f4f",
+    "x": 5075.89990234375,
+    "y": 5420.4833984375,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "c4bba10e.ae5948",
+    "id": "cfcbce5e.a3353",
     "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": 5151.066436767578,
-    "y": 5503.566925048828,
-    "z": "1854297c.6f0f4f",
+    "x": 5073.68310546875,
+    "y": 5460.68359375,
+    "z": "4138d8f7.da252",
     "wires": [
       []
     ]
   },
   {
-    "id": "fba1ca00.18c228",
+    "id": "35bf741d.0589dc",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 5026.316680908203,
-    "y": 5688.049835205078,
-    "z": "1854297c.6f0f4f",
+    "x": 4948.933349609375,
+    "y": 5645.16650390625,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "bc2e1526.9ae628",
+    "id": "58a0b8d5.3916c8",
     "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": 5024.099884033203,
-    "y": 5728.250030517578,
-    "z": "1854297c.6f0f4f",
+    "x": 4946.716552734375,
+    "y": 5685.36669921875,
+    "z": "4138d8f7.da252",
     "wires": [
       []
     ]
   },
   {
-    "id": "c14b3eb1.3ce2b",
+    "id": "141a3bed.ea5a94",
     "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": 5128.433135986328,
-    "y": 6171.166534423828,
-    "z": "1854297c.6f0f4f",
+    "x": 5046.0498046875,
+    "y": 5969.283203125,
+    "z": "4138d8f7.da252",
     "wires": [
       []
     ]
   },
   {
-    "id": "78d24bb0.4c8ea4",
+    "id": "8127bfc.2c0cdc",
     "type": "switchNode",
     "name": "switch found-root-connectivity",
     "xml": "\n<switch test=\"`$found-root-connectivity`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4955.433135986328,
-    "y": 6228.166534423828,
-    "z": "1854297c.6f0f4f",
+    "x": 4873.0498046875,
+    "y": 6026.283203125,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "8d0d07ba.6f81c8",
-        "4ae3fa7f.c7968c"
+        "eb3bc0b8.920088",
+        "e32169bb.0af1a8"
       ]
     ]
   },
   {
-    "id": "8d0d07ba.6f81c8",
+    "id": "eb3bc0b8.920088",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5166.433135986328,
-    "y": 6228.166534423828,
-    "z": "1854297c.6f0f4f",
+    "x": 5084.0498046875,
+    "y": 6026.283203125,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "7c55c647.3c8228"
+        "2548cb5a.7d91a4"
       ]
     ]
   },
   {
-    "id": "4ae3fa7f.c7968c",
+    "id": "e32169bb.0af1a8",
     "type": "outcomeFalse",
     "name": "false",
     "xml": "<outcome value='false'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5162.433135986328,
-    "y": 6276.166534423828,
-    "z": "1854297c.6f0f4f",
+    "x": 5080.0498046875,
+    "y": 6074.283203125,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "2e757361.f3de2c"
+        "6b0e17ed.7e019"
       ]
     ]
   },
   {
-    "id": "7c55c647.3c8228",
+    "id": "2548cb5a.7d91a4",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5322.433135986328,
-    "y": 6224.166534423828,
-    "z": "1854297c.6f0f4f",
+    "x": 5240.0498046875,
+    "y": 6022.283203125,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "2cbacdde.26f332",
-        "94ab2e80.b69ba8",
-        "d5533498.f6f7f"
+        "4736668b.da34e8",
+        "d60814f1.44b368",
+        "3b369b46.f16d74"
       ]
     ]
   },
   {
-    "id": "2e757361.f3de2c",
+    "id": "6b0e17ed.7e019",
     "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": 5310.433135986328,
-    "y": 6271.166534423828,
-    "z": "1854297c.6f0f4f",
+    "x": 5228.0498046875,
+    "y": 6069.283203125,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "510063da.63ac6c",
+    "id": "b390ff23.8e635",
     "type": "comment",
     "name": "Update connectivity status to modified",
     "info": "",
     "comments": "",
-    "x": 5588.316925048828,
-    "y": 6324.049835205078,
-    "z": "1854297c.6f0f4f",
+    "x": 5505.93359375,
+    "y": 6122.16650390625,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "d5533498.f6f7f",
+    "id": "3b369b46.f16d74",
     "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": 5586.100128173828,
-    "y": 6364.250030517578,
-    "z": "1854297c.6f0f4f",
+    "x": 5503.716796875,
+    "y": 6162.36669921875,
+    "z": "4138d8f7.da252",
     "wires": [
       []
     ]
   },
   {
-    "id": "94ab2e80.b69ba8",
+    "id": "d60814f1.44b368",
     "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": 5705.433135986328,
-    "y": 6276.166534423828,
-    "z": "1854297c.6f0f4f",
+    "x": 5623.0498046875,
+    "y": 6074.283203125,
+    "z": "4138d8f7.da252",
     "wires": [
       []
     ]
   },
   {
-    "id": "2cbacdde.26f332",
+    "id": "4736668b.da34e8",
     "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": 5576.433135986328,
-    "y": 6224.166534423828,
-    "z": "1854297c.6f0f4f",
+    "x": 5494.0498046875,
+    "y": 6022.283203125,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "d8a0b134.770b1",
+    "id": "85c984f2.33f7c8",
     "type": "comment",
     "name": "populate connectivity-B variable in the context map",
     "info": "",
     "comments": "",
-    "x": 5017.433135986328,
-    "y": 6129.166534423828,
-    "z": "1854297c.6f0f4f",
+    "x": 4935.0498046875,
+    "y": 5927.283203125,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "54a65e87.65172",
+    "id": "f942597e.1aa18",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 4724.766143798828,
-    "y": 6211.166534423828,
-    "z": "1854297c.6f0f4f",
+    "x": 4582.3828125,
+    "y": 6014.283203125,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "c14b3eb1.3ce2b",
-        "78d24bb0.4c8ea4"
+        "141a3bed.ea5a94",
+        "8127bfc.2c0cdc",
+        "8afd899a.01e88",
+        "8c1f115c.700108"
       ]
     ]
   },
   {
-    "id": "11c77751.f259a1",
+    "id": "fc4aa587.17d69",
     "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": 5003.516632080078,
-    "y": 6526.166534423828,
-    "z": "1854297c.6f0f4f",
+    "x": 4926.13330078125,
+    "y": 6483.283203125,
+    "z": "4138d8f7.da252",
     "wires": [
       []
     ]
   },
   {
-    "id": "7eabc766.dd7c8",
+    "id": "41ec9458.f731e4",
     "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": 3708.8837890625,
-    "y": 3802.88330078125,
-    "z": "1854297c.6f0f4f",
+    "x": 3631.500457763672,
+    "y": 3759.999969482422,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "c0c356fb.babc",
+    "id": "23b69bc.0871b64",
     "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": 4461.4169921875,
-    "y": 4077,
-    "z": "1854297c.6f0f4f",
+    "x": 4384.033660888672,
+    "y": 4034.116668701172,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "b8196ee9.4b3808",
-        "80c1418b.2150d8",
-        "56405931.8c65f8"
+        "75525335.c9aa54",
+        "d5340ebc.32553",
+        "f8167756.f35bd8"
       ]
     ]
   },
   {
-    "id": "eb18f7d.31abf88",
+    "id": "977709e8.5868c",
     "type": "comment",
     "name": "find all OTNs that have srcTtpOtnLayer and increase their bandwidth",
     "info": "",
     "comments": "",
-    "x": 4569.417236328125,
-    "y": 4033,
-    "z": "1854297c.6f0f4f",
+    "x": 4492.033905029297,
+    "y": 3990.116668701172,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "b8196ee9.4b3808",
+    "id": "75525335.c9aa54",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4666.4169921875,
-    "y": 4074,
-    "z": "1854297c.6f0f4f",
+    "x": 4589.033660888672,
+    "y": 4031.116668701172,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "9aacf189.24898"
+        "b5414319.96d9"
       ]
     ]
   },
   {
-    "id": "80c1418b.2150d8",
+    "id": "d5340ebc.32553",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4649.907958984375,
-    "y": 4135.574035644531,
-    "z": "1854297c.6f0f4f",
+    "x": 4572.524627685547,
+    "y": 4092.690704345703,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "de469de6.448a8"
+        "a327dd9c.9d096"
       ]
     ]
   },
   {
-    "id": "56405931.8c65f8",
+    "id": "f8167756.f35bd8",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 4647.4169921875,
-    "y": 4179,
-    "z": "1854297c.6f0f4f",
+    "x": 4570.033660888672,
+    "y": 4136.116668701172,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "6c1db7b.a15c7c8"
+        "784d31ab.abb97"
       ]
     ]
   },
   {
-    "id": "9aacf189.24898",
+    "id": "b5414319.96d9",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 4834.417236328125,
-    "y": 4069,
-    "z": "1854297c.6f0f4f",
+    "x": 4757.033905029297,
+    "y": 4026.116668701172,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "3b0478b5.ff78"
+        "98142959.81fca"
       ]
     ]
   },
   {
-    "id": "de469de6.448a8",
+    "id": "a327dd9c.9d096",
     "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": 4812.4793701171875,
-    "y": 4135.859771728516,
-    "z": "1854297c.6f0f4f",
+    "x": 4735.096038818359,
+    "y": 4092.9764404296875,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "6c1db7b.a15c7c8",
+    "id": "784d31ab.abb97",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
     "comments": "",
-    "x": 4814.4169921875,
-    "y": 4178,
-    "z": "1854297c.6f0f4f",
+    "x": 4737.033660888672,
+    "y": 4135.116668701172,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "3b0478b5.ff78",
+    "id": "98142959.81fca",
     "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": 5072.417236328125,
-    "y": 4074,
-    "z": "1854297c.6f0f4f",
+    "x": 4995.033905029297,
+    "y": 4031.116668701172,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "b59112.09635ef"
+        "6df0b8a0.a7c62"
       ]
     ]
   },
   {
-    "id": "b59112.09635ef",
+    "id": "6df0b8a0.a7c62",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5306.4169921875,
-    "y": 4081,
-    "z": "1854297c.6f0f4f",
+    "x": 5229.033660888672,
+    "y": 4038.116668701172,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "3f823260.f76936"
+        "201cbbc6.38c61c"
       ]
     ]
   },
   {
-    "id": "67daf127.7e6a38",
+    "id": "92806e4e.351398",
     "type": "set",
     "name": "unset tmp.aai.all-vpn-bindings",
     "xml": "<set>\n<parameter name='tmp.aai.all-vpn-bindings.' value='' />\n",
     "comments": "",
-    "x": 4440.11669921875,
-    "y": 4003,
-    "z": "1854297c.6f0f4f",
+    "x": 4362.733367919922,
+    "y": 3960.116668701172,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "11444ec1.8e4d01",
+    "id": "f43de449.20024",
     "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": 5723.2666015625,
-    "y": 4091.5830078125,
-    "z": "1854297c.6f0f4f",
+    "x": 5645.883270263672,
+    "y": 4048.699676513672,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "f98d1d31.14c4f8"
+        "7a53ecb2.cec2c4"
       ]
     ]
   },
   {
-    "id": "f98d1d31.14c4f8",
+    "id": "7a53ecb2.cec2c4",
     "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": 5915.2666015625,
-    "y": 4080.583251953125,
-    "z": "1854297c.6f0f4f",
+    "x": 5837.883270263672,
+    "y": 4037.699920654297,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "894c5e31.55f348"
+        "700641c0.5a055"
       ]
     ]
   },
   {
-    "id": "894c5e31.55f348",
+    "id": "700641c0.5a055",
     "type": "outcome",
     "name": "connectivity",
     "xml": "<outcome value='connectivity'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 6097.2666015625,
-    "y": 4059.583251953125,
-    "z": "1854297c.6f0f4f",
+    "x": 6019.883270263672,
+    "y": 4016.699920654297,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "2837af93.7fedb8"
+        "9920129e.a09"
       ]
     ]
   },
   {
-    "id": "2837af93.7fedb8",
+    "id": "9920129e.a09",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 6259.2666015625,
-    "y": 4048.583251953125,
-    "z": "1854297c.6f0f4f",
+    "x": 6181.883270263672,
+    "y": 4005.699920654297,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "75575304.c30724",
-        "fb102e8c.f8d02"
+        "7f7dfee.7fba8",
+        "c8f259e.2871ba8"
       ]
     ]
   },
   {
-    "id": "75575304.c30724",
+    "id": "7f7dfee.7fba8",
     "type": "set",
     "name": "unset tmp.the-connectivity",
     "xml": "<set>\n<parameter name='tmp.the-connectivity.' value='' />\n",
     "comments": "",
-    "x": 6456.2666015625,
-    "y": 3977.583251953125,
-    "z": "1854297c.6f0f4f",
+    "x": 6378.883270263672,
+    "y": 3934.699920654297,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "812bc4de.8330d",
+    "id": "335b26db.86f24a",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5630.216796875,
-    "y": 4206.5830078125,
-    "z": "1854297c.6f0f4f",
+    "x": 5552.833465576172,
+    "y": 4163.699676513672,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "a8be8ed1.6d85c",
-        "11444ec1.8e4d01",
-        "7f9cffe2.08c768",
-        "8c2c4043.586498"
+        "4a82e0bf.f144f",
+        "f43de449.20024",
+        "1e79d0a7.c66727",
+        "7f90edcc.1e82b4"
       ]
     ]
   },
   {
-    "id": "7f9cffe2.08c768",
+    "id": "1e79d0a7.c66727",
     "type": "set",
     "name": "unset tmp.aai.the-vpn-binding",
     "xml": "<set>\n<parameter name='tmp.aai.the-vpn-binding.' value=\"\" />\n",
     "comments": "",
-    "x": 5761.783203125,
-    "y": 3981.800048828125,
-    "z": "1854297c.6f0f4f",
+    "x": 5684.399871826172,
+    "y": 3938.916717529297,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "8c2c4043.586498",
+    "id": "7f90edcc.1e82b4",
     "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": 5753.783203125,
-    "y": 4030.800048828125,
-    "z": "1854297c.6f0f4f",
+    "x": 5676.399871826172,
+    "y": 3987.916717529297,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "fb102e8c.f8d02",
+    "id": "c8f259e.2871ba8",
     "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": 6461.7333984375,
-    "y": 4086.800048828125,
-    "z": "1854297c.6f0f4f",
+    "x": 6384.350067138672,
+    "y": 4043.916717529297,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "a9133f1b.8373c8",
+    "id": "a412e157.cf47d8",
     "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": 5755,
-    "y": 3805,
-    "z": "1854297c.6f0f4f",
+    "x": 5677.616668701172,
+    "y": 3762.116668701172,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "4b95d87b.bccc58",
+    "id": "6887559d.aa01b4",
     "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": 5909,
-    "y": 3857,
-    "z": "1854297c.6f0f4f",
+    "x": 5831.616668701172,
+    "y": 3814.116668701172,
+    "z": "4138d8f7.da252",
     "wires": [
       []
     ]
   },
   {
-    "id": "31c7669e.9273ea",
+    "id": "ea4b8bb2.02c728",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 5500,
-    "y": 3924,
-    "z": "1854297c.6f0f4f",
+    "x": 5422.616668701172,
+    "y": 3881.116668701172,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "4b95d87b.bccc58",
-        "26b17ecc.f40902",
-        "a9133f1b.8373c8"
+        "6887559d.aa01b4",
+        "d154a2e6.a2bcc",
+        "a412e157.cf47d8"
       ]
     ]
   },
   {
-    "id": "26b17ecc.f40902",
+    "id": "d154a2e6.a2bcc",
     "type": "switchNode",
     "name": "switch $foundVpnName",
     "xml": "<switch test=\"`$foundVpnName`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 5754,
-    "y": 3912,
-    "z": "1854297c.6f0f4f",
+    "x": 5676.616668701172,
+    "y": 3869.116668701172,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "245d39b1.fcc7b6"
+        "89918c5f.33a478"
       ]
     ]
   },
   {
-    "id": "245d39b1.fcc7b6",
+    "id": "89918c5f.33a478",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5933,
-    "y": 3911,
-    "z": "1854297c.6f0f4f",
+    "x": 5855.616668701172,
+    "y": 3868.116668701172,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "812bc4de.8330d"
+        "335b26db.86f24a"
       ]
     ]
   },
   {
-    "id": "2f3de295.447b1e",
+    "id": "2fafeba7.6be734",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic='true'>",
     "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 4631,
-    "y": 7429,
-    "z": "1854297c.6f0f4f",
+    "x": 4553.616668701172,
+    "y": 7386.116668701172,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "48382561.04ccdc",
-        "a0fe64b2.d649a",
-        "3a51bb36.70835c"
+        "18db3335.23915d",
+        "d2fe4c45.697938",
+        "175608de.c2a5b7"
       ]
     ]
   },
   {
-    "id": "3a51bb36.70835c",
+    "id": "175608de.c2a5b7",
     "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": 4854,
-    "y": 7373,
-    "z": "1854297c.6f0f4f",
+    "x": 4776.616668701172,
+    "y": 7330.116668701172,
+    "z": "4138d8f7.da252",
     "wires": []
   },
   {
-    "id": "48382561.04ccdc",
+    "id": "18db3335.23915d",
     "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": 5033,
-    "y": 7416,
-    "z": "1854297c.6f0f4f",
+    "x": 4955.616668701172,
+    "y": 7373.116668701172,
+    "z": "4138d8f7.da252",
     "wires": [
       []
     ]
   },
   {
-    "id": "a0fe64b2.d649a",
+    "id": "d2fe4c45.697938",
     "type": "switchNode",
     "name": "switch $foundVpnName",
     "xml": "<switch test=\"`$foundVpnName`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 4878,
-    "y": 7471,
-    "z": "1854297c.6f0f4f",
+    "x": 4800.616668701172,
+    "y": 7428.116668701172,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "e761a2b0.d43cc"
+        "5916bddb.120d64"
       ]
     ]
   },
   {
-    "id": "e761a2b0.d43cc",
+    "id": "5916bddb.120d64",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 5057,
-    "y": 7470,
-    "z": "1854297c.6f0f4f",
+    "x": 4979.616668701172,
+    "y": 7427.116668701172,
+    "z": "4138d8f7.da252",
     "wires": [
       [
-        "ed22a86b.d791b8"
+        "997dfd42.35e9c"
       ]
     ]
   },
   {
-    "id": "9efae615.dd5ab",
+    "id": "afa717d0.25e7a8",
     "type": "set",
     "name": "unset tmp.aai.all-vpn-bindings",
     "xml": "<set>\n<parameter name='tmp.aai.all-vpn-bindings.' value='' />\n",
     "comments": "",
-    "x": 4788,
-    "y": 7109,
-    "z": "1854297c.6f0f4f",
+    "x": 4710.616668701172,
+    "y": 7066.116668701172,
+    "z": "4138d8f7.da252",
+    "wires": []
+  },
+  {
+    "id": "46e10049.e35348",
+    "type": "set",
+    "name": "unset secondary related variables",
+    "xml": "<set>\n<parameter name='hasSecondary' value=\"false\" />\n<parameter name='network-route-three' value=\"\" />\n<parameter name='tmp.aai.network-route-three.' value=\"\" />\n<parameter name='tmp.aai.network-route-C.' value=\"\" />\n",
+    "comments": "",
+    "x": 3276.2332763671875,
+    "y": 460.566650390625,
+    "z": "4138d8f7.da252",
+    "wires": []
+  },
+  {
+    "id": "26a90c3.2a56674",
+    "type": "outcome",
+    "name": "SECONDARY-ROOT",
+    "xml": "<outcome value='SECONDARY-ROOT'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4051.332763671875,
+    "y": 521.566650390625,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "949451da.c153b8"
+      ]
+    ]
+  },
+  {
+    "id": "949451da.c153b8",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 4220.332763671875,
+    "y": 518.566650390625,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "33bf54d9.6913cc",
+        "9e64bdfc.fb79a8"
+      ]
+    ]
+  },
+  {
+    "id": "33bf54d9.6913cc",
+    "type": "set",
+    "name": "set network-route-SECONDARY-ROOT",
+    "xml": "<set>\n<parameter name='tmp.aai.network-route-SECONDARY-ROOT.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",
+    "comments": "",
+    "x": 4444.332763671875,
+    "y": 551.566650390625,
+    "z": "4138d8f7.da252",
+    "wires": []
+  },
+  {
+    "id": "9e64bdfc.fb79a8",
+    "type": "set",
+    "name": "set network-route-C",
+    "xml": "<set>\n<parameter name='tmp.aai.network-route-C.' value=\"`$tmp.aai.network-route-one.`\" />\n\n\n",
+    "comments": "",
+    "x": 4390.332763671875,
+    "y": 591.566650390625,
+    "z": "4138d8f7.da252",
+    "wires": []
+  },
+  {
+    "id": "16154f9d.14a3b",
+    "type": "outcome",
+    "name": "SECONDARY-ROOT",
+    "xml": "<outcome value='SECONDARY-ROOT'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4016.333251953125,
+    "y": 720.7666625976562,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "85975abf.6c518"
+      ]
+    ]
+  },
+  {
+    "id": "85975abf.6c518",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 4181.33251953125,
+    "y": 725.7666625976562,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "adebbb96.d8f2f",
+        "88877892.df83d8"
+      ]
+    ]
+  },
+  {
+    "id": "adebbb96.d8f2f",
+    "type": "set",
+    "name": "set network-route-SECONDARY-ROOT",
+    "xml": "<set>\n<parameter name='tmp.aai.network-route-SECONDARY-ROOT.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
+    "comments": "",
+    "x": 4428.332763671875,
+    "y": 807.7666625976562,
+    "z": "4138d8f7.da252",
+    "wires": []
+  },
+  {
+    "id": "88877892.df83d8",
+    "type": "set",
+    "name": "set network-route-C",
+    "xml": "<set>\n<parameter name='tmp.aai.network-route-C.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
+    "comments": "",
+    "x": 4374.332763671875,
+    "y": 847.7666625976562,
+    "z": "4138d8f7.da252",
     "wires": []
+  },
+  {
+    "id": "f55201f.0be188",
+    "type": "save",
+    "name": "get network-route-three from aai",
+    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-route\"\n\tkey='network-route.route-id = $network-route-three'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-route-three\">",
+    "comments": "",
+    "outputs": 1,
+    "x": 3259.333251953125,
+    "y": 859.7666625976562,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "e0b52eb6.aea228",
+        "c2961466.a099a8",
+        "6a533bc.97a86c4"
+      ]
+    ]
+  },
+  {
+    "id": "e0b52eb6.aea228",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3501.333251953125,
+    "y": 852.7666625976562,
+    "z": "4138d8f7.da252",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "c2961466.a099a8",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3496.842315673828,
+    "y": 895.1927185058594,
+    "z": "4138d8f7.da252",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "6a533bc.97a86c4",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3500.84228515625,
+    "y": 943.1926879882812,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "83cc008.07d49"
+      ]
+    ]
+  },
+  {
+    "id": "83cc008.07d49",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 3662.333251953125,
+    "y": 883.7666625976562,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "2318951c.d8223a"
+      ]
+    ]
+  },
+  {
+    "id": "2318951c.d8223a",
+    "type": "switchNode",
+    "name": "switch nr type",
+    "xml": "<switch test='`$tmp.aai.network-route-three.type`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3833.333251953125,
+    "y": 883.766845703125,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "1ecaee8d.2e04b1",
+        "6f57dead.f93a98",
+        "743eca24.c93994"
+      ]
+    ]
+  },
+  {
+    "id": "1ecaee8d.2e04b1",
+    "type": "outcome",
+    "name": "ROOT",
+    "xml": "<outcome value='ROOT'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4000.3330078125,
+    "y": 793.7667846679688,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "ced307c.4c3f7f8"
+      ]
+    ]
+  },
+  {
+    "id": "6f57dead.f93a98",
+    "type": "outcome",
+    "name": "LEAF",
+    "xml": "<outcome value='LEAF'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4002.3330078125,
+    "y": 847.7667846679688,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "e2f995cd.e955"
+      ]
+    ]
+  },
+  {
+    "id": "ced307c.4c3f7f8",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 4128.3330078125,
+    "y": 793.7667846679688,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "36a6204d.62e268",
+        "94b8b644.43f75"
+      ]
+    ]
+  },
+  {
+    "id": "e2f995cd.e955",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 4131.3330078125,
+    "y": 846.7667846679688,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "7b0ab608.42ea9",
+        "a90ad8f1.fdc558"
+      ]
+    ]
+  },
+  {
+    "id": "94b8b644.43f75",
+    "type": "set",
+    "name": "set network-route-B",
+    "xml": "<set>\n<parameter name='tmp.aai.network-route-B.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
+    "comments": "",
+    "x": 4374.332763671875,
+    "y": 932.7667846679688,
+    "z": "4138d8f7.da252",
+    "wires": []
+  },
+  {
+    "id": "7b0ab608.42ea9",
+    "type": "set",
+    "name": "set network-route-LEAF",
+    "xml": "<set>\n<parameter name='tmp.aai.network-route-LEAF.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
+    "comments": "",
+    "x": 4391.332763671875,
+    "y": 974.7667846679688,
+    "z": "4138d8f7.da252",
+    "wires": []
+  },
+  {
+    "id": "a90ad8f1.fdc558",
+    "type": "set",
+    "name": "set network-route-A",
+    "xml": "<set>\n<parameter name='tmp.aai.network-route-A.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
+    "comments": "",
+    "x": 4376.332763671875,
+    "y": 1012.7667846679688,
+    "z": "4138d8f7.da252",
+    "wires": []
+  },
+  {
+    "id": "36a6204d.62e268",
+    "type": "set",
+    "name": "set network-route-ROOT",
+    "xml": "<set>\n<parameter name='tmp.aai.network-route-ROOT.' value=\"`$tmp.aai.network-route-two.`\" />\n\n\n",
+    "comments": "",
+    "x": 4388.332763671875,
+    "y": 892.7667846679688,
+    "z": "4138d8f7.da252",
+    "wires": []
+  },
+  {
+    "id": "467d675.a17d518",
+    "type": "comment",
+    "name": "This is it (should be)",
+    "info": "",
+    "comments": "",
+    "x": 4553.332763671875,
+    "y": 908.7667846679688,
+    "z": "4138d8f7.da252",
+    "wires": []
+  },
+  {
+    "id": "743eca24.c93994",
+    "type": "outcome",
+    "name": "SECONDARY-ROOT",
+    "xml": "<outcome value='SECONDARY-ROOT'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3941.333251953125,
+    "y": 938.7666015625,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "32cfa81c.1fdfe"
+      ]
+    ]
+  },
+  {
+    "id": "32cfa81c.1fdfe",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 4115.333251953125,
+    "y": 933.7666015625,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "7ba10fb0.49acb8",
+        "c1eb138a.5c454"
+      ]
+    ]
+  },
+  {
+    "id": "c1eb138a.5c454",
+    "type": "set",
+    "name": "set network-route-C",
+    "xml": "<set>\n<parameter name='tmp.aai.network-route-C.' value=\"`$tmp.aai.network-route-three.`\" />\n\n\n",
+    "comments": "",
+    "x": 4348.332763671875,
+    "y": 1102.7665405273438,
+    "z": "4138d8f7.da252",
+    "wires": []
+  },
+  {
+    "id": "7ba10fb0.49acb8",
+    "type": "set",
+    "name": "set network-route-SECONDARY-ROOT",
+    "xml": "<set>\n<parameter name='tmp.aai.network-route-SECONDARY-ROOT.' value=\"`$tmp.aai.network-route-three.`\" />\n\n\n",
+    "comments": "",
+    "x": 4402.332763671875,
+    "y": 1062.7665405273438,
+    "z": "4138d8f7.da252",
+    "wires": []
+  },
+  {
+    "id": "f3ed1968.f2e4c",
+    "type": "comment",
+    "name": "This is it (should be)",
+    "info": "",
+    "comments": "",
+    "x": 4516.332763671875,
+    "y": 1087.7665405273438,
+    "z": "4138d8f7.da252",
+    "wires": []
+  },
+  {
+    "id": "9301f497.efdba",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 3517,
+    "y": 2168,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "7448f46b.34e6cc",
+        "5277238e.78ec8c"
+      ]
+    ]
+  },
+  {
+    "id": "48753b32.6fce64",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3344.33349609375,
+    "y": 2169,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "9301f497.efdba"
+      ]
+    ]
+  },
+  {
+    "id": "7b2bdccd.4a3854",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3353.824462890625,
+    "y": 2211.5740356445312,
+    "z": "4138d8f7.da252",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "9a4a0275.086048",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3342.33349609375,
+    "y": 2258,
+    "z": "4138d8f7.da252",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "7448f46b.34e6cc",
+    "type": "execute",
+    "name": "execute split tp-id to get pnf-name",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-C.p-interface-dst.interface-name`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainC\"/>\n\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3803.33349609375,
+    "y": 2172.0001220703125,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "645217a3.91825",
+        "af1d3f52.b0745"
+      ]
+    ]
+  },
+  {
+    "id": "af1d3f52.b0745",
+    "type": "failure",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4026.33349609375,
+    "y": 2127.0001220703125,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "731452c3.85af84"
+      ]
+    ]
+  },
+  {
+    "id": "645217a3.91825",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4028.33349609375,
+    "y": 2191.0001220703125,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "6089c716.00dec8"
+      ]
+    ]
+  },
+  {
+    "id": "fa7f428c.6d6b2",
+    "type": "save",
+    "name": "get p-interface-dst from aai",
+    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"p-interface\"\n\t    key=\"pnf.pnf-name = $tmp.dst.domainC.pnf-name\n\t        AND p-interface.interface-name = $tmp.aai.network-route-C.next-hop\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.network-route-C.p-interface-dst\" >\n\n<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"p-interface\"-->\n<!--\t    key=\"pnf.pnf-name = $unique-src-node-Id-->\n<!--\t        and p-interface.interface-name = $tmp.aai.endpointA.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"-->\n<!--\t\tlocal-only=\"false\" -->\n<!--\t\tpfx=\"tmp.aai.endpointA.p-interface-src\" >-->\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3116.33349609375,
+    "y": 2204,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "48753b32.6fce64",
+        "7b2bdccd.4a3854",
+        "9a4a0275.086048"
+      ]
+    ]
+  },
+  {
+    "id": "c73afdde.7fd758",
+    "type": "comment",
+    "name": "Question?",
+    "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
+    "comments": "",
+    "x": 3077.33349609375,
+    "y": 2148,
+    "z": "4138d8f7.da252",
+    "wires": []
+  },
+  {
+    "id": "6834572.668ee28",
+    "type": "execute",
+    "name": "execute split tp-id to get pnf-name",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-C.next-hop`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainC-pnfName\"/>\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3136.33349609375,
+    "y": 1944,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "2bef51bc.6ca236",
+        "6cf1c76e.88753"
+      ]
+    ]
+  },
+  {
+    "id": "6cf1c76e.88753",
+    "type": "failure",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3359.33349609375,
+    "y": 1930,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "f6f8952c.2953"
+      ]
+    ]
+  },
+  {
+    "id": "2bef51bc.6ca236",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3361.33349609375,
+    "y": 1963,
+    "z": "4138d8f7.da252",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "f6f8952c.2953",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 3507.33349609375,
+    "y": 1923,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "f448bb3c.4541c8",
+        "dafe2b52.c4e9d"
+      ]
+    ]
+  },
+  {
+    "id": "f448bb3c.4541c8",
+    "type": "set",
+    "name": "set pnf-name",
+    "xml": "<set>\n<parameter name='tmp.dst.domainC.pnf-name' value=\"`$param-prefix-domainC-pnfName[0] + '-' +\n                                                   $param-prefix-domainC-pnfName[1] + '-' +\n                                                   $param-prefix-domainC-pnfName[2] + '-' +\n                                                   $param-prefix-domainC-pnfName[3] + '-' +\n                                                   $param-prefix-domainC-pnfName[4] + '-' +\n                                                   $param-prefix-domainC-pnfName[5] + '-' +\n                                                   $param-prefix-domainC-pnfName[6] + '-' +\n                                                   $param-prefix-domainC-pnfName[7] + '-' +\n                                                   $param-prefix-domainC-pnfName[8]`\" />\n",
+    "comments": "",
+    "x": 3701.33349609375,
+    "y": 1926.0001220703125,
+    "z": "4138d8f7.da252",
+    "wires": []
+  },
+  {
+    "id": "5277238e.78ec8c",
+    "type": "for",
+    "name": "for each relationship",
+    "xml": "<for silentFailure='true' index='dividx' start='0' end='`$tmp.aai.network-route-C.p-interface-dst.relationship-list.relationship_length`' >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3754.333465576172,
+    "y": 2294.999969482422,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "eb06fc3b.085ab"
+      ]
+    ]
+  },
+  {
+    "id": "eb06fc3b.085ab",
+    "type": "switchNode",
+    "name": "switch related-to",
+    "xml": "<switch test='`$tmp.aai.network-route-C.p-interface-dst.relationship-list.relationship[$dividx].related-to`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3960.333465576172,
+    "y": 2294.999969482422,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "a014a0c0.bb63d8"
+      ]
+    ]
+  },
+  {
+    "id": "dafe2b52.c4e9d",
+    "type": "get-resource",
+    "name": "get-resource src pnf",
+    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.dst.domainC.pnf-name\"\n        pfx='tmp.aai.destination-secondary-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3723.33349609375,
+    "y": 1994.0001220703125,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "a21fb44.41309c8",
+        "5685afe4.0b1f1",
+        "ea909548.33d5a"
+      ]
+    ]
+  },
+  {
+    "id": "a21fb44.41309c8",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3918.8336181640625,
+    "y": 1946.0001220703125,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "9cea62e1.55972"
+      ]
+    ]
+  },
+  {
+    "id": "5685afe4.0b1f1",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3910.8336181640625,
+    "y": 2001.0001220703125,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "89031999.da34c"
+      ]
+    ]
+  },
+  {
+    "id": "ea909548.33d5a",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3915.8336181640625,
+    "y": 2058.0001220703125,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "c3bf7f9d.8f5d8"
+      ]
+    ]
+  },
+  {
+    "id": "c3bf7f9d.8f5d8",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
+    "comments": "",
+    "x": 4067.8336181640625,
+    "y": 2059.0001220703125,
+    "z": "4138d8f7.da252",
+    "wires": []
+  },
+  {
+    "id": "9cea62e1.55972",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 4063.2159423828125,
+    "y": 1943.6557922363281,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "e8d406ab.082b08"
+      ]
+    ]
+  },
+  {
+    "id": "8c5d257.6a579d8",
+    "type": "set",
+    "name": "set SECONDARY-ROOT stuff",
+    "xml": "<set>\n<parameter name='tmp.SECONDARY-ROOT.pnf-name-long' value=\"`$param-prefix-domainC-pnfName[0] + '-' +\n                                                   $param-prefix-domainC-pnfName[1] + '-' +\n                                                   $param-prefix-domainC-pnfName[2] + '-' +\n                                                   $param-prefix-domainC-pnfName[3] + '-' +\n                                                   $param-prefix-domainC-pnfName[4] + '-' +\n                                                   $param-prefix-domainC-pnfName[5] + '-' +\n                                                   $param-prefix-domainC-pnfName[6] + '-' +\n                                                   $param-prefix-domainC-pnfName[7] + '-' +\n                                                   $param-prefix-domainC-pnfName[8]`\" />\n\n<!--<parameter name='tmp.ROOT.pnf-name-short' value=\"`$param-prefix-domainB-pnfName[8]`\" />-->\n<parameter name='tmp.SECONDARY-ROOT.pnf-name-short' value=\"`$tmp.dst-secondary.pnf-name`\" />\n\n<parameter name='tmp.SECONDARY-ROOT.uni-p-interface-long' value=\"`$tmp.aai.network-route-C.next-hop + '-' + $tmp.aai.network-route-C.logical-interface-id`\" />\n<parameter name='tmp.SECONDARY-ROOT.uni-tp-id' value=\"`$tmp.dst-secondary.ltpId`\" />\n",
+    "comments": "",
+    "x": 3139,
+    "y": 2283,
+    "z": "4138d8f7.da252",
+    "wires": []
+  },
+  {
+    "id": "5e59531e.4360fc",
+    "type": "comment",
+    "name": "NOT NEEDED ANYMORE?",
+    "info": "",
+    "comments": "",
+    "x": 3813.999969482422,
+    "y": 2246.999969482422,
+    "z": "4138d8f7.da252",
+    "wires": []
+  },
+  {
+    "id": "6089c716.00dec8",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
+    "comments": "",
+    "x": 4187.33349609375,
+    "y": 2210.0001220703125,
+    "z": "4138d8f7.da252",
+    "wires": []
+  },
+  {
+    "id": "731452c3.85af84",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 4191.33349609375,
+    "y": 2124.0001220703125,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "8743a739.8d80e8",
+        "538193e1.eab6f4"
+      ]
+    ]
+  },
+  {
+    "id": "a014a0c0.bb63d8",
+    "type": "outcome",
+    "name": "tunnel-termination-point",
+    "xml": "<outcome value='tunnel-termination-point'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4177.619110107422,
+    "y": 2293.821746826172,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "62c06921.59013"
+      ]
+    ]
+  },
+  {
+    "id": "89031999.da34c",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
+    "comments": "",
+    "x": 4078.8336181640625,
+    "y": 2004.0001220703125,
+    "z": "4138d8f7.da252",
+    "wires": []
+  },
+  {
+    "id": "8743a739.8d80e8",
+    "type": "set",
+    "name": "set ltpId",
+    "xml": "<set>\n<parameter name='tmp.dst-secondary.ltpId' value='`$param-prefix-domainC[$param-prefix-domainC_length -1]`' />\n",
+    "comments": "",
+    "x": 4361.33349609375,
+    "y": 2085.0001220703125,
+    "z": "4138d8f7.da252",
+    "wires": []
+  },
+  {
+    "id": "538193e1.eab6f4",
+    "type": "set",
+    "name": "set pnf-name",
+    "xml": "<set>\n<parameter name='tmp.dst-secondary.pnf-name' value='`$param-prefix-domainC[$param-prefix-domainC_length -3]`' />\n",
+    "comments": "",
+    "x": 4362.33349609375,
+    "y": 2190.0001220703125,
+    "z": "4138d8f7.da252",
+    "wires": []
+  },
+  {
+    "id": "a7a60345.c4fe3",
+    "type": "comment",
+    "name": "TODO: FIXME",
+    "info": "using the output of regex string arrays,\nconcatinate index 0 to index[length-2] all together\nin order to assemble the correct pnf-name",
+    "comments": "",
+    "x": 4357.33349609375,
+    "y": 2139.0001220703125,
+    "z": "4138d8f7.da252",
+    "wires": []
+  },
+  {
+    "id": "62c06921.59013",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 4384.450653076172,
+    "y": 2283.3404235839844,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "61f01ac9.4769c4",
+        "6f3f4bab.137934",
+        "b1be6cb6.4fb618"
+      ]
+    ]
+  },
+  {
+    "id": "61f01ac9.4769c4",
+    "type": "set",
+    "name": "set destination ttp-id",
+    "xml": "<set>\n<parameter name='tmp.destination-secondary.ttp-id' value=\"`$tmp.aai.network-route-C.p-interface-dst.relationship-list.relationship[$dividx].relationship-data[0].relationship-value`\" />\n",
+    "comments": "",
+    "x": 4599.450653076172,
+    "y": 2245.3404235839844,
+    "z": "4138d8f7.da252",
+    "wires": []
+  },
+  {
+    "id": "6f3f4bab.137934",
+    "type": "get-resource",
+    "name": "get-resource src TTP",
+    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"tunnel-termination-point\" \n\t\tkey=\"tunnel-termination-point.ttp-id = $tmp.destination-secondary.ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.destination-secondary-ttp' local-only='false' >\n\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4596.450653076172,
+    "y": 2284.3404235839844,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "2692e306.96b09c"
+      ]
+    ]
+  },
+  {
+    "id": "b1be6cb6.4fb618",
+    "type": "break",
+    "name": "break",
+    "xml": "<break>\n",
+    "comments": "",
+    "x": 4551.950653076172,
+    "y": 2326.3404235839844,
+    "z": "4138d8f7.da252",
+    "wires": []
+  },
+  {
+    "id": "50016039.86678",
+    "type": "outcome",
+    "name": "esr-thirdparty-sdnc",
+    "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4645.33349609375,
+    "y": 1962.0001220703125,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "19550590.021992"
+      ]
+    ]
+  },
+  {
+    "id": "e8d406ab.082b08",
+    "type": "for",
+    "name": "for each relationship",
+    "xml": "<for silentFailure='true' index='dpvidx' start='0' end='`$tmp.aai.destination-secondary-pnf.relationship-list.relationship_length`' >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4247.33349609375,
+    "y": 1958.0001220703125,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "6de4be31.1810b"
+      ]
+    ]
+  },
+  {
+    "id": "6de4be31.1810b",
+    "type": "switchNode",
+    "name": "switch related-to",
+    "xml": "<switch test='`$tmp.aai.destination-secondary-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4442.33349609375,
+    "y": 1958.0001220703125,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "50016039.86678",
+        "cba34b2.471f9b8"
+      ]
+    ]
+  },
+  {
+    "id": "cba34b2.471f9b8",
+    "type": "outcome",
+    "name": "network-resource",
+    "xml": "<outcome value='network-resource'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 4647.33349609375,
+    "y": 2035.0001220703125,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "af92238d.b3b23"
+      ]
+    ]
+  },
+  {
+    "id": "2692e306.96b09c",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4776.950653076172,
+    "y": 2283.3404235839844,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "b1246264.28f0f"
+      ]
+    ]
+  },
+  {
+    "id": "b1246264.28f0f",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 4934.950653076172,
+    "y": 2283.3404235839844,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "fd4ac373.f8f388"
+      ]
+    ]
+  },
+  {
+    "id": "fd4ac373.f8f388",
+    "type": "set",
+    "name": "set destination tunnel tp ip",
+    "xml": "<set>\n<parameter name='destination-secondary.tunnel-tp-id' value=\"`$tmp.aai.destination-secondary-ttp.tunnel-tp-id`\" />\n",
+    "comments": "",
+    "x": 5141.950653076172,
+    "y": 2283.3404235839844,
+    "z": "4138d8f7.da252",
+    "wires": []
+  },
+  {
+    "id": "19550590.021992",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 4822.33349609375,
+    "y": 1954.0001220703125,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "f2beac88.eedd2",
+        "e37f582f.5a4c9"
+      ]
+    ]
+  },
+  {
+    "id": "e37f582f.5a4c9",
+    "type": "execute",
+    "name": "get esr-thirdparty-sdnc",
+    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainC.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainC.esr-thirdparty-sdnc' local-only='false' >",
+    "comments": "",
+    "outputs": 1,
+    "x": 5030.33349609375,
+    "y": 1961.0001220703125,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "6a3803eb.9852cc",
+        "9a9acadd.82809",
+        "a1039497.bae268"
+      ]
+    ]
+  },
+  {
+    "id": "af92238d.b3b23",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 4824.33349609375,
+    "y": 2027.0001220703125,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "99f85b9c.2a8238"
+      ]
+    ]
+  },
+  {
+    "id": "f2beac88.eedd2",
+    "type": "set",
+    "name": "set esr-thirdparty-sdnc domainC id",
+    "xml": "<set>\n<parameter name='tmp.domainC.esr-thirdparty-id' value=\"`$tmp.aai.destination-secondary-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",
+    "comments": "",
+    "x": 5060.33349609375,
+    "y": 1909.0001220703125,
+    "z": "4138d8f7.da252",
+    "wires": []
+  },
+  {
+    "id": "99f85b9c.2a8238",
+    "type": "set",
+    "name": "set domainC ethernet layer network-id",
+    "xml": "<set>\n<parameter name='tmp.domainC.eth-network-id' value=\"`$tmp.aai.destination-secondary-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",
+    "comments": "",
+    "x": 5059.33349609375,
+    "y": 2151.0001220703125,
+    "z": "4138d8f7.da252",
+    "wires": []
+  },
+  {
+    "id": "6a3803eb.9852cc",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5240.33349609375,
+    "y": 1952.0001220703125,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "f25a9292.d1fb4"
+      ]
+    ]
+  },
+  {
+    "id": "9a9acadd.82809",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5232.33349609375,
+    "y": 2007.0001220703125,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "7db8b6f1.adecb8"
+      ]
+    ]
+  },
+  {
+    "id": "a1039497.bae268",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5237.33349609375,
+    "y": 2064.0001220703125,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "e3bf692a.f4e238"
+      ]
+    ]
+  },
+  {
+    "id": "e3bf692a.f4e238",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
+    "comments": "",
+    "x": 5389.33349609375,
+    "y": 2065.0001220703125,
+    "z": "4138d8f7.da252",
+    "wires": []
+  },
+  {
+    "id": "7db8b6f1.adecb8",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
+    "comments": "",
+    "x": 5400.33349609375,
+    "y": 2010.0001220703125,
+    "z": "4138d8f7.da252",
+    "wires": []
+  },
+  {
+    "id": "f25a9292.d1fb4",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 5384.7158203125,
+    "y": 1949.6557922363281,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "fbf54d7c.8184a"
+      ]
+    ]
+  },
+  {
+    "id": "fbf54d7c.8184a",
+    "type": "set",
+    "name": "set controller domainC data",
+    "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainC.url' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainC.user' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainC.password' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
+    "comments": "",
+    "x": 5599.33349609375,
+    "y": 1946.0001220703125,
+    "z": "4138d8f7.da252",
+    "wires": []
+  },
+  {
+    "id": "c067ce8c.82bd2",
+    "type": "comment",
+    "name": "Create SECONDARY-ROOT UNI",
+    "info": "",
+    "comments": "",
+    "x": 5628.83349609375,
+    "y": 2068.7666015625,
+    "z": "4138d8f7.da252",
+    "wires": []
+  },
+  {
+    "id": "858f96c1.79cbc",
+    "type": "switchNode",
+    "name": "switch $hasSecondary",
+    "xml": "<switch test='`$hasSecondary`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5600.9501953125,
+    "y": 2117.88330078125,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "8c0e0f7f.469198"
+      ]
+    ]
+  },
+  {
+    "id": "8c0e0f7f.469198",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5791.9501953125,
+    "y": 2121.88330078125,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "a3faa53c.d04c58"
+      ]
+    ]
+  },
+  {
+    "id": "a3faa53c.d04c58",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 5918.9501953125,
+    "y": 2120.88330078125,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "53f62ca7.7b47cc",
+        "582e0a2f.97b604"
+      ]
+    ]
+  },
+  {
+    "id": "582e0a2f.97b604",
+    "type": "save",
+    "name": "save SECONDARY-ROOT UNI in AAI",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.SECONDARY-ROOT.uni-p-interface-long`' />\n<parameter name='tp-id' value='`$tmp.SECONDARY-ROOT.uni-tp-id`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-C.logical-interface-id`' />\n<parameter name='type' value='secondary-root' />\n<parameter name='data-source' value='`$gfp`' />\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 6140.9501953125,
+    "y": 2009.88330078125,
+    "z": "4138d8f7.da252",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "53f62ca7.7b47cc",
+    "type": "switchNode",
+    "name": "switch 2-ROOTS in same domain?",
+    "xml": "<!-- This is to check the provider-id of ROOt and SECONDARY-ROOT-->\n<switch test='`$param-prefix-domainB[$param-prefix-domainB_length -9] == $param-prefix-domainC[$param-prefix-domainC_length -9]`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 6136.83349609375,
+    "y": 2068.7666015625,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "142e04ee.e3d34b",
+        "257ca4bf.8f052c"
+      ]
+    ]
+  },
+  {
+    "id": "142e04ee.e3d34b",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 6346.83349609375,
+    "y": 2045.7666015625,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "9407e67d.da2418"
+      ]
+    ]
+  },
+  {
+    "id": "9407e67d.da2418",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 6472.83349609375,
+    "y": 2045.7666015625,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "cd746c7.fc5cf1"
+      ]
+    ]
+  },
+  {
+    "id": "f87ebbbb.7e40d",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 6477.83349609375,
+    "y": 2094.7666015625,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "88ec87d6.84288",
+        "29cb92cc.e394be",
+        "74fc1523.42a1e4",
+        "f8b2efa2.8dbc38"
+      ]
+    ]
+  },
+  {
+    "id": "257ca4bf.8f052c",
+    "type": "outcomeTrue",
+    "name": "false",
+    "xml": "<outcome value='false'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 6351.83349609375,
+    "y": 2094.7666015625,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "f87ebbbb.7e40d"
+      ]
+    ]
+  },
+  {
+    "id": "cd746c7.fc5cf1",
+    "type": "save",
+    "name": "save connectivityB relationship to UNI-SECONDARY-ROOT, in AAI",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.SECONDARY-ROOT.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.SECONDARY-ROOT.uni-p-interface-long`\" />",
+    "comments": "",
+    "outputs": 1,
+    "x": 6800.83349609375,
+    "y": 2042.7666015625,
+    "z": "4138d8f7.da252",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "88ec87d6.84288",
+    "type": "execute",
+    "name": "execute UUID generator for connectivity domainC",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.connectivity-domainC-uuid\"/>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 6753.83349609375,
+    "y": 2133.7666015625,
+    "z": "4138d8f7.da252",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "29cb92cc.e394be",
+    "type": "save",
+    "name": "save connectivity resource in AAI",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainC-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainC-uuid`' />\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' -->\n<!--      key='connectivity.connectivity-id = $tmp.ROOT.uni-p-interface-long'>-->\n<!--<parameter name='connectivity-id' value='`$tmp.ROOT.uni-p-interface-long`' />-->\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -1]`' />\n<parameter name='cvlan' value='`$tmp.aai.network-route-C.logical-interface-id`' />\n<parameter name='color-aware' value='`$tmp.SECONDARY-ROOT.uni-p-interface-long`' />\n<parameter name='vpn-type' value='secondary-root' />\n\n\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<parameter name='cbs' value='`$prop.sotn.cbs`' />\n<parameter name='ebs' value='`$prop.sotn.ebs`' />\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n<!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 6701.83349609375,
+    "y": 2175.7666015625,
+    "z": "4138d8f7.da252",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "74fc1523.42a1e4",
+    "type": "save",
+    "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.connectivity-domainC-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.connectivity-domainC-uuid`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
+    "comments": "",
+    "outputs": 1,
+    "x": 6830.83349609375,
+    "y": 2217.7666015625,
+    "z": "4138d8f7.da252",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "fdca37c0.7ca06",
+    "type": "comment",
+    "name": "Create SECONDARY-ROOT connectivity",
+    "info": "",
+    "comments": "",
+    "x": 6716.83349609375,
+    "y": 2090.7666015625,
+    "z": "4138d8f7.da252",
+    "wires": []
+  },
+  {
+    "id": "f8b2efa2.8dbc38",
+    "type": "save",
+    "name": "save connectivityC relationship to UNI-SECONDARY-ROOT, in AAI",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $prop.connectivity-domainC-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.SECONDARY-ROOT.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.SECONDARY-ROOT.uni-p-interface-long`\" />",
+    "comments": "",
+    "outputs": 1,
+    "x": 6808.83349609375,
+    "y": 2265.7666015625,
+    "z": "4138d8f7.da252",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "1b0442b9.4b628d",
+    "type": "switchNode",
+    "name": "switch $hasSecondary",
+    "xml": "<switch test='`$hasSecondary`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 6372.83349609375,
+    "y": 2762.566650390625,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "12529b57.e28025"
+      ]
+    ]
+  },
+  {
+    "id": "12529b57.e28025",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 6564.83349609375,
+    "y": 2757.566650390625,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "78bbff94.82c65"
+      ]
+    ]
+  },
+  {
+    "id": "78bbff94.82c65",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 6693.83349609375,
+    "y": 2757.566650390625,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "c9dee4ca.bc2dc"
+      ]
+    ]
+  },
+  {
+    "id": "c9dee4ca.bc2dc",
+    "type": "save",
+    "name": "save middle-man-conn relationship to UNI-SECONDARY-ROOT, in AAI",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"uni\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/unis/uni/' + $tmp.SECONDARY-ROOT.uni-p-interface-long`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"uni.id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.SECONDARY-ROOT.uni-p-interface-long`\" />",
+    "comments": "",
+    "outputs": 1,
+    "x": 7025.83349609375,
+    "y": 2755.566650390625,
+    "z": "4138d8f7.da252",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "c1546bd.e66d418",
+    "type": "switchNode",
+    "name": "switch $hasSecondary",
+    "xml": "<switch test='`$hasSecondary`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5957.83349609375,
+    "y": 2974.566650390625,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "13b9a3fa.0e3ae4"
+      ]
+    ]
+  },
+  {
+    "id": "13b9a3fa.0e3ae4",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 6137.83349609375,
+    "y": 2973.566650390625,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "e57b12b2.74ef18"
+      ]
+    ]
+  },
+  {
+    "id": "e57b12b2.74ef18",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 6266.83349609375,
+    "y": 2973.566650390625,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "c79e7977.2b3cc8"
+      ]
+    ]
+  },
+  {
+    "id": "c79e7977.2b3cc8",
+    "type": "switchNode",
+    "name": "switch 2-ROOTS in same domain?",
+    "xml": "<!-- This is to check the provider-id of ROOt and SECONDARY-ROOT-->\n<switch test='`$param-prefix-domainB[$param-prefix-domainB_length -9] == $param-prefix-domainC[$param-prefix-domainC_length -9]`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 6484.716796875,
+    "y": 2972.449951171875,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "76ccfb33.2c6e3c"
+      ]
+    ]
+  },
+  {
+    "id": "76ccfb33.2c6e3c",
+    "type": "outcomeTrue",
+    "name": "false",
+    "xml": "<outcome value='false'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 6699.716796875,
+    "y": 2972.449951171875,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "f287a7b9.c4a8b"
+      ]
+    ]
+  },
+  {
+    "id": "f287a7b9.c4a8b",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 6831.716796875,
+    "y": 2972.449951171875,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "3f3acb0.03380b6"
+      ]
+    ]
+  },
+  {
+    "id": "3f3acb0.03380b6",
+    "type": "save",
+    "name": "save middle-man-conn relationship to connectivity-SECONDARY-ROOT, in AAI",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.connectivity-domainC-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.connectivity-domainC-uuid`\" />",
+    "comments": "",
+    "outputs": 1,
+    "x": 7195.83349609375,
+    "y": 2971.566650390625,
+    "z": "4138d8f7.da252",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "3c12d321.f6ab2c",
+    "type": "switchNode",
+    "name": "switch $hasSecondary",
+    "xml": "<switch test='`$hasSecondary`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4928.33251953125,
+    "y": 2622.13330078125,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "700dbefa.a5007"
+      ]
+    ]
+  },
+  {
+    "id": "700dbefa.a5007",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5108.33251953125,
+    "y": 2621.13330078125,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "c3579242.e478c8"
+      ]
+    ]
+  },
+  {
+    "id": "c3579242.e478c8",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 5237.33251953125,
+    "y": 2621.13330078125,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "69f846d5.9ccd18"
+      ]
+    ]
+  },
+  {
+    "id": "cdd1f45b.46fb58",
+    "type": "comment",
+    "name": "Update SECONDARY-ROOT UNI's bw",
+    "info": "",
+    "comments": "",
+    "x": 4973.33251953125,
+    "y": 2680.13330078125,
+    "z": "4138d8f7.da252",
+    "wires": []
+  },
+  {
+    "id": "69f846d5.9ccd18",
+    "type": "save",
+    "name": "get S-root uni from aai",
+    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.secondaryrootuni\" >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5003.33251953125,
+    "y": 2713.13330078125,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "622ffdb0.75cb54",
+        "c593ae10.f47a3",
+        "24e47d1.d702d82"
+      ]
+    ]
+  },
+  {
+    "id": "c593ae10.f47a3",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5184.823486328125,
+    "y": 2690.70751953125,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "439fba81.48a81c"
+      ]
+    ]
+  },
+  {
+    "id": "24e47d1.d702d82",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5173.33251953125,
+    "y": 2730.13330078125,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "e58b129f.993b8"
+      ]
+    ]
+  },
+  {
+    "id": "439fba81.48a81c",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
+    "comments": "",
+    "x": 5344.39501953125,
+    "y": 2688.9931640625,
+    "z": "4138d8f7.da252",
+    "wires": []
+  },
+  {
+    "id": "e58b129f.993b8",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+    "comments": "",
+    "x": 5334.33251953125,
+    "y": 2731.13330078125,
+    "z": "4138d8f7.da252",
+    "wires": []
+  },
+  {
+    "id": "622ffdb0.75cb54",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5178.33251953125,
+    "y": 2767.13330078125,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "ea27280d.d02bf8"
+      ]
+    ]
+  },
+  {
+    "id": "ea27280d.d02bf8",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 5336.33251953125,
+    "y": 2775.13330078125,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "5d2e8885.4f468",
+        "6cb98496.dc88f4"
+      ]
+    ]
+  },
+  {
+    "id": "5d2e8885.4f468",
+    "type": "set",
+    "name": "set new bw",
+    "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.secondaryrootuni.data-source + $gfp`' />\n",
+    "comments": "",
+    "x": 5497.33251953125,
+    "y": 2707.13330078125,
+    "z": "4138d8f7.da252",
+    "wires": []
+  },
+  {
+    "id": "6cb98496.dc88f4",
+    "type": "save",
+    "name": "update S-ROOT UNI in AAI",
+    "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.SECONDARY-ROOT.uni-p-interface-long`' />\n<parameter name='data-source' value='`$tmp.newbw`' />\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5539.33251953125,
+    "y": 2779.13330078125,
+    "z": "4138d8f7.da252",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "d39256ff.c99e4",
+    "type": "switchNode",
+    "name": "switch $hasSecondary",
+    "xml": "<switch test='`$hasSecondary`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5015.33251953125,
+    "y": 2980.13330078125,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "9b669929.a8064"
+      ]
+    ]
+  },
+  {
+    "id": "9b669929.a8064",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5195.33251953125,
+    "y": 2979.13330078125,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "479be729.dc0248"
+      ]
+    ]
+  },
+  {
+    "id": "479be729.dc0248",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 5324.33251953125,
+    "y": 2979.13330078125,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "96ab8e09.feb69"
+      ]
+    ]
+  },
+  {
+    "id": "89e60282.d93268",
+    "type": "comment",
+    "name": "Update SECONDARY-ROOT UNI's bw",
+    "info": "",
+    "comments": "",
+    "x": 5060.33251953125,
+    "y": 3038.13330078125,
+    "z": "4138d8f7.da252",
+    "wires": []
+  },
+  {
+    "id": "96ab8e09.feb69",
+    "type": "save",
+    "name": "get S-root uni from aai",
+    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.secondaryrootuni\" >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5090.33251953125,
+    "y": 3071.13330078125,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "d8822576.b3585",
+        "75b8d325.77424c",
+        "c70dc607.d25bf8"
+      ]
+    ]
+  },
+  {
+    "id": "75b8d325.77424c",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5271.823486328125,
+    "y": 3048.70751953125,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "1c3be14a.a5638f"
+      ]
+    ]
+  },
+  {
+    "id": "c70dc607.d25bf8",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5260.33251953125,
+    "y": 3088.13330078125,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "57a20811.9713c"
+      ]
+    ]
+  },
+  {
+    "id": "1c3be14a.a5638f",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
+    "comments": "",
+    "x": 5431.39501953125,
+    "y": 3046.9931640625,
+    "z": "4138d8f7.da252",
+    "wires": []
+  },
+  {
+    "id": "57a20811.9713c",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+    "comments": "",
+    "x": 5421.33251953125,
+    "y": 3089.13330078125,
+    "z": "4138d8f7.da252",
+    "wires": []
+  },
+  {
+    "id": "d8822576.b3585",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5265.33251953125,
+    "y": 3125.13330078125,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "89319d00.a640d8"
+      ]
+    ]
+  },
+  {
+    "id": "89319d00.a640d8",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 5423.33251953125,
+    "y": 3133.13330078125,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "f52ef279.5e2fa8",
+        "ebb57be1.fff538"
+      ]
+    ]
+  },
+  {
+    "id": "f52ef279.5e2fa8",
+    "type": "set",
+    "name": "set new bw",
+    "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.secondaryrootuni.data-source + $gfp`' />\n",
+    "comments": "",
+    "x": 5584.33251953125,
+    "y": 3065.13330078125,
+    "z": "4138d8f7.da252",
+    "wires": []
+  },
+  {
+    "id": "ebb57be1.fff538",
+    "type": "save",
+    "name": "update S-ROOT UNI in AAI",
+    "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.SECONDARY-ROOT.uni-p-interface-long`' />\n<parameter name='data-source' value='`$tmp.newbw`' />\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5626.33251953125,
+    "y": 3137.13330078125,
+    "z": "4138d8f7.da252",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "b27458da.77b73",
+    "type": "switchNode",
+    "name": "switch $hasSecondary",
+    "xml": "<switch test='`$hasSecondary`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3497,
+    "y": 4562.13330078125,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "b7009e9a.816708"
+      ]
+    ]
+  },
+  {
+    "id": "b7009e9a.816708",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3677,
+    "y": 4561.13330078125,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "75b6f667.ff2f48"
+      ]
+    ]
+  },
+  {
+    "id": "75b6f667.ff2f48",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 3806,
+    "y": 4561.13330078125,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "e0e9d687.026568"
+      ]
+    ]
+  },
+  {
+    "id": "93bf9820.efc6f",
+    "type": "comment",
+    "name": "Update SECONDARY-ROOT UNI's bw",
+    "info": "",
+    "comments": "",
+    "x": 3542,
+    "y": 4620.13330078125,
+    "z": "4138d8f7.da252",
+    "wires": []
+  },
+  {
+    "id": "e0e9d687.026568",
+    "type": "save",
+    "name": "get S-root uni from aai",
+    "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"uni\"\n\t    key=\"uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.secondaryrootuni\" >\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3572,
+    "y": 4653.13330078125,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "6dcb758c.68fb4c",
+        "79d68d78.6f5a44",
+        "5d2b0296.8c0914"
+      ]
+    ]
+  },
+  {
+    "id": "79d68d78.6f5a44",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3753.490966796875,
+    "y": 4630.70751953125,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "283870b5.b39d78"
+      ]
+    ]
+  },
+  {
+    "id": "5d2b0296.8c0914",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3742,
+    "y": 4670.13330078125,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "307bdbbc.e5590c"
+      ]
+    ]
+  },
+  {
+    "id": "283870b5.b39d78",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",
+    "comments": "",
+    "x": 3913.0625,
+    "y": 4628.9931640625,
+    "z": "4138d8f7.da252",
+    "wires": []
+  },
+  {
+    "id": "307bdbbc.e5590c",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+    "comments": "",
+    "x": 3903,
+    "y": 4671.13330078125,
+    "z": "4138d8f7.da252",
+    "wires": []
+  },
+  {
+    "id": "6dcb758c.68fb4c",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3747,
+    "y": 4707.13330078125,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "22012b3c.a0e674"
+      ]
+    ]
+  },
+  {
+    "id": "22012b3c.a0e674",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 3905,
+    "y": 4715.13330078125,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "7783af35.773e7",
+        "e7eec98c.ca59"
+      ]
+    ]
+  },
+  {
+    "id": "7783af35.773e7",
+    "type": "set",
+    "name": "set new bw",
+    "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.secondaryrootuni.data-source + $gfp`' />\n",
+    "comments": "",
+    "x": 4066,
+    "y": 4647.13330078125,
+    "z": "4138d8f7.da252",
+    "wires": []
+  },
+  {
+    "id": "e7eec98c.ca59",
+    "type": "save",
+    "name": "update S-ROOT UNI in AAI",
+    "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long'>\n<parameter name='id' value='`$tmp.SECONDARY-ROOT.uni-p-interface-long`' />\n<parameter name='data-source' value='`$tmp.newbw`' />\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4108,
+    "y": 4719.13330078125,
+    "z": "4138d8f7.da252",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "e87132f3.ee29c",
+    "type": "comment",
+    "name": "populate connectivity-C variable in the context map",
+    "info": "",
+    "comments": "",
+    "x": 4188.6669921875,
+    "y": 5517.13330078125,
+    "z": "4138d8f7.da252",
+    "wires": []
+  },
+  {
+    "id": "cb7342b9.a9c168",
+    "type": "call",
+    "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn",
+    "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn' mode='sync' >\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4343.6669921875,
+    "y": 5558.13330078125,
+    "z": "4138d8f7.da252",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "7a7c44d8.30aa44",
+    "type": "switchNode",
+    "name": "switch found-secondary-root-connectivity",
+    "xml": "\n<switch test=\"`$found-secondary-root-connectivity`\">\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4159.6669921875,
+    "y": 5616.13330078125,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "8bec5884.15258",
+        "bb24a1ac.622598"
+      ]
+    ]
+  },
+  {
+    "id": "8bec5884.15258",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4395.6669921875,
+    "y": 5600.13330078125,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "6d098a3a.3afd8c"
+      ]
+    ]
+  },
+  {
+    "id": "bb24a1ac.622598",
+    "type": "outcomeFalse",
+    "name": "false",
+    "xml": "<outcome value='false'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4394.6669921875,
+    "y": 5648.13330078125,
+    "z": "4138d8f7.da252",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "6d098a3a.3afd8c",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic='true'>",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 4539.6669921875,
+    "y": 5602.13330078125,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "de9129b3.62ee98",
+        "95ed5b5c.afa778",
+        "140ab45c.08ae54"
+      ]
+    ]
+  },
+  {
+    "id": "de9129b3.62ee98",
+    "type": "set",
+    "name": "set prop.connectivity-domainC-uuid",
+    "xml": "<set>\n<!--<parameter name='prop.connectivity-domainB-uuid' value=\"`$tmp.ROOT.uni-p-interface-long`\" />-->\n<!--OR-->\n<parameter name='prop.connectivity-domainC-uuid' value=\"`$tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`\" />\n\n\n",
+    "comments": "",
+    "x": 4951.667236328125,
+    "y": 5737.13330078125,
+    "z": "4138d8f7.da252",
+    "wires": []
+  },
+  {
+    "id": "95ed5b5c.afa778",
+    "type": "save",
+    "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
+    "comments": "",
+    "outputs": 1,
+    "x": 5072.667236328125,
+    "y": 5784.13330078125,
+    "z": "4138d8f7.da252",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "bc8a01e6.d0596",
+    "type": "comment",
+    "name": "Update connectivity status to modified",
+    "info": "",
+    "comments": "",
+    "x": 4955.551025390625,
+    "y": 5828.0166015625,
+    "z": "4138d8f7.da252",
+    "wires": []
+  },
+  {
+    "id": "140ab45c.08ae54",
+    "type": "save",
+    "name": "update connectivity resource in AAI",
+    "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainC-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainC-uuid`' />\n<parameter name='operational-status' value='Modified' />\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4954.334228515625,
+    "y": 5869.216796875,
+    "z": "4138d8f7.da252",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "4e2e6b5c.090cf4",
+    "type": "comment",
+    "name": "populate connectivity-C variable in the context map",
+    "info": "",
+    "comments": "",
+    "x": 4815,
+    "y": 6123.13330078125,
+    "z": "4138d8f7.da252",
+    "wires": []
+  },
+  {
+    "id": "8afd899a.01e88",
+    "type": "call",
+    "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn",
+    "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn' mode='sync' >\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4981,
+    "y": 6162.13330078125,
+    "z": "4138d8f7.da252",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "8c1f115c.700108",
+    "type": "switchNode",
+    "name": "switch found-secondary-root-connectivity",
+    "xml": "\n<switch test=\"`$found-secondary-root-connectivity`\">\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4820,
+    "y": 6212.13330078125,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "53961644.a48598",
+        "58a624c5.6a1504"
+      ]
+    ]
+  },
+  {
+    "id": "53961644.a48598",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5053,
+    "y": 6206.13330078125,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "1edcc228.5234b6"
+      ]
+    ]
+  },
+  {
+    "id": "58a624c5.6a1504",
+    "type": "outcomeFalse",
+    "name": "false",
+    "xml": "<outcome value='false'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5054,
+    "y": 6256.13330078125,
+    "z": "4138d8f7.da252",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "1edcc228.5234b6",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic='true'>",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 5200,
+    "y": 6214.13330078125,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "a2cd952f.42f1c8",
+        "75bd12d0.4fb564",
+        "ddd98790.fa90d"
+      ]
+    ]
+  },
+  {
+    "id": "a2cd952f.42f1c8",
+    "type": "set",
+    "name": "set prop.connectivity-domainC-uuid",
+    "xml": "<set>\n<!--<parameter name='prop.connectivity-domainB-uuid' value=\"`$tmp.ROOT.uni-p-interface-long`\" />-->\n<!--OR-->\n<parameter name='prop.connectivity-domainC-uuid' value=\"`$tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`\" />\n\n\n",
+    "comments": "",
+    "x": 5447,
+    "y": 6202.13330078125,
+    "z": "4138d8f7.da252",
+    "wires": []
+  },
+  {
+    "id": "75bd12d0.4fb564",
+    "type": "save",
+    "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
+    "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
+    "comments": "",
+    "outputs": 1,
+    "x": 5568,
+    "y": 6249.13330078125,
+    "z": "4138d8f7.da252",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "6c605ae5.2dde2c",
+    "type": "comment",
+    "name": "Update connectivity status to modified",
+    "info": "",
+    "comments": "",
+    "x": 5450.8837890625,
+    "y": 6293.0166015625,
+    "z": "4138d8f7.da252",
+    "wires": []
+  },
+  {
+    "id": "ddd98790.fa90d",
+    "type": "save",
+    "name": "update connectivity resource in AAI",
+    "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainC-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainC-uuid`' />\n<parameter name='operational-status' value='Modified' />\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5449.6669921875,
+    "y": 6334.216796875,
+    "z": "4138d8f7.da252",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "e4c8e98f.2e48b8",
+    "type": "call",
+    "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-F1-activate",
+    "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-F1-activate' mode='sync' >\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3577,
+    "y": 6107.56689453125,
+    "z": "4138d8f7.da252",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "5e06fc8.b063184",
+    "type": "switchNode",
+    "name": "switch $hasSecondary",
+    "xml": "<switch test='`$hasSecondary`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2914.25,
+    "y": 6105.81689453125,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "5aaa3311.116ad4",
+        "5f201884.9bf1b"
+      ]
+    ]
+  },
+  {
+    "id": "5aaa3311.116ad4",
+    "type": "outcomeTrue",
+    "name": "false",
+    "xml": "<outcome value='false'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3105.25,
+    "y": 6109.81689453125,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "42b72649.a2611"
+      ]
+    ]
+  },
+  {
+    "id": "42b72649.a2611",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 3232.25,
+    "y": 6108.81689453125,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "e4c8e98f.2e48b8"
+      ]
+    ]
+  },
+  {
+    "id": "5f201884.9bf1b",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3101.25,
+    "y": 6179.81689453125,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "1e510c07.00530c"
+      ]
+    ]
+  },
+  {
+    "id": "382dddaf.06eaa2",
+    "type": "call",
+    "name": "call GENERIC-RESOURCE-API:cll-vnf-topology-operation-cll-F1-activate-w-Protection",
+    "xml": "<call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-F1-activate-w-Protection' mode='sync' >\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3650.75,
+    "y": 6178.900390625,
+    "z": "4138d8f7.da252",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "1e510c07.00530c",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 3234.75,
+    "y": 6181.900390625,
+    "z": "4138d8f7.da252",
+    "wires": [
+      [
+        "382dddaf.06eaa2"
+      ]
+    ]
   }
 ]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof.json b/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof.json
index 6ccf7ae2..efad7883 100644
--- a/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof.json
+++ b/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "4bc4e8ab.1cf33",
+        "id": "58e34c1c.fa2ef4",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 93,
-        "y": 85,
-        "z": "6311a927.78727",
+        "x": 169,
+        "y": 87,
+        "z": "740154b1.db9c44",
         "wires": [
             [
-                "7e764ef5.0f0ce8"
+                "7debdd32.eca72c"
             ]
         ]
     },
     {
-        "id": "7e764ef5.0f0ce8",
+        "id": "7debdd32.eca72c",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,1912 +22,3806 @@
         "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": 240,
-        "y": 660.0000152587891,
-        "z": "6311a927.78727",
+        "x": 316,
+        "y": 662.0000152587891,
+        "z": "740154b1.db9c44",
         "wires": [
             [
-                "dba1761d.84c318"
+                "17937dc9.2355da"
             ]
         ]
     },
     {
-        "id": "dba1761d.84c318",
+        "id": "17937dc9.2355da",
         "type": "method",
         "name": "tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof",
         "xml": "<method rpc='tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 304.0001220703125,
-        "y": 753,
-        "z": "6311a927.78727",
+        "x": 380.0001220703125,
+        "y": 755,
+        "z": "740154b1.db9c44",
         "wires": [
             [
-                "45853653.2d7d8"
+                "3e6ce739.eeb648"
             ]
         ]
     },
     {
-        "id": "29b9ed96.3b1cca",
+        "id": "d05eda9f.63c82",
         "type": "execute",
         "name": "execute RestApiCallNode getPath from OOF",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.oof-getpath.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url + '?ethsrvType=' + $prop.ethsrvType`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.oof.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.oof.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 349.9730682373047,
-        "y": 271.996000289917,
-        "z": "6311a927.78727",
+        "x": 425.9730682373047,
+        "y": 273.996000289917,
+        "z": "740154b1.db9c44",
         "wires": [
             [
-                "5ed3456b.75dffc",
-                "d4b7459.be16038"
+                "d4681312.af0c78",
+                "83728f7.d5447f"
             ]
         ]
     },
     {
-        "id": "5ed3456b.75dffc",
+        "id": "d4681312.af0c78",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 589.9732093811035,
-        "y": 295.99596977233887,
-        "z": "6311a927.78727",
+        "x": 665.9732093811035,
+        "y": 297.99596977233887,
+        "z": "740154b1.db9c44",
         "wires": [
             [
-                "c8e36f8b.a2bbd8"
+                "b7d4d2f2.ad66"
             ]
         ]
     },
     {
-        "id": "e29f4917.f911e8",
+        "id": "54760f3b.4160e8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing OOF api\" />\n",
         "comments": "",
-        "x": 759.9731292724609,
-        "y": 235.99606132507324,
-        "z": "6311a927.78727",
+        "x": 835.9731292724609,
+        "y": 237.99606132507324,
+        "z": "740154b1.db9c44",
         "wires": []
     },
     {
-        "id": "d4b7459.be16038",
+        "id": "83728f7.d5447f",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 588.9729957580566,
-        "y": 244.99606037139893,
-        "z": "6311a927.78727",
+        "x": 664.9729957580566,
+        "y": 246.99606037139893,
+        "z": "740154b1.db9c44",
         "wires": [
             [
-                "e29f4917.f911e8"
+                "54760f3b.4160e8"
             ]
         ]
     },
     {
-        "id": "a76b8924.9422c",
+        "id": "2a1c3926.ccf68e",
         "type": "comment",
         "name": "OTN tunnel path computation",
         "info": "TODO: check input parameters -- they should be\nthe source and destination of ETH node+tp.",
         "comments": "",
-        "x": 321.47686767578125,
-        "y": 228,
-        "z": "6311a927.78727",
+        "x": 397.47686767578125,
+        "y": 230,
+        "z": "740154b1.db9c44",
         "wires": []
     },
     {
-        "id": "485028.3d8fcfd8",
+        "id": "b642d1e9.ee8bf8",
         "type": "for",
         "name": "for vidx..otn-oof.solutions_length[]",
         "xml": "<for index='vidx' start='0' end='`$otn-oof.solutions_length`' >",
         "comments": "",
         "outputs": 1,
-        "x": 777.972900390625,
-        "y": 721.2457275390625,
-        "z": "6311a927.78727",
+        "x": 853.972900390625,
+        "y": 723.2457275390625,
+        "z": "740154b1.db9c44",
         "wires": [
             [
-                "b7d2be7c.5e3ac8"
+                "782120ce.0449f"
             ]
         ]
     },
     {
-        "id": "c4646d25.9ab0f",
+        "id": "1e8a6121.3ebf8f",
         "type": "comment",
         "name": "Loop through OTN links",
         "info": "",
         "comments": "",
-        "x": 861.4732055664062,
-        "y": 800.74609375,
-        "z": "6311a927.78727",
+        "x": 937.4732055664062,
+        "y": 802.74609375,
+        "z": "740154b1.db9c44",
         "wires": []
     },
     {
-        "id": "b7d2be7c.5e3ac8",
+        "id": "782120ce.0449f",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 882.5001220703125,
-        "y": 912.2864990234375,
-        "z": "6311a927.78727",
+        "x": 958.5001220703125,
+        "y": 914.2864990234375,
+        "z": "740154b1.db9c44",
         "wires": [
             [
-                "6750495a.41286",
-                "abe518b.cefde68",
-                "165db6ae.de2bb9",
-                "fda3acff.66dac8",
-                "188880e9.f084a7"
+                "c89cb66b.dc0d2",
+                "154e7688.b29339",
+                "4f1a8be1.b37344",
+                "2cdce288.c30c46",
+                "287cbb25.9abd94"
             ]
         ]
     },
     {
-        "id": "6750495a.41286",
+        "id": "c89cb66b.dc0d2",
         "type": "set",
         "name": "set otn-oof.link-name and etc.",
         "xml": "<set>\n<parameter name='otn-oof.link-name' value='`$otn-oof.solutions[$vidx].original_link`' />\n<parameter name='otn-oof.start-node' value='`$otn-oof.solutions[$vidx].src_node`' />\n<parameter name='otn-oof.end-node' value='`$otn-oof.solutions[$vidx].dst_node`' />",
         "comments": "",
-        "x": 1129.0001220703125,
-        "y": 805.2864990234375,
-        "z": "6311a927.78727",
+        "x": 1205.0001220703125,
+        "y": 807.2864990234375,
+        "z": "740154b1.db9c44",
         "wires": []
     },
     {
-        "id": "c8e36f8b.a2bbd8",
+        "id": "b7d4d2f2.ad66",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 735.0002555847168,
-        "y": 293.741455078125,
-        "z": "6311a927.78727",
+        "x": 811.0002555847168,
+        "y": 295.741455078125,
+        "z": "740154b1.db9c44",
         "wires": [
             []
         ]
     },
     {
-        "id": "45853653.2d7d8",
+        "id": "3e6ce739.eeb648",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 544.9688835144043,
-        "y": 679.7416372299194,
-        "z": "6311a927.78727",
+        "x": 620.9688835144043,
+        "y": 681.7416372299194,
+        "z": "740154b1.db9c44",
         "wires": [
             [
-                "485028.3d8fcfd8",
-                "7882cf69.81bba",
-                "f346bebe.50149"
+                "b642d1e9.ee8bf8",
+                "d800f8fa.097b28",
+                "3eb232d2.31d3ce",
+                "7d4b4351.930cbc"
             ]
         ]
     },
     {
-        "id": "9f64f3d6.06a948",
+        "id": "b9e5ba4.2ed1f48",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 2296.4998779296875,
-        "y": 1238,
-        "z": "6311a927.78727",
+        "x": 2372.4998779296875,
+        "y": 1240,
+        "z": "740154b1.db9c44",
         "wires": []
     },
     {
-        "id": "188880e9.f084a7",
+        "id": "287cbb25.9abd94",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1095.5001220703125,
-        "y": 994,
-        "z": "6311a927.78727",
+        "x": 1171.5001220703125,
+        "y": 996,
+        "z": "740154b1.db9c44",
         "wires": [
             [
-                "d9b8b0f0.11df08",
-                "16b2f778.e973e1"
+                "55e25897.4f1fe8",
+                "1809a4d6.ba2673"
             ]
         ]
     },
     {
-        "id": "6f8fa296.cf0b14",
+        "id": "ed734d7c.04c2f8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2620.9998779296875,
-        "y": 729,
-        "z": "6311a927.78727",
+        "x": 2696.9998779296875,
+        "y": 731,
+        "z": "740154b1.db9c44",
         "wires": [
             [
-                "53738595.29239c"
+                "d4861d1.90a2f6"
             ]
         ]
     },
     {
-        "id": "dfb73ef2.d6e5",
+        "id": "551be9a2.28b98",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2654,
-        "y": 787,
-        "z": "6311a927.78727",
+        "x": 2730,
+        "y": 789,
+        "z": "740154b1.db9c44",
         "wires": [
             [
-                "3b0779f0.32a56e"
+                "bc9d63b9.95524"
             ]
         ]
     },
     {
-        "id": "a2313ee1.1bd3f8",
+        "id": "22092f51.833d9",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2657,
-        "y": 839,
-        "z": "6311a927.78727",
+        "x": 2733,
+        "y": 841,
+        "z": "740154b1.db9c44",
         "wires": [
             [
-                "28c1fd94.c84d7a"
+                "757b2f22.e7f98"
             ]
         ]
     },
     {
-        "id": "3b0779f0.32a56e",
+        "id": "bc9d63b9.95524",
         "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": 2839,
-        "y": 791,
-        "z": "6311a927.78727",
+        "x": 2915,
+        "y": 793,
+        "z": "740154b1.db9c44",
         "wires": []
     },
     {
-        "id": "28c1fd94.c84d7a",
+        "id": "757b2f22.e7f98",
         "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": 2827,
-        "y": 842,
-        "z": "6311a927.78727",
+        "x": 2903,
+        "y": 844,
+        "z": "740154b1.db9c44",
         "wires": []
     },
     {
-        "id": "e56a35d6.459af8",
+        "id": "1391535e.6e46bd",
         "type": "set",
         "name": "set domain A node ttp-id",
         "xml": "<set>\n<parameter name='tmp.domain-A.ttp-id' value=\"`$tmp.aai.src-tp.relationship-list.relationship[$pintsidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 3957.4998779296875,
-        "y": 644,
-        "z": "6311a927.78727",
+        "x": 4033.4998779296875,
+        "y": 646,
+        "z": "740154b1.db9c44",
         "wires": []
     },
     {
-        "id": "a811b593.25ff8",
+        "id": "2d1abf42.aacfc8",
         "type": "get-resource",
         "name": "get-resource src TTP",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"tunnel-termination-point\" \n\t\tkey=\"tunnel-termination-point.ttp-id = $tmp.domain-A.ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.src-ttp' local-only='false' >\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 3965.4998779296875,
-        "y": 696,
-        "z": "6311a927.78727",
+        "x": 4041.4998779296875,
+        "y": 698,
+        "z": "740154b1.db9c44",
         "wires": [
             [
-                "d6328bc3.e91228"
+                "492ab725.abc14"
             ]
         ]
     },
     {
-        "id": "d6328bc3.e91228",
+        "id": "492ab725.abc14",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4171.9998779296875,
-        "y": 674,
-        "z": "6311a927.78727",
+        "x": 4247.9998779296875,
+        "y": 676,
+        "z": "740154b1.db9c44",
         "wires": [
             [
-                "fcc7de43.1b588"
+                "ca00a5f6.d5b71"
             ]
         ]
     },
     {
-        "id": "f5150efc.cab85",
+        "id": "fe7961d1.c0f4e",
         "type": "outcome",
         "name": "tunnel-termination-point",
         "xml": "<outcome value='tunnel-termination-point'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3509.6683349609375,
-        "y": 722.4815063476562,
-        "z": "6311a927.78727",
+        "x": 3585.6683349609375,
+        "y": 724.4815063476562,
+        "z": "740154b1.db9c44",
         "wires": [
             [
-                "912955c2.11e7a"
+                "59e37319.f4bec4"
             ]
         ]
     },
     {
-        "id": "fd862c08.f8b4a",
+        "id": "20453efe.bca822",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='pintsidx' start='0' end='`$tmp.aai.src-tp.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2972.3826904296875,
-        "y": 724.6597290039062,
-        "z": "6311a927.78727",
+        "x": 3048.3826904296875,
+        "y": 726.6597290039062,
+        "z": "740154b1.db9c44",
         "wires": [
             [
-                "8c595bd0.378e98"
+                "f844ac94.89e1e"
             ]
         ]
     },
     {
-        "id": "8c595bd0.378e98",
+        "id": "f844ac94.89e1e",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.src-tp.relationship-list.relationship[$pintsidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3224.3826904296875,
-        "y": 721.6597290039062,
-        "z": "6311a927.78727",
+        "x": 3300.3826904296875,
+        "y": 723.6597290039062,
+        "z": "740154b1.db9c44",
         "wires": [
             [
-                "f5150efc.cab85"
+                "fe7961d1.c0f4e"
             ]
         ]
     },
     {
-        "id": "912955c2.11e7a",
+        "id": "59e37319.f4bec4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3736.4998779296875,
-        "y": 711,
-        "z": "6311a927.78727",
+        "x": 3812.4998779296875,
+        "y": 713,
+        "z": "740154b1.db9c44",
         "wires": [
             [
-                "e56a35d6.459af8",
-                "a811b593.25ff8",
-                "2abf934.785ecec",
-                "bc51fa32.9144b",
-                "4ad035fb.c384cc"
+                "1391535e.6e46bd",
+                "2d1abf42.aacfc8",
+                "d4f97b75.15b158",
+                "12165a81.403f85",
+                "103b5c34.d77a7c"
             ]
         ]
     },
     {
-        "id": "d9b8b0f0.11df08",
+        "id": "55e25897.4f1fe8",
         "type": "get-resource",
         "name": "get-resource dst tp",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"p-interface\" \n\t\tkey=\"pnf.pnf-name = $tmp.dst-pnf-name\n\t\t    AND p-interface.interface-name = $tmp.cross-link.dst-ltpId\"\n        pfx='tmp.aai.dst-tp' local-only='false' >\n    \n        <!--AND depth = '0'\"-->\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2377.5,
-        "y": 1134,
-        "z": "6311a927.78727",
+        "x": 2453.5,
+        "y": 1136,
+        "z": "740154b1.db9c44",
         "wires": [
             [
-                "2a761980.732196",
-                "d9fef4c9.0420c",
-                "6bc11e9d.31baa8"
+                "49c1a7b6.6f99c",
+                "2b24743b.25895c",
+                "c683e8fa.16a0b"
             ]
         ]
     },
     {
-        "id": "2a761980.732196",
+        "id": "49c1a7b6.6f99c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2599.9998779296875,
-        "y": 1276,
-        "z": "6311a927.78727",
+        "x": 2675.9998779296875,
+        "y": 1278,
+        "z": "740154b1.db9c44",
         "wires": [
             [
-                "6a724ed4.0c2ee"
+                "ed45880a.b1c94"
             ]
         ]
     },
     {
-        "id": "d9fef4c9.0420c",
+        "id": "2b24743b.25895c",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2583.9998779296875,
-        "y": 1327,
-        "z": "6311a927.78727",
+        "x": 2659.9998779296875,
+        "y": 1329,
+        "z": "740154b1.db9c44",
         "wires": [
             [
-                "5b682716.7565c"
+                "37c7eeb2.67c862"
             ]
         ]
     },
     {
-        "id": "6bc11e9d.31baa8",
+        "id": "c683e8fa.16a0b",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2586.9998779296875,
-        "y": 1379,
-        "z": "6311a927.78727",
+        "x": 2662.9998779296875,
+        "y": 1381,
+        "z": "740154b1.db9c44",
         "wires": [
             [
-                "f53f8dec.b8eab8"
+                "78affe58.b6f08"
             ]
         ]
     },
     {
-        "id": "f53f8dec.b8eab8",
+        "id": "78affe58.b6f08",
         "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": 2756.9998779296875,
-        "y": 1382,
-        "z": "6311a927.78727",
+        "x": 2832.9998779296875,
+        "y": 1384,
+        "z": "740154b1.db9c44",
         "wires": []
     },
     {
-        "id": "5b682716.7565c",
+        "id": "37c7eeb2.67c862",
         "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": 2768.9998779296875,
-        "y": 1331,
-        "z": "6311a927.78727",
+        "x": 2844.9998779296875,
+        "y": 1333,
+        "z": "740154b1.db9c44",
         "wires": []
     },
     {
-        "id": "6b5c01f3.fe6da8",
+        "id": "141988e8.b25ef7",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='pintdidx' start='0' end='`$tmp.aai.dst-tp.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2956.3826904296875,
-        "y": 1286.6597290039062,
-        "z": "6311a927.78727",
+        "x": 3032.3826904296875,
+        "y": 1288.6597290039062,
+        "z": "740154b1.db9c44",
         "wires": [
             [
-                "1a571bfc.aeed5c"
+                "a370922d.726108"
             ]
         ]
     },
     {
-        "id": "1a571bfc.aeed5c",
+        "id": "a370922d.726108",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.dst-tp.relationship-list.relationship[$pintdidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3199.3826904296875,
-        "y": 1285.6597290039062,
-        "z": "6311a927.78727",
+        "x": 3275.3826904296875,
+        "y": 1287.6597290039062,
+        "z": "740154b1.db9c44",
         "wires": [
             [
-                "90623cd4.fe0a58"
+                "e6beb03b.67e37"
             ]
         ]
     },
     {
-        "id": "aa0b1701.8dfea",
+        "id": "61d27ccc.5b8de4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4965.4998779296875,
-        "y": 1087,
-        "z": "6311a927.78727",
+        "x": 5041.4998779296875,
+        "y": 1089,
+        "z": "740154b1.db9c44",
         "wires": [
             [
-                "550b57d7.8fa528",
-                "74f2c02.a79f64",
-                "f2bb305d.4422b8"
+                "6cde7588.a972a4",
+                "46f2ef05.7f74e8",
+                "36e1e931.d36586"
             ]
         ]
     },
     {
-        "id": "90623cd4.fe0a58",
+        "id": "e6beb03b.67e37",
         "type": "outcome",
         "name": "tunnel-termination-point",
         "xml": "<outcome value='tunnel-termination-point'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3455.6683349609375,
-        "y": 1285.4815063476562,
-        "z": "6311a927.78727",
+        "x": 3531.6683349609375,
+        "y": 1287.4815063476562,
+        "z": "740154b1.db9c44",
         "wires": [
             [
-                "2cff3582.3d605a"
+                "412a94c.16241ec"
             ]
         ]
     },
     {
-        "id": "66c4a517.3f3fd4",
+        "id": "df39947.2e32868",
         "type": "outcome",
         "name": "network-resource",
         "xml": "<outcome value='network-resource'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4752.4998779296875,
-        "y": 1086,
-        "z": "6311a927.78727",
+        "x": 4828.4998779296875,
+        "y": 1088,
+        "z": "740154b1.db9c44",
         "wires": [
             [
-                "aa0b1701.8dfea"
+                "61d27ccc.5b8de4"
             ]
         ]
     },
     {
-        "id": "2cff3582.3d605a",
+        "id": "412a94c.16241ec",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3755.4998779296875,
-        "y": 1283,
-        "z": "6311a927.78727",
+        "x": 3831.4998779296875,
+        "y": 1285,
+        "z": "740154b1.db9c44",
         "wires": [
             [
-                "34a1c052.ba37a8",
-                "ce64c552.7245c",
-                "3a5f117c.72df06",
-                "668e003.0972e8",
-                "888129ab.9ea2a8"
+                "58c1eb2d.4365dc",
+                "eafee68f.21777",
+                "3baf326d.94389e",
+                "7894f836.65f328",
+                "9b949993.6af3e"
             ]
         ]
     },
     {
-        "id": "34a1c052.ba37a8",
+        "id": "58c1eb2d.4365dc",
         "type": "set",
         "name": "set domain B node ttp-id",
         "xml": "<set>\n<parameter name='tmp.domain-B.ttp-id' value=\"`$tmp.aai.dst-tp.relationship-list.relationship[$pintdidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 3997.4998779296875,
-        "y": 1237,
-        "z": "6311a927.78727",
+        "x": 4073.4998779296875,
+        "y": 1239,
+        "z": "740154b1.db9c44",
         "wires": []
     },
     {
-        "id": "ce64c552.7245c",
+        "id": "eafee68f.21777",
         "type": "get-resource",
         "name": "get-resource dst TTP",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"tunnel-termination-point\" \n\t\tkey=\"tunnel-termination-point.ttp-id = $tmp.domain-B.ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.dst-ttp' local-only='false' >\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 3987.4998779296875,
-        "y": 1288,
-        "z": "6311a927.78727",
+        "x": 4063.4998779296875,
+        "y": 1290,
+        "z": "740154b1.db9c44",
         "wires": [
             [
-                "c6558909.ba61"
+                "135e1de8.ac41a2"
             ]
         ]
     },
     {
-        "id": "c6558909.ba61",
+        "id": "135e1de8.ac41a2",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4174.9998779296875,
-        "y": 1286,
-        "z": "6311a927.78727",
+        "x": 4250.9998779296875,
+        "y": 1288,
+        "z": "740154b1.db9c44",
         "wires": [
             [
-                "b166ec42.f7a328"
+                "e5e86a3d.a35168"
             ]
         ]
     },
     {
-        "id": "550b57d7.8fa528",
+        "id": "6cde7588.a972a4",
         "type": "set",
         "name": "set domain B network-id",
         "xml": "<set>\n<parameter name='tmp.domain-B.network-id' value=\"`$tmp.aai.dst-pnf.relationship-list.relationship[$mvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 5235.4998779296875,
-        "y": 1063,
-        "z": "6311a927.78727",
+        "x": 5311.4998779296875,
+        "y": 1065,
+        "z": "740154b1.db9c44",
         "wires": []
     },
     {
-        "id": "74f2c02.a79f64",
+        "id": "46f2ef05.7f74e8",
         "type": "get-resource",
         "name": "get-resource dst network-resource",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"network-resource\" \n\t\tkey=\"network-resource.network-id = $tmp.domain-B.network-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.dst-network-resource' local-only='false' >\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 5245.4998779296875,
-        "y": 1109,
-        "z": "6311a927.78727",
+        "x": 5321.4998779296875,
+        "y": 1111,
+        "z": "740154b1.db9c44",
         "wires": [
             [
-                "e85530cd.ad8bf8"
+                "95269d9e.8f1978"
             ]
         ]
     },
     {
-        "id": "e85530cd.ad8bf8",
+        "id": "95269d9e.8f1978",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5460.9998779296875,
-        "y": 1100,
-        "z": "6311a927.78727",
+        "x": 5536.9998779296875,
+        "y": 1102,
+        "z": "740154b1.db9c44",
         "wires": [
             [
-                "e3266a0a.5cb158"
+                "d0d56062.e96878"
             ]
         ]
     },
     {
-        "id": "e3266a0a.5cb158",
+        "id": "d0d56062.e96878",
         "type": "set",
         "name": "set domain B network-id, topo-id, client-id, etc",
         "xml": "<set>\n<parameter name='domain-B.network-id' value=\"`$tmp.aai.dst-network-resource.network-id`\" />\n<parameter name='domain-B.provider-id' value=\"`$tmp.aai.dst-network-resource.provider-id`\" />\n<parameter name='domain-B.client-id' value=\"`$tmp.aai.dst-network-resource.client-id`\" />\n<parameter name='domain-B.te-topo-id' value=\"`$tmp.aai.dst-network-resource.te-topo-id`\" />\n<parameter name='domain-B.network-type' value=\"`$tmp.aai.dst-network-resource.network-type`\" />\n\n\n<parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-access-network-id`' value=\"`$tmp.aai.dst-network-resource.network-id`\" />\n<parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-access-provider-id`' value=\"`$tmp.aai.dst-network-resource.provider-id`\" />\n<parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-access-client-id`' value=\"`$tmp.aai.dst-network-resource.client-id`\" />\n<parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-access-topology-id`' value=\"`$tmp.aai.dst-network-resource.te-topo-id`\" />\n<parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-access-network-type`' value=\"`$tmp.aai.dst-network-resource.network-type`\" />\n<parameter name='`tmp.otninfo_length`' value='`$vidx + 2`' />",
         "comments": "",
-        "x": 5715.4998779296875,
-        "y": 1106,
-        "z": "6311a927.78727",
+        "x": 5791.4998779296875,
+        "y": 1108,
+        "z": "740154b1.db9c44",
         "wires": []
     },
     {
-        "id": "53738595.29239c",
+        "id": "d4861d1.90a2f6",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2754.9998779296875,
-        "y": 725,
-        "z": "6311a927.78727",
+        "x": 2830.9998779296875,
+        "y": 727,
+        "z": "740154b1.db9c44",
         "wires": [
             [
-                "fd862c08.f8b4a"
+                "20453efe.bca822"
             ]
         ]
     },
     {
-        "id": "6a724ed4.0c2ee",
+        "id": "ed45880a.b1c94",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2745.9998779296875,
-        "y": 1267,
-        "z": "6311a927.78727",
+        "x": 2821.9998779296875,
+        "y": 1269,
+        "z": "740154b1.db9c44",
         "wires": [
             [
-                "6b5c01f3.fe6da8"
+                "141988e8.b25ef7"
             ]
         ]
     },
     {
-        "id": "fcc7de43.1b588",
+        "id": "ca00a5f6.d5b71",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4346.9998779296875,
-        "y": 670,
-        "z": "6311a927.78727",
+        "x": 4422.9998779296875,
+        "y": 672,
+        "z": "740154b1.db9c44",
         "wires": [
             [
-                "a813a414.4bba4"
+                "4c98d169.bddc"
             ]
         ]
     },
     {
-        "id": "b166ec42.f7a328",
+        "id": "e5e86a3d.a35168",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4363.9998779296875,
-        "y": 1275,
-        "z": "6311a927.78727",
+        "x": 4439.9998779296875,
+        "y": 1277,
+        "z": "740154b1.db9c44",
         "wires": [
             [
-                "6ce614ed.7484ac"
+                "b92cc089.036dc8"
             ]
         ]
     },
     {
-        "id": "16b2f778.e973e1",
+        "id": "1809a4d6.ba2673",
         "type": "get-resource",
         "name": "get-resource src tp",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"p-interface\" \n\t\tkey=\"pnf.pnf-name = $tmp.src-pnf-name\n\t\t    AND p-interface.interface-name = $tmp.cross-link.src-ltpId\"\n        pfx='tmp.aai.src-tp' local-only='false' >\n    \n        <!--AND depth = '0'\"-->\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2423.5,
-        "y": 768,
-        "z": "6311a927.78727",
+        "x": 2499.5,
+        "y": 770,
+        "z": "740154b1.db9c44",
         "wires": [
             [
-                "6f8fa296.cf0b14",
-                "dfb73ef2.d6e5",
-                "a2313ee1.1bd3f8"
+                "ed734d7c.04c2f8",
+                "551be9a2.28b98",
+                "22092f51.833d9"
             ]
         ]
     },
     {
-        "id": "2abf934.785ecec",
+        "id": "d4f97b75.15b158",
         "type": "get-resource",
         "name": "get-resource src pnf",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.src-pnf-name\"\n        pfx='tmp.aai.src-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 3826.9998779296875,
-        "y": 514,
-        "z": "6311a927.78727",
+        "x": 3902.9998779296875,
+        "y": 516,
+        "z": "740154b1.db9c44",
         "wires": [
             [
-                "2718cbe0.743744",
-                "c770af9d.e00ad8",
-                "4dc6603f.cfce08"
+                "27b2efea.3f735",
+                "abdc030.e780f",
+                "d67670c0.149af8"
             ]
         ]
     },
     {
-        "id": "2718cbe0.743744",
+        "id": "27b2efea.3f735",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4022.5,
-        "y": 466,
-        "z": "6311a927.78727",
+        "x": 4098.5,
+        "y": 468,
+        "z": "740154b1.db9c44",
         "wires": [
             [
-                "d9208e7d.606"
+                "67bcf691.cce0a8"
             ]
         ]
     },
     {
-        "id": "c770af9d.e00ad8",
+        "id": "abdc030.e780f",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4014.5,
-        "y": 521,
-        "z": "6311a927.78727",
+        "x": 4090.5,
+        "y": 523,
+        "z": "740154b1.db9c44",
         "wires": [
             [
-                "6bb9b9b7.b2076"
+                "f2e24f2.12fadb"
             ]
         ]
     },
     {
-        "id": "4dc6603f.cfce08",
+        "id": "d67670c0.149af8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4019.5,
-        "y": 578,
-        "z": "6311a927.78727",
+        "x": 4095.5,
+        "y": 580,
+        "z": "740154b1.db9c44",
         "wires": [
             [
-                "59153395.1608bc"
+                "c3d2abbd.c8f708"
             ]
         ]
     },
     {
-        "id": "59153395.1608bc",
+        "id": "c3d2abbd.c8f708",
         "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": 4171.5,
-        "y": 579,
-        "z": "6311a927.78727",
+        "x": 4247.5,
+        "y": 581,
+        "z": "740154b1.db9c44",
         "wires": []
     },
     {
-        "id": "6bb9b9b7.b2076",
+        "id": "f2e24f2.12fadb",
         "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": 4182.5,
-        "y": 524,
-        "z": "6311a927.78727",
+        "x": 4258.5,
+        "y": 526,
+        "z": "740154b1.db9c44",
         "wires": []
     },
     {
-        "id": "d9208e7d.606",
+        "id": "67bcf691.cce0a8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4166.88232421875,
-        "y": 463.6556701660156,
-        "z": "6311a927.78727",
+        "x": 4242.88232421875,
+        "y": 465.6556701660156,
+        "z": "740154b1.db9c44",
         "wires": [
             [
-                "55254083.c38b58",
-                "8aa824b7.0c6278"
+                "304592d5.537a8e",
+                "2af9eb5e.d3c17c"
             ]
         ]
     },
     {
-        "id": "55254083.c38b58",
+        "id": "304592d5.537a8e",
         "type": "set",
         "name": "set domain A node-id and tpn",
         "xml": "<set>\n<parameter name='domain-A.node-id' value=\"`$tmp.aai.src-pnf.pnf-id`\" />\n<parameter name='domain-A.tpn' value='1' />\n\n\n<parameter name='`tmp.otninfo[$vidx].dstPort.dst-access-node-id`' value=\"`$tmp.aai.src-pnf.pnf-id`\" />\n<parameter name='`tmp.otninfo_length`' value='`$vidx + 1`' />",
         "comments": "",
-        "x": 4391.9998779296875,
-        "y": 419,
-        "z": "6311a927.78727",
+        "x": 4467.9998779296875,
+        "y": 421,
+        "z": "740154b1.db9c44",
         "wires": []
     },
     {
-        "id": "bc51fa32.9144b",
+        "id": "12165a81.403f85",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 3913.9998779296875,
-        "y": 761,
-        "z": "6311a927.78727",
+        "x": 3989.9998779296875,
+        "y": 763,
+        "z": "740154b1.db9c44",
         "wires": []
     },
     {
-        "id": "a813a414.4bba4",
+        "id": "4c98d169.bddc",
         "type": "set",
         "name": "set domain A tunnel tp ip",
         "xml": "<set>\n<parameter name='domain-A.tunnel-tp-id' value=\"`$tmp.aai.src-ttp.tunnel-tp-id`\" />\n\n<parameter name='`tmp.otninfo[$vidx].dstPort.dst-tunnel-tp-id`' value=\"`$tmp.aai.src-ttp.tunnel-tp-id`\" />\n<parameter name='`tmp.otninfo_length`' value='`$vidx + 1`' />\n",
         "comments": "",
-        "x": 4607.9998779296875,
-        "y": 667,
-        "z": "6311a927.78727",
+        "x": 4683.9998779296875,
+        "y": 669,
+        "z": "740154b1.db9c44",
         "wires": []
     },
     {
-        "id": "668e003.0972e8",
+        "id": "7894f836.65f328",
         "type": "get-resource",
         "name": "get-resource dst pnf",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.dst-pnf-name\"\n        pfx='tmp.aai.dst-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 3823.9998779296875,
-        "y": 1117,
-        "z": "6311a927.78727",
+        "x": 3899.9998779296875,
+        "y": 1119,
+        "z": "740154b1.db9c44",
         "wires": [
             [
-                "ba64936b.6e28a",
-                "60671a93.606c04",
-                "68c36f77.2ea158"
+                "54998b27.2003cc",
+                "d1cd027c.1f10b8",
+                "75ff3dee.3bf8bc"
             ]
         ]
     },
     {
-        "id": "68c36f77.2ea158",
+        "id": "75ff3dee.3bf8bc",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4019.5,
-        "y": 1069,
-        "z": "6311a927.78727",
+        "x": 4095.5,
+        "y": 1071,
+        "z": "740154b1.db9c44",
         "wires": [
             [
-                "90c8108b.3d46b8"
+                "c056b35b.56583"
             ]
         ]
     },
     {
-        "id": "60671a93.606c04",
+        "id": "d1cd027c.1f10b8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4011.5,
-        "y": 1124,
-        "z": "6311a927.78727",
+        "x": 4087.5,
+        "y": 1126,
+        "z": "740154b1.db9c44",
         "wires": [
             [
-                "694c4d07.5571c4"
+                "560adcd5.77c02c"
             ]
         ]
     },
     {
-        "id": "ba64936b.6e28a",
+        "id": "54998b27.2003cc",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4016.5,
-        "y": 1181,
-        "z": "6311a927.78727",
+        "x": 4092.5,
+        "y": 1183,
+        "z": "740154b1.db9c44",
         "wires": [
             [
-                "8a4ef9a5.3b77b8"
+                "3b1e11f8.04c5b6"
             ]
         ]
     },
     {
-        "id": "90c8108b.3d46b8",
+        "id": "c056b35b.56583",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4163.88232421875,
-        "y": 1066.6556701660156,
-        "z": "6311a927.78727",
+        "x": 4239.88232421875,
+        "y": 1068.6556701660156,
+        "z": "740154b1.db9c44",
         "wires": [
             [
-                "925c2765.45f7c",
-                "a7906754.f0e008"
+                "7ca2f810.f9ca5",
+                "5d0e55ed.7c2c54"
             ]
         ]
     },
     {
-        "id": "694c4d07.5571c4",
+        "id": "560adcd5.77c02c",
         "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": 4179.5,
-        "y": 1127,
-        "z": "6311a927.78727",
+        "x": 4255.5,
+        "y": 1129,
+        "z": "740154b1.db9c44",
         "wires": []
     },
     {
-        "id": "8a4ef9a5.3b77b8",
+        "id": "3b1e11f8.04c5b6",
         "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": 4168.5,
-        "y": 1182,
-        "z": "6311a927.78727",
+        "x": 4244.5,
+        "y": 1184,
+        "z": "740154b1.db9c44",
         "wires": []
     },
     {
-        "id": "925c2765.45f7c",
+        "id": "7ca2f810.f9ca5",
         "type": "set",
         "name": "set domain B node-id and tpn",
         "xml": "<set>\n<parameter name='domain-B.node-id' value=\"`$tmp.aai.dst-pnf.pnf-id`\" />\n<parameter name='domain-B.tpn' value='1' />\n\n\n<parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-access-node-id`' value=\"`$tmp.aai.dst-pnf.pnf-id`\" />\n<parameter name='`tmp.otninfo_length`' value='`$vidx + 2`' />",
         "comments": "",
-        "x": 4372.9998779296875,
-        "y": 1034,
-        "z": "6311a927.78727",
+        "x": 4448.9998779296875,
+        "y": 1036,
+        "z": "740154b1.db9c44",
         "wires": []
     },
     {
-        "id": "3a5f117c.72df06",
+        "id": "3baf326d.94389e",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 3942.9998779296875,
-        "y": 1329,
-        "z": "6311a927.78727",
+        "x": 4018.9998779296875,
+        "y": 1331,
+        "z": "740154b1.db9c44",
         "wires": []
     },
     {
-        "id": "6ce614ed.7484ac",
+        "id": "b92cc089.036dc8",
         "type": "set",
         "name": "set domain B tunnel tp id",
         "xml": "<set>\n<parameter name='domain-B.tunnel-tp-id' value=\"`$tmp.aai.dst-ttp.tunnel-tp-id`\" />\n\n<parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-tunnel-tp-id`' value=\"`$tmp.aai.dst-ttp.tunnel-tp-id`\" />\n<parameter name='`tmp.otninfo_length`' value='`$vidx + 2`' />",
         "comments": "",
-        "x": 4596.9998779296875,
-        "y": 1274,
-        "z": "6311a927.78727",
+        "x": 4672.9998779296875,
+        "y": 1276,
+        "z": "740154b1.db9c44",
         "wires": []
     },
     {
-        "id": "73216d1e.d409d4",
+        "id": "c8548322.1dce7",
         "type": "outcome",
         "name": "network-resource",
         "xml": "<outcome value='network-resource'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4748.9998779296875,
-        "y": 482,
-        "z": "6311a927.78727",
+        "x": 4824.9998779296875,
+        "y": 484,
+        "z": "740154b1.db9c44",
         "wires": [
             [
-                "8e56eb89.dcf8d"
+                "49aa1e98.21619"
             ]
         ]
     },
     {
-        "id": "8e56eb89.dcf8d",
+        "id": "49aa1e98.21619",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4925.9998779296875,
-        "y": 474,
-        "z": "6311a927.78727",
+        "x": 5001.9998779296875,
+        "y": 476,
+        "z": "740154b1.db9c44",
         "wires": [
             [
-                "8a97b17a.8e6468",
-                "4190236a.ccd374",
-                "2d2f03c2.a9effc"
+                "13542cdd.43dda3",
+                "909a99fa.787ae8",
+                "44fc9502.8d863c"
             ]
         ]
     },
     {
-        "id": "8a97b17a.8e6468",
+        "id": "13542cdd.43dda3",
         "type": "set",
         "name": "set domain A network-id",
         "xml": "<set>\n<parameter name='tmp.domain-A.network-id' value=\"`$tmp.aai.src-pnf.relationship-list.relationship[$pvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 5140.9998779296875,
-        "y": 455,
-        "z": "6311a927.78727",
+        "x": 5216.9998779296875,
+        "y": 457,
+        "z": "740154b1.db9c44",
         "wires": []
     },
     {
-        "id": "4190236a.ccd374",
+        "id": "909a99fa.787ae8",
         "type": "get-resource",
         "name": "get-resource src network-resource",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"network-resource\" \n\t\tkey=\"network-resource.network-id = $tmp.domain-A.network-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.src-network-resource' local-only='false' >\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 5157.9998779296875,
-        "y": 519,
-        "z": "6311a927.78727",
+        "x": 5233.9998779296875,
+        "y": 521,
+        "z": "740154b1.db9c44",
         "wires": [
             [
-                "84a43718.34957"
+                "30bbae6f.18af4a"
             ]
         ]
     },
     {
-        "id": "84a43718.34957",
+        "id": "30bbae6f.18af4a",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5381.4998779296875,
-        "y": 520,
-        "z": "6311a927.78727",
+        "x": 5457.4998779296875,
+        "y": 522,
+        "z": "740154b1.db9c44",
         "wires": [
             [
-                "95ce66c5.711c6"
+                "a367788a.bb68e"
             ]
         ]
     },
     {
-        "id": "95ce66c5.711c6",
+        "id": "a367788a.bb68e",
         "type": "set",
         "name": "set domain A network-id, topo-id, client-id, etc",
         "xml": "<set>\n<parameter name='domain-A.network-id' value=\"`$tmp.aai.src-network-resource.network-id`\" />\n<parameter name='domain-A.provider-id' value=\"`$tmp.aai.src-network-resource.provider-id`\" />\n<parameter name='domain-A.client-id' value=\"`$tmp.aai.src-network-resource.client-id`\" />\n<parameter name='domain-A.te-topo-id' value=\"`$tmp.aai.src-network-resource.te-topo-id`\" />\n<parameter name='domain-A.network-type' value=\"`$tmp.aai.src-network-resource.network-type`\" />\n\n\n<parameter name='`tmp.otninfo[$vidx].dstPort.dst-access-network-id`' value=\"`$tmp.aai.src-network-resource.network-id`\" />\n<parameter name='`tmp.otninfo[$vidx].dstPort.dst-access-provider-id`' value=\"`$tmp.aai.src-network-resource.provider-id`\" />\n<parameter name='`tmp.otninfo[$vidx].dstPort.dst-access-client-id`' value=\"`$tmp.aai.src-network-resource.client-id`\" />\n<parameter name='`tmp.otninfo[$vidx].dstPort.dst-access-topology-id`' value=\"`$tmp.aai.src-network-resource.te-topo-id`\" />\n<parameter name='`tmp.otninfo[$vidx].dstPort.dst-access-network-type`' value=\"`$tmp.aai.src-network-resource.network-type`\" />\n<parameter name='`tmp.otninfo_length`' value='`$vidx + 1`' />\n\n\n",
         "comments": "",
-        "x": 5645.9998779296875,
-        "y": 509,
-        "z": "6311a927.78727",
+        "x": 5721.9998779296875,
+        "y": 511,
+        "z": "740154b1.db9c44",
         "wires": []
     },
     {
-        "id": "8aa824b7.0c6278",
+        "id": "2af9eb5e.d3c17c",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='pvidx' start='0' end='`$tmp.aai.src-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 4350.9998779296875,
-        "y": 478,
-        "z": "6311a927.78727",
+        "x": 4426.9998779296875,
+        "y": 480,
+        "z": "740154b1.db9c44",
         "wires": [
             [
-                "5a4b07ac.8d3028"
+                "df80ec0f.2a1388"
             ]
         ]
     },
     {
-        "id": "5a4b07ac.8d3028",
+        "id": "df80ec0f.2a1388",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.src-pnf.relationship-list.relationship[$pvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4545.9998779296875,
-        "y": 478,
-        "z": "6311a927.78727",
+        "x": 4621.9998779296875,
+        "y": 480,
+        "z": "740154b1.db9c44",
         "wires": [
             [
-                "73216d1e.d409d4"
+                "c8548322.1dce7"
             ]
         ]
     },
     {
-        "id": "2d2f03c2.a9effc",
+        "id": "44fc9502.8d863c",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 5084.9998779296875,
-        "y": 572,
-        "z": "6311a927.78727",
+        "x": 5160.9998779296875,
+        "y": 574,
+        "z": "740154b1.db9c44",
         "wires": []
     },
     {
-        "id": "a7906754.f0e008",
+        "id": "5d0e55ed.7c2c54",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='mvidx' start='0' end='`$tmp.aai.dst-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 4351.9998779296875,
-        "y": 1085,
-        "z": "6311a927.78727",
+        "x": 4427.9998779296875,
+        "y": 1087,
+        "z": "740154b1.db9c44",
         "wires": [
             [
-                "6641c07e.096d18"
+                "97742823.a37f08"
             ]
         ]
     },
     {
-        "id": "6641c07e.096d18",
+        "id": "97742823.a37f08",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.dst-pnf.relationship-list.relationship[$mvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4546.9998779296875,
-        "y": 1085,
-        "z": "6311a927.78727",
+        "x": 4622.9998779296875,
+        "y": 1087,
+        "z": "740154b1.db9c44",
         "wires": [
             [
-                "66c4a517.3f3fd4"
+                "df39947.2e32868"
             ]
         ]
     },
     {
-        "id": "f2bb305d.4422b8",
+        "id": "36e1e931.d36586",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 5170.9998779296875,
-        "y": 1165,
-        "z": "6311a927.78727",
+        "x": 5246.9998779296875,
+        "y": 1167,
+        "z": "740154b1.db9c44",
         "wires": []
     },
     {
-        "id": "4ad035fb.c384cc",
+        "id": "103b5c34.d77a7c",
         "type": "execute",
         "name": "execute split tp-id to get pnf-name",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<!--<parameter name=\"original_string\" value='`$tmp.aai.src-tp`'/>-->\n<parameter name=\"original_string\" value='`$tmp.aai.src-tp.interface-name`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-src-tp\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 3854.9998779296875,
-        "y": 308,
-        "z": "6311a927.78727",
+        "x": 3930.9998779296875,
+        "y": 310,
+        "z": "740154b1.db9c44",
         "wires": [
             [
-                "5bd2f425.157014",
-                "a6025f31.cc3d4"
+                "b3bf59d4.5b493",
+                "21c8620c.a1786e"
             ]
         ]
     },
     {
-        "id": "a6025f31.cc3d4",
+        "id": "21c8620c.a1786e",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4075.9998779296875,
-        "y": 276,
-        "z": "6311a927.78727",
+        "x": 4151.9998779296875,
+        "y": 278,
+        "z": "740154b1.db9c44",
         "wires": [
             [
-                "61178ee6.46287"
+                "ac6a8696.ec08c8"
             ]
         ]
     },
     {
-        "id": "5bd2f425.157014",
+        "id": "b3bf59d4.5b493",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4075.9998779296875,
-        "y": 323,
-        "z": "6311a927.78727",
+        "x": 4151.9998779296875,
+        "y": 325,
+        "z": "740154b1.db9c44",
         "wires": [
             [
-                "3bd5270a.9b3388"
+                "53c1b9f8.feb02"
             ]
         ]
     },
     {
-        "id": "61178ee6.46287",
+        "id": "ac6a8696.ec08c8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4240.9998779296875,
-        "y": 273,
-        "z": "6311a927.78727",
+        "x": 4316.9998779296875,
+        "y": 275,
+        "z": "740154b1.db9c44",
         "wires": [
             [
-                "30bc001a.081c6"
+                "c3a92ffe.308538"
             ]
         ]
     },
     {
-        "id": "30bc001a.081c6",
+        "id": "c3a92ffe.308538",
         "type": "set",
         "name": "set domain-A.ltpId",
         "xml": "<set>\n<parameter name='domain-A.ltpId' value='`$param-prefix-src-tp[$param-prefix-src-tp_length -1]`' />\n\n<parameter name='`tmp.otninfo[$vidx].dstPort.dst-ltp-id`' value=\"`$param-prefix-src-tp[$param-prefix-src-tp_length -1]`\" />\n<parameter name='`tmp.otninfo_length`' value='`$vidx + 1`' />",
         "comments": "",
-        "x": 4422.9998779296875,
-        "y": 277,
-        "z": "6311a927.78727",
+        "x": 4498.9998779296875,
+        "y": 279,
+        "z": "740154b1.db9c44",
         "wires": []
     },
     {
-        "id": "3bd5270a.9b3388",
+        "id": "53c1b9f8.feb02",
         "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": 4242.9998779296875,
-        "y": 323,
-        "z": "6311a927.78727",
+        "x": 4318.9998779296875,
+        "y": 325,
+        "z": "740154b1.db9c44",
         "wires": []
     },
     {
-        "id": "888129ab.9ea2a8",
+        "id": "9b949993.6af3e",
         "type": "execute",
         "name": "execute split tp-id to get pnf-name",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.dst-tp`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-dst-tp\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 3862.9998779296875,
-        "y": 932,
-        "z": "6311a927.78727",
+        "x": 3938.9998779296875,
+        "y": 934,
+        "z": "740154b1.db9c44",
         "wires": [
             [
-                "f5b036b5.9d3fe",
-                "c8627fdc.4ca238"
+                "63b15b9d.d0246c",
+                "438781d9.fa013"
             ]
         ]
     },
     {
-        "id": "c8627fdc.4ca238",
+        "id": "438781d9.fa013",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4083.9998779296875,
-        "y": 900,
-        "z": "6311a927.78727",
+        "x": 4159.9998779296875,
+        "y": 902,
+        "z": "740154b1.db9c44",
         "wires": [
             [
-                "5d59aabb.f55db4"
+                "7c480aff.2bda14"
             ]
         ]
     },
     {
-        "id": "f5b036b5.9d3fe",
+        "id": "63b15b9d.d0246c",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4083.9998779296875,
-        "y": 947,
-        "z": "6311a927.78727",
+        "x": 4159.9998779296875,
+        "y": 949,
+        "z": "740154b1.db9c44",
         "wires": [
             [
-                "8fc5e8a.5216b18"
+                "6669851b.858ebc"
             ]
         ]
     },
     {
-        "id": "5d59aabb.f55db4",
+        "id": "7c480aff.2bda14",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4248.9998779296875,
-        "y": 897,
-        "z": "6311a927.78727",
+        "x": 4324.9998779296875,
+        "y": 899,
+        "z": "740154b1.db9c44",
         "wires": [
             [
-                "c8487895.7a94"
+                "6535be11.5e3bd"
             ]
         ]
     },
     {
-        "id": "c8487895.7a94",
+        "id": "6535be11.5e3bd",
         "type": "set",
         "name": "set domain-B.ltpId",
         "xml": "<set>\n<parameter name='domain-B.ltpId' value='`$param-prefix-dst-tp[$param-prefix-dst-tp_length -1]`' />\n\n<parameter name='`tmp.otninfo[$vidx + 1].srcPort.src-ltp-id`' value=\"`$param-prefix-dst-tp[$param-prefix-dst-tp_length -1]`\" />\n<parameter name='`tmp.otninfo_length`' value='`$vidx + 2`' />",
         "comments": "",
-        "x": 4444.9998779296875,
-        "y": 894,
-        "z": "6311a927.78727",
+        "x": 4520.9998779296875,
+        "y": 896,
+        "z": "740154b1.db9c44",
         "wires": []
     },
     {
-        "id": "8fc5e8a.5216b18",
+        "id": "6669851b.858ebc",
         "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": 4250.9998779296875,
-        "y": 947,
-        "z": "6311a927.78727",
+        "x": 4326.9998779296875,
+        "y": 949,
+        "z": "740154b1.db9c44",
         "wires": []
     },
     {
-        "id": "abe518b.cefde68",
+        "id": "154e7688.b29339",
         "type": "set",
         "name": "unset parameters",
         "xml": "<set>\n<parameter name='otn-oof.link-name' value='' />\n<!--<parameter name='tmp.aai.cross-link' value='' />-->\n<parameter name='tmp.aai.cross-link.' value='' />\n<!--<parameter name='tmp.aai.cross-link.link-role' value='' />-->",
         "comments": "",
-        "x": 1120,
-        "y": 734,
-        "z": "6311a927.78727",
+        "x": 1196,
+        "y": 736,
+        "z": "740154b1.db9c44",
         "wires": []
     },
     {
-        "id": "cf555e48.aeaaa8",
+        "id": "5f2860ab.d20368",
         "type": "comment",
         "name": "Not useful anymore",
         "info": "this domain-A.ltpId is not used anymore",
         "comments": "",
-        "x": 4465.9998779296875,
-        "y": 253,
-        "z": "6311a927.78727",
+        "x": 4541.9998779296875,
+        "y": 255,
+        "z": "740154b1.db9c44",
         "wires": []
     },
     {
-        "id": "29edf5a1.e0b48a",
+        "id": "839b6b92.78af58",
         "type": "comment",
         "name": "Not useful anymore",
         "info": "this domain-B.ltpId is not used anymore",
         "comments": "",
-        "x": 4487.9998779296875,
-        "y": 866,
-        "z": "6311a927.78727",
+        "x": 4563.9998779296875,
+        "y": 868,
+        "z": "740154b1.db9c44",
         "wires": []
     },
     {
-        "id": "7882cf69.81bba",
+        "id": "d800f8fa.097b28",
         "type": "set",
         "name": "unset parameters",
-        "xml": "<set>\n<parameter name='`tmp.otninfo.`' value='' />\n<!--<parameter name='`tmp.otninfo_length`' value='0' />-->",
+        "xml": "<set>\n<parameter name='`tmp.otninfo.`' value='' />\n<!--<parameter name='`tmp.otninfo_length`' value='0' />-->\n<parameter name='`tmp.otninfoProtect.`' value='' />",
         "comments": "",
-        "x": 761,
-        "y": 662,
-        "z": "6311a927.78727",
+        "x": 837,
+        "y": 664,
+        "z": "740154b1.db9c44",
         "wires": []
     },
     {
-        "id": "1e669820.d1af2",
+        "id": "9d59de38.f2a96",
         "type": "comment",
         "name": "May not be necessary",
         "info": "",
         "comments": "",
-        "x": 772,
-        "y": 615,
-        "z": "6311a927.78727",
+        "x": 848,
+        "y": 617,
+        "z": "740154b1.db9c44",
         "wires": []
     },
     {
-        "id": "f346bebe.50149",
+        "id": "3eb232d2.31d3ce",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 752,
-        "y": 412,
-        "z": "6311a927.78727",
+        "x": 828,
+        "y": 414,
+        "z": "740154b1.db9c44",
         "wires": [
             [
-                "bf6f0512.491f98",
-                "50fbaa58.2b30a4",
-                "9c16d091.cb39f8",
-                "67b4d462.48c1b4",
-                "47a588a1.c73f2",
-                "7663f303.03da94",
-                "9122c7e9.cadbc8",
-                "45b9551b.0a437c",
-                "3cc2e9be.dc0176",
-                "5092ace7.ae1144",
-                "652147e8.77864"
+                "ef757a3b.136af8",
+                "170891d6.65d54e",
+                "69ba386e.9da968",
+                "2e082ac1.a1ccfe",
+                "a74fb526.bc5db",
+                "4af9732c.943804",
+                "45b96535.5a3dac",
+                "1033844e.1fe0b4",
+                "644a4209.4c190c",
+                "752e7b91.ad42a4",
+                "7d6aaca7.ab1b4c",
+                "441d97dd.ea8d",
+                "75c12230.00ef3c"
             ]
         ]
     },
     {
-        "id": "bf6f0512.491f98",
+        "id": "874f6992.1d0f",
         "type": "execute",
         "name": "execute PCE in ccsdk/sli/core",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliTopologyUtils' method='computePath' >\n<parameter name=\"pnfs-pfx\" value='ccsdkTopopnfs'/>\n<parameter name=\"links-pfx\" value=\"ccsdkTopologicalLinks\"/>\n<parameter name=\"response-pfx\" value=\"otn-oof\"/>\n<parameter name=\"output-end-to-end-path\" value=\"false\"/>\n<!--<parameter name=\"src-node\" value=\"`$tmp.src.domainA.pnf-name`\"/>-->\n<!--<parameter name=\"dst-node\" value=\"`$tmp.dst.domainB.pnf-name`\"/>-->\n<parameter name=\"src-node\" value=\"`$tmp.pce-src-node`\"/>\n<parameter name=\"dst-node\" value=\"`$tmp.pce-dst-node`\"/>\n",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliTopologyUtils' method='computePaths' >\n<parameter name=\"pnfs-pfx\" value='ccsdkTopopnfs'/>\n<parameter name=\"links-pfx\" value=\"ccsdkTopologicalLinks\"/>\n<parameter name=\"response-pfx\" value=\"otn-oof\"/>\n<parameter name=\"output-end-to-end-path\" value=\"false\"/>\n<!--<parameter name=\"src-node\" value=\"`$tmp.src.domainA.pnf-name`\"/>-->\n<!--<parameter name=\"dst-node\" value=\"`$tmp.dst.domainB.pnf-name`\"/>-->\n<parameter name=\"src-node\" value=\"`$tmp.pce-src-node`\"/>\n<parameter name=\"dst-node\" value=\"`$tmp.pce-dst-node`\"/>\n<parameter name=\"dst-node-backup\" value=\"`$tmp.pce-dst-node-backup`\"/>\n<parameter name=\"require-backuppath\" value=\"`$hasSecondary`\"/>",
         "comments": "",
         "outputs": 1,
-        "x": 1026,
-        "y": 632,
-        "z": "6311a927.78727",
+        "x": 1650,
+        "y": 661,
+        "z": "740154b1.db9c44",
         "wires": [
             [
-                "278e4eda.dd1afa",
-                "95a448d5.61bae",
-                "396c6fcc.348ef"
+                "9cd26432.6ca2e",
+                "d020471b.87351",
+                "d9ad3259.cc415"
             ]
         ]
     },
     {
-        "id": "50fbaa58.2b30a4",
+        "id": "ef757a3b.136af8",
         "type": "record",
-        "name": "record tmp.pce-src and dst node",
-        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\" />\n<parameter name=\"level\" value=\"info\" />\n<!--<parameter name=\"field1\" value=\"Path computation succeed!\"/>-->\n<!--<parameter name=\"field2\" value=\"`$ccsdkTopo.resp.solutions_length`\"/>-->\n\n<!--<parameter name=\"field1\" value=\"`$tmp.src.domainA.pnf-name`\"/>-->\n<!--<parameter name=\"field2\" value=\"`$tmp.dst.domainB.pnf-name`\"/>-->\n<parameter name=\"field1\" value=\"`$tmp.pce-src-node`\"/>\n<parameter name=\"field2\" value=\"`$tmp.pce-dst-node`\"/>\n",
+        "name": "record tmp.pce-src and dst node and backup",
+        "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\" />\n<parameter name=\"level\" value=\"info\" />\n<!--<parameter name=\"field1\" value=\"Path computation succeed!\"/>-->\n<!--<parameter name=\"field2\" value=\"`$ccsdkTopo.resp.solutions_length`\"/>-->\n\n<!--<parameter name=\"field1\" value=\"`$tmp.src.domainA.pnf-name`\"/>-->\n<!--<parameter name=\"field2\" value=\"`$tmp.dst.domainB.pnf-name`\"/>-->\n<parameter name=\"field1\" value=\"`$tmp.pce-src-node`\"/>\n<parameter name=\"field2\" value=\"`$tmp.pce-dst-node`\"/>\n<parameter name=\"field3\" value=\"`$tmp.pce-dst-node-backup`\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1003,
-        "y": 449,
-        "z": "6311a927.78727",
+        "x": 1124,
+        "y": 447,
+        "z": "740154b1.db9c44",
         "wires": [
             []
         ]
     },
     {
-        "id": "278e4eda.dd1afa",
+        "id": "9cd26432.6ca2e",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1271,
-        "y": 664,
-        "z": "6311a927.78727",
+        "x": 1895,
+        "y": 693,
+        "z": "740154b1.db9c44",
         "wires": [
             []
         ]
     },
     {
-        "id": "95a448d5.61bae",
+        "id": "d020471b.87351",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1278,
-        "y": 706,
-        "z": "6311a927.78727",
+        "x": 1902,
+        "y": 735,
+        "z": "740154b1.db9c44",
         "wires": [
             []
         ]
     },
     {
-        "id": "396c6fcc.348ef",
+        "id": "d9ad3259.cc415",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1273,
-        "y": 627,
-        "z": "6311a927.78727",
+        "x": 1897,
+        "y": 656,
+        "z": "740154b1.db9c44",
         "wires": [
             []
         ]
     },
     {
-        "id": "9c16d091.cb39f8",
+        "id": "170891d6.65d54e",
         "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": 971,
-        "y": 357,
-        "z": "6311a927.78727",
+        "x": 1045,
+        "y": 319,
+        "z": "740154b1.db9c44",
         "wires": []
     },
     {
-        "id": "67b4d462.48c1b4",
+        "id": "69ba386e.9da968",
         "type": "set",
         "name": "set tmp.pce-dst-node",
         "xml": "<set>\n<!--<parameter name='$tmp.pce-dst-node' value=\"`$param-prefix-domainB-pnfName[0] + '-' +-->\n<!--                                                   $param-prefix-domainB-pnfName[1] + '-' +-->\n<!--                                                   $param-prefix-domainB-pnfName[2] + '-' +-->\n<!--                                                   $param-prefix-domainB-pnfName[3] + '-' +-->\n<!--                                                   $param-prefix-domainB-pnfName[4] + '-' +-->\n<!--                                                   $param-prefix-domainB-pnfName[5] + '-' +-->\n<!--                                                   1 + '-' +-->\n<!--                                                   $param-prefix-domainB-pnfName[7] + '-' +-->\n<!--                                                   $param-prefix-domainB-pnfName[8]`\" />-->\n<parameter name='tmp.pce-dst-node' value=\"`$param-prefix-domainB-pnfName[0] + '-' +\n                                                   $param-prefix-domainB-pnfName[1] + '-' +\n                                                   $param-prefix-domainB-pnfName[2] + '-' +\n                                                   $param-prefix-domainB-pnfName[3] + '-' +\n                                                   $param-prefix-domainB-pnfName[4] + '-' +\n                                                   $param-prefix-domainB-pnfName[5] + '-' +\n                                                   $otnTopoIdDst + '-' +\n                                                   $param-prefix-domainB-pnfName[7] + '-' +\n                                                   $param-prefix-domainB-pnfName[8]`\" />",
         "comments": "",
-        "x": 971,
-        "y": 403,
-        "z": "6311a927.78727",
+        "x": 1045,
+        "y": 359,
+        "z": "740154b1.db9c44",
         "wires": []
     },
     {
-        "id": "165db6ae.de2bb9",
+        "id": "4f1a8be1.b37344",
         "type": "set",
         "name": "set src-ltpId",
         "xml": "<set>\n<parameter name='tmp.cross-link.src-ltpId' value=\"`$otn-oof.solutions[$vidx].src_pinterface`\" />\n<parameter name='tmp.src-pnf-name' value=\"`$otn-oof.solutions[$vidx].src_node`\" />\n",
         "comments": "",
-        "x": 1102,
-        "y": 865,
-        "z": "6311a927.78727",
+        "x": 1178,
+        "y": 867,
+        "z": "740154b1.db9c44",
         "wires": []
     },
     {
-        "id": "fda3acff.66dac8",
+        "id": "2cdce288.c30c46",
         "type": "set",
         "name": "set dst-ltpId",
         "xml": "<set>\n<parameter name='tmp.cross-link.dst-ltpId' value=\"`$otn-oof.solutions[$vidx].dst_pinterface`\" />\n<parameter name='tmp.dst-pnf-name' value=\"`$otn-oof.solutions[$vidx].dst_node`\" />\n\n\n",
         "comments": "",
-        "x": 1103,
-        "y": 915,
-        "z": "6311a927.78727",
+        "x": 1179,
+        "y": 917,
+        "z": "740154b1.db9c44",
         "wires": []
     },
     {
-        "id": "47a588a1.c73f2",
+        "id": "2e082ac1.a1ccfe",
         "type": "get-resource",
         "name": "get-resource network-resources-list",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-resources\"\n\t    key=\"selflink = 'https://aai.onap:8443/aai/v21/network/network-resources?depth=0'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"allNetworksList\" >",
         "comments": "",
         "outputs": 1,
-        "x": 1023,
-        "y": 102,
-        "z": "6311a927.78727",
+        "x": 1102,
+        "y": 43,
+        "z": "740154b1.db9c44",
         "wires": [
             [
-                "a6aa209b.6892d",
-                "487dbe5b.696ae8",
-                "81fa26f.09db858"
+                "8367b97c.7cba2",
+                "c705fa11.095f6",
+                "3e5ba73a.cfbd2"
             ]
         ]
     },
     {
-        "id": "487dbe5b.696ae8",
+        "id": "c705fa11.095f6",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1256,
-        "y": 126,
-        "z": "6311a927.78727",
+        "x": 1335,
+        "y": 67,
+        "z": "740154b1.db9c44",
         "wires": [
             []
         ]
     },
     {
-        "id": "81fa26f.09db858",
+        "id": "3e5ba73a.cfbd2",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1270,
-        "y": 166,
-        "z": "6311a927.78727",
+        "x": 1349,
+        "y": 107,
+        "z": "740154b1.db9c44",
         "wires": [
             []
         ]
     },
     {
-        "id": "a6aa209b.6892d",
+        "id": "8367b97c.7cba2",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1259,
-        "y": 85,
-        "z": "6311a927.78727",
+        "x": 1338,
+        "y": 26,
+        "z": "740154b1.db9c44",
         "wires": [
             []
         ]
     },
     {
-        "id": "7663f303.03da94",
+        "id": "a74fb526.bc5db",
         "type": "for",
         "name": "for netwidx..allNetworksList_length",
         "xml": "<for index='netwidx' start='0' end='`$allNetworksList.network-resource_length`' >",
         "comments": "",
         "outputs": 1,
-        "x": 1015,
-        "y": 148,
-        "z": "6311a927.78727",
+        "x": 1094,
+        "y": 89,
+        "z": "740154b1.db9c44",
         "wires": [
             [
-                "27c5b08b.38fb5"
+                "e64f1c2c.75e2a8"
             ]
         ]
     },
     {
-        "id": "27c5b08b.38fb5",
+        "id": "e64f1c2c.75e2a8",
         "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": 1336,
-        "y": 224,
-        "z": "6311a927.78727",
+        "x": 1415,
+        "y": 165,
+        "z": "740154b1.db9c44",
         "wires": [
             [
-                "22cbcd57.e91ce2",
-                "119bae13.8994fa"
+                "6f7c355b.5a1c94",
+                "49d801ae.f158f"
             ]
         ]
     },
     {
-        "id": "22cbcd57.e91ce2",
+        "id": "6f7c355b.5a1c94",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1563,
-        "y": 225,
-        "z": "6311a927.78727",
+        "x": 1639,
+        "y": 227,
+        "z": "740154b1.db9c44",
         "wires": [
             [
-                "1f8d2ed3.4f6c09"
+                "14708434.e61bac"
             ]
         ]
     },
     {
-        "id": "1f8d2ed3.4f6c09",
+        "id": "14708434.e61bac",
         "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": 1776,
-        "y": 225,
-        "z": "6311a927.78727",
+        "x": 1852,
+        "y": 227,
+        "z": "740154b1.db9c44",
         "wires": [
             [
-                "cfa8e423.6dd988"
+                "4944f354.0e26f4"
             ]
         ]
     },
     {
-        "id": "cfa8e423.6dd988",
+        "id": "4944f354.0e26f4",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1941,
-        "y": 225,
-        "z": "6311a927.78727",
+        "x": 2017,
+        "y": 227,
+        "z": "740154b1.db9c44",
         "wires": [
             [
-                "3bd110a6.a8ba8"
+                "3ffd16fe.ae9d82"
             ]
         ]
     },
     {
-        "id": "3bd110a6.a8ba8",
+        "id": "3ffd16fe.ae9d82",
         "type": "set",
         "name": "set otnTopoIdSrc",
         "xml": "<set>\n<parameter name='otnTopoIdSrc' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />\n",
         "comments": "",
-        "x": 2110,
-        "y": 225,
-        "z": "6311a927.78727",
+        "x": 2186,
+        "y": 227,
+        "z": "740154b1.db9c44",
         "wires": []
     },
     {
-        "id": "119bae13.8994fa",
+        "id": "49d801ae.f158f",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1563,
-        "y": 278,
-        "z": "6311a927.78727",
+        "x": 1639,
+        "y": 280,
+        "z": "740154b1.db9c44",
         "wires": [
             [
-                "4e665bce.dd8f3c"
+                "88e310ce.d70d1"
             ]
         ]
     },
     {
-        "id": "4e665bce.dd8f3c",
+        "id": "88e310ce.d70d1",
         "type": "switchNode",
         "name": "switch provider-id domainB",
         "xml": "<switch test='`$allNetworksList.network-resource[$netwidx].provider-id == $param-prefix-domainB-pnfName[2]`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1751,
-        "y": 278,
-        "z": "6311a927.78727",
+        "x": 1827,
+        "y": 280,
+        "z": "740154b1.db9c44",
         "wires": [
             [
-                "5471d1aa.c2b568"
+                "58122a1d.8684e4",
+                "3cb3eb19.e7f8b4"
             ]
         ]
     },
     {
-        "id": "5471d1aa.c2b568",
+        "id": "58122a1d.8684e4",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1941,
-        "y": 278,
-        "z": "6311a927.78727",
+        "x": 2017,
+        "y": 280,
+        "z": "740154b1.db9c44",
         "wires": [
             [
-                "aa5bb707.4bb48"
+                "5772e567.b80a34"
             ]
         ]
     },
     {
-        "id": "aa5bb707.4bb48",
+        "id": "5772e567.b80a34",
         "type": "switchNode",
         "name": "switch te-topo-id",
         "xml": "<switch test='`$allNetworksList.network-resource[$netwidx].te-topo-id != $param-prefix-domainB-pnfName[6]`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2109,
-        "y": 278,
-        "z": "6311a927.78727",
+        "x": 2185,
+        "y": 280,
+        "z": "740154b1.db9c44",
         "wires": [
             [
-                "3a63aeee.a8bb3a"
+                "2fb8eaf6.956b36"
             ]
         ]
     },
     {
-        "id": "3a63aeee.a8bb3a",
+        "id": "2fb8eaf6.956b36",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2265,
-        "y": 278,
-        "z": "6311a927.78727",
+        "x": 2341,
+        "y": 280,
+        "z": "740154b1.db9c44",
         "wires": [
             [
-                "1438c95.a2947b7"
+                "821af63c.9d499"
             ]
         ]
     },
     {
-        "id": "1438c95.a2947b7",
+        "id": "3d7e803.580f08",
         "type": "set",
         "name": "set otnTopoIdDst",
         "xml": "<set>\n<parameter name='otnTopoIdDst' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />\n",
         "comments": "",
-        "x": 2424,
-        "y": 278,
-        "z": "6311a927.78727",
+        "x": 3036,
+        "y": 184,
+        "z": "740154b1.db9c44",
         "wires": []
     },
     {
-        "id": "9122c7e9.cadbc8",
+        "id": "4af9732c.943804",
         "type": "set",
         "name": "unset parameters",
         "xml": "<set>\n<!--<parameter name='`otn-oof`' value='' />-->\n<parameter name='otn-oof.' value='' />\n<!--<parameter name='`otn-oof.solutions`' value='' />-->\n<!--<parameter name='`otn-oof.solutions.`' value='' />-->\n<!--<parameter name='`otn-oof.solutions_length`' value='0' />-->",
         "comments": "",
-        "x": 964,
-        "y": 304,
-        "z": "6311a927.78727",
+        "x": 1039,
+        "y": 260,
+        "z": "740154b1.db9c44",
         "wires": []
     },
     {
-        "id": "45b9551b.0a437c",
+        "id": "45b96535.5a3dac",
         "type": "set",
         "name": "unset parameters",
         "xml": "<set>\n<parameter name='tmp.pce-src-node.' value='' />\n",
         "comments": "",
-        "x": 968,
-        "y": 219,
-        "z": "6311a927.78727",
+        "x": 1048,
+        "y": 142,
+        "z": "740154b1.db9c44",
         "wires": []
     },
     {
-        "id": "3cc2e9be.dc0176",
+        "id": "1033844e.1fe0b4",
         "type": "set",
         "name": "unset parameters",
         "xml": "<set>\n<parameter name='tmp.pce-dst-node.' value='' />\n",
         "comments": "",
-        "x": 966,
-        "y": 261,
-        "z": "6311a927.78727",
+        "x": 1046,
+        "y": 184,
+        "z": "740154b1.db9c44",
         "wires": []
     },
     {
-        "id": "5092ace7.ae1144",
+        "id": "644a4209.4c190c",
         "type": "record",
         "name": "record otn-oof.",
         "xml": "<record plugin=\"org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder\">\n<parameter name=\"logger\" value=\"message-log\" />\n<parameter name=\"level\" value=\"info\" />\n<parameter name=\"field1\" value=\"`$otn-oof.`\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 959,
-        "y": 493,
-        "z": "6311a927.78727",
+        "x": 1035,
+        "y": 495,
+        "z": "740154b1.db9c44",
         "wires": [
             []
         ]
     },
     {
-        "id": "ab172df4.a758b",
+        "id": "d9004337.b1e7",
         "type": "execute",
         "name": "execute printContext",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n    <parameter name=\"filename\" value=\"`$filenamemm`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 978,
-        "y": 575,
-        "z": "6311a927.78727",
+        "x": 1057,
+        "y": 568,
+        "z": "740154b1.db9c44",
         "wires": [
             []
         ]
     },
     {
-        "id": "652147e8.77864",
+        "id": "752e7b91.ad42a4",
         "type": "set",
         "name": "set filename",
-        "xml": "<set>\n<!--<parameter name='tmp.pce-src-node' value=\"`$param-prefix-domainA-pnfName[0] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[1] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[2] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[3] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[4] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[5] + '-' +-->\n<!--                                                   1 + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[7] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[8]`\" />-->\n\n<parameter name='filenamemm' value=\"`$tmp.pce-src-node + $tmp.pce-dst-node`\" />",
+        "xml": "<set>\n<!--<parameter name='tmp.pce-src-node' value=\"`$param-prefix-domainA-pnfName[0] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[1] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[2] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[3] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[4] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[5] + '-' +-->\n<!--                                                   1 + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[7] + '-' +-->\n<!--                                                   $param-prefix-domainA-pnfName[8]`\" />-->\n\n<parameter name='filenamemm' value=\"`$tmp.pce-src-node + $tmp.pce-dst-node + $tmp.pce-dst-node-backup`\" />",
+        "comments": "",
+        "x": 1031,
+        "y": 531,
+        "z": "740154b1.db9c44",
+        "wires": []
+    },
+    {
+        "id": "3cb3eb19.e7f8b4",
+        "type": "outcomeFalse",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2007,
+        "y": 344,
+        "z": "740154b1.db9c44",
+        "wires": [
+            [
+                "b16334e2.e8d148"
+            ]
+        ]
+    },
+    {
+        "id": "b16334e2.e8d148",
+        "type": "switchNode",
+        "name": "switch provider-id domainC",
+        "xml": "<switch test='`$allNetworksList.network-resource[$netwidx].provider-id == $param-prefix-domainC-pnfName[2]`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2208,
+        "y": 345,
+        "z": "740154b1.db9c44",
+        "wires": [
+            [
+                "7d3fd43.e41d5ac"
+            ]
+        ]
+    },
+    {
+        "id": "7d3fd43.e41d5ac",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2418,
+        "y": 345,
+        "z": "740154b1.db9c44",
+        "wires": [
+            [
+                "dccf569f.2f16c"
+            ]
+        ]
+    },
+    {
+        "id": "e56fd0ad.9e01a8",
+        "type": "set",
+        "name": "set otnTopoIdDstBackup",
+        "xml": "<set>\n<parameter name='otnTopoIdDstBackup' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />\n",
+        "comments": "",
+        "x": 3126,
+        "y": 435.0000305175781,
+        "z": "740154b1.db9c44",
+        "wires": []
+    },
+    {
+        "id": "7d6aaca7.ab1b4c",
+        "type": "set",
+        "name": "unset parameters",
+        "xml": "<set>\n<parameter name='tmp.pce-dst-node-backup.' value='' />\n",
+        "comments": "",
+        "x": 1044,
+        "y": 222,
+        "z": "740154b1.db9c44",
+        "wires": []
+    },
+    {
+        "id": "441d97dd.ea8d",
+        "type": "set",
+        "name": "set tmp.pce-dst-node-backup",
+        "xml": "<set>\n<!--<parameter name='$tmp.pce-dst-node' value=\"`$param-prefix-domainB-pnfName[0] + '-' +-->\n<!--                                                   $param-prefix-domainB-pnfName[1] + '-' +-->\n<!--                                                   $param-prefix-domainB-pnfName[2] + '-' +-->\n<!--                                                   $param-prefix-domainB-pnfName[3] + '-' +-->\n<!--                                                   $param-prefix-domainB-pnfName[4] + '-' +-->\n<!--                                                   $param-prefix-domainB-pnfName[5] + '-' +-->\n<!--                                                   1 + '-' +-->\n<!--                                                   $param-prefix-domainB-pnfName[7] + '-' +-->\n<!--                                                   $param-prefix-domainB-pnfName[8]`\" />-->\n<parameter name='tmp.pce-dst-node-backup' value=\"`$param-prefix-domainC-pnfName[0] + '-' +\n                                                   $param-prefix-domainC-pnfName[1] + '-' +\n                                                   $param-prefix-domainC-pnfName[2] + '-' +\n                                                   $param-prefix-domainC-pnfName[3] + '-' +\n                                                   $param-prefix-domainC-pnfName[4] + '-' +\n                                                   $param-prefix-domainC-pnfName[5] + '-' +\n                                                   $otnTopoIdDstBackup + '-' +\n                                                   $param-prefix-domainC-pnfName[7] + '-' +\n                                                   $param-prefix-domainC-pnfName[8]`\" />",
+        "comments": "",
+        "x": 1076,
+        "y": 400,
+        "z": "740154b1.db9c44",
+        "wires": []
+    },
+    {
+        "id": "75c12230.00ef3c",
+        "type": "switchNode",
+        "name": "switch $hasSecondary",
+        "xml": "<switch test='`$hasSecondary`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1080,
+        "y": 647,
+        "z": "740154b1.db9c44",
+        "wires": [
+            [
+                "bdfc5f0.5322ba",
+                "89aa82c1.c2aec8"
+            ]
+        ]
+    },
+    {
+        "id": "bdfc5f0.5322ba",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1271,
+        "y": 651,
+        "z": "740154b1.db9c44",
+        "wires": [
+            [
+                "ae417966.2eaf28"
+            ]
+        ]
+    },
+    {
+        "id": "ae417966.2eaf28",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1398,
+        "y": 650,
+        "z": "740154b1.db9c44",
+        "wires": [
+            [
+                "874f6992.1d0f"
+            ]
+        ]
+    },
+    {
+        "id": "89aa82c1.c2aec8",
+        "type": "outcomeTrue",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1273,
+        "y": 604,
+        "z": "740154b1.db9c44",
+        "wires": [
+            [
+                "50eccb47.89161c"
+            ]
+        ]
+    },
+    {
+        "id": "50eccb47.89161c",
+        "type": "execute",
+        "name": "execute PCE in ccsdk/sli/core",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliTopologyUtils' method='computePath' >\n<parameter name=\"pnfs-pfx\" value='ccsdkTopopnfs'/>\n<parameter name=\"links-pfx\" value=\"ccsdkTopologicalLinks\"/>\n<parameter name=\"response-pfx\" value=\"otn-oof\"/>\n<parameter name=\"output-end-to-end-path\" value=\"false\"/>\n<!--<parameter name=\"src-node\" value=\"`$tmp.src.domainA.pnf-name`\"/>-->\n<!--<parameter name=\"dst-node\" value=\"`$tmp.dst.domainB.pnf-name`\"/>-->\n<parameter name=\"src-node\" value=\"`$tmp.pce-src-node`\"/>\n<parameter name=\"dst-node\" value=\"`$tmp.pce-dst-node`\"/>\n\n",
         "comments": "",
-        "x": 955,
+        "outputs": 1,
+        "x": 1647,
+        "y": 534,
+        "z": "740154b1.db9c44",
+        "wires": [
+            [
+                "e3a2c563.0a869",
+                "2d6f2f7c.332048",
+                "b9b4d723.6c8fd"
+            ]
+        ]
+    },
+    {
+        "id": "e3a2c563.0a869",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1892,
+        "y": 566,
+        "z": "740154b1.db9c44",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "2d6f2f7c.332048",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1899,
+        "y": 608,
+        "z": "740154b1.db9c44",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "b9b4d723.6c8fd",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1894,
         "y": 529,
-        "z": "6311a927.78727",
+        "z": "740154b1.db9c44",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "e1473f30.10032",
+        "type": "for",
+        "name": "for vidx..otn-oof.secondarySolutions_length[]",
+        "xml": "<for index='vidx' start='0' end='`$otn-oof.secondarySolutions_length`' >",
+        "comments": "",
+        "outputs": 1,
+        "x": 845,
+        "y": 2065,
+        "z": "740154b1.db9c44",
+        "wires": [
+            [
+                "c89ad3b7.0e216"
+            ]
+        ]
+    },
+    {
+        "id": "c89ad3b7.0e216",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 949.5272216796875,
+        "y": 2256.040771484375,
+        "z": "740154b1.db9c44",
+        "wires": [
+            [
+                "80fa0c9d.1054f",
+                "9a5ac465.6157d8",
+                "8065227b.cd4a2",
+                "b1aba60b.7f9e6",
+                "deccca97.268a9"
+            ]
+        ]
+    },
+    {
+        "id": "80fa0c9d.1054f",
+        "type": "set",
+        "name": "set otn-oof.link-name and etc.",
+        "xml": "<set>\n<parameter name='otn-oof.link-name' value='`$otn-oof.secondarySolutions[$vidx].original_link`' />\n<parameter name='otn-oof.start-node' value='`$otn-oof.secondarySolutions[$vidx].src_node`' />\n<parameter name='otn-oof.end-node' value='`$otn-oof.secondarySolutions[$vidx].dst_node`' />",
+        "comments": "",
+        "x": 1196.0272216796875,
+        "y": 2149.040771484375,
+        "z": "740154b1.db9c44",
+        "wires": []
+    },
+    {
+        "id": "deccca97.268a9",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 1162.5272216796875,
+        "y": 2337.7542724609375,
+        "z": "740154b1.db9c44",
+        "wires": [
+            [
+                "e3c2dcef.aae8f8",
+                "55fb0c7e.571584"
+            ]
+        ]
+    },
+    {
+        "id": "9a5ac465.6157d8",
+        "type": "set",
+        "name": "unset parameters",
+        "xml": "<set>\n<parameter name='otn-oof.link-name' value='' />\n<!--<parameter name='tmp.aai.cross-link' value='' />-->\n<parameter name='tmp.aai.cross-link.' value='' />\n<!--<parameter name='tmp.aai.cross-link.link-role' value='' />-->\n\n<parameter name='tmp.src-pnf-name' value='' />\n<parameter name='tmp.cross-link.' value='' />\n<parameter name='tmp.dst-pnf-name' value='' />\n<parameter name='tmp.aai.src-tp.' value='' />\n<parameter name='param-prefix-src-tp.' value='' />\n<parameter name='tmp.aai.src-pnf.' value='' />\n<parameter name='tmp.domain-A.network-id' value='' />\n<parameter name='tmp.aai.src-network-resource.' value='' />\n<parameter name='tmp.domain-A.ttp-id' value='' />\n<parameter name='tmp.aai.src-ttp.' value='' />\n\n<parameter name='tmp.aai.dst-tp.' value='' />\n<parameter name='param-prefix-dst-tp.' value='' />\n<parameter name='tmp.aai.dst-pnf.' value='' />\n<parameter name='tmp.domain-C.network-id' value='' />\n<parameter name='tmp.aai.dst-network-resource.' value='' />\n<parameter name='tmp.domain-C.ttp-id' value='' />\n<parameter name='tmp.aai.dst-ttp.' value='' />\n\n",
+        "comments": "",
+        "x": 1187.027099609375,
+        "y": 2077.7542724609375,
+        "z": "740154b1.db9c44",
+        "wires": []
+    },
+    {
+        "id": "8065227b.cd4a2",
+        "type": "set",
+        "name": "set src-ltpId",
+        "xml": "<set>\n<parameter name='tmp.cross-link.src-ltpId' value=\"`$otn-oof.secondarySolutions[$vidx].src_pinterface`\" />\n<parameter name='tmp.src-pnf-name' value=\"`$otn-oof.secondarySolutions[$vidx].src_node`\" />\n",
+        "comments": "",
+        "x": 1169.027099609375,
+        "y": 2208.7542724609375,
+        "z": "740154b1.db9c44",
+        "wires": []
+    },
+    {
+        "id": "b1aba60b.7f9e6",
+        "type": "set",
+        "name": "set dst-ltpId",
+        "xml": "<set>\n<parameter name='tmp.cross-link.dst-ltpId' value=\"`$otn-oof.secondarySolutions[$vidx].dst_pinterface`\" />\n<parameter name='tmp.dst-pnf-name' value=\"`$otn-oof.secondarySolutions[$vidx].dst_node`\" />\n\n\n",
+        "comments": "",
+        "x": 1170.027099609375,
+        "y": 2258.7542724609375,
+        "z": "740154b1.db9c44",
         "wires": []
+    },
+    {
+        "id": "6e12f41a.3aad64",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2688.0269775390625,
+        "y": 2072.7542724609375,
+        "z": "740154b1.db9c44",
+        "wires": [
+            [
+                "5b6bf151.2d756"
+            ]
+        ]
+    },
+    {
+        "id": "b5b16aa9.5e894",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2721.027099609375,
+        "y": 2130.7542724609375,
+        "z": "740154b1.db9c44",
+        "wires": [
+            [
+                "a9d16a27.d5676"
+            ]
+        ]
+    },
+    {
+        "id": "4a01d696.8c8118",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2724.027099609375,
+        "y": 2182.7542724609375,
+        "z": "740154b1.db9c44",
+        "wires": [
+            [
+                "c1a7727e.a603d8"
+            ]
+        ]
+    },
+    {
+        "id": "a9d16a27.d5676",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
+        "comments": "",
+        "x": 2906.027099609375,
+        "y": 2134.7542724609375,
+        "z": "740154b1.db9c44",
+        "wires": []
+    },
+    {
+        "id": "c1a7727e.a603d8",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
+        "comments": "",
+        "x": 2894.027099609375,
+        "y": 2185.7542724609375,
+        "z": "740154b1.db9c44",
+        "wires": []
+    },
+    {
+        "id": "40a1b2c.bbb3c4c",
+        "type": "for",
+        "name": "for each relationship",
+        "xml": "<for silentFailure='true' index='pintsidx' start='0' end='`$tmp.aai.src-tp.relationship-list.relationship_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3039.4097900390625,
+        "y": 2068.4140014648438,
+        "z": "740154b1.db9c44",
+        "wires": [
+            [
+                "64ce1fe.fe36ee"
+            ]
+        ]
+    },
+    {
+        "id": "64ce1fe.fe36ee",
+        "type": "switchNode",
+        "name": "switch related-to",
+        "xml": "<switch test='`$tmp.aai.src-tp.relationship-list.relationship[$pintsidx].related-to`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3291.4097900390625,
+        "y": 2065.4140014648438,
+        "z": "740154b1.db9c44",
+        "wires": [
+            [
+                "7222973f.63de28"
+            ]
+        ]
+    },
+    {
+        "id": "5b6bf151.2d756",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 2822.0269775390625,
+        "y": 2068.7542724609375,
+        "z": "740154b1.db9c44",
+        "wires": [
+            [
+                "40a1b2c.bbb3c4c"
+            ]
+        ]
+    },
+    {
+        "id": "55fb0c7e.571584",
+        "type": "get-resource",
+        "name": "get-resource src tp",
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"p-interface\" \n\t\tkey=\"pnf.pnf-name = $tmp.src-pnf-name\n\t\t    AND p-interface.interface-name = $tmp.cross-link.src-ltpId\"\n        pfx='tmp.aai.src-tp' local-only='false' >\n    \n        <!--AND depth = '0'\"-->\n\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2490.527099609375,
+        "y": 2111.7542724609375,
+        "z": "740154b1.db9c44",
+        "wires": [
+            [
+                "6e12f41a.3aad64",
+                "b5b16aa9.5e894",
+                "4a01d696.8c8118"
+            ]
+        ]
+    },
+    {
+        "id": "961bb541.fa238",
+        "type": "set",
+        "name": "set domain A node ttp-id",
+        "xml": "<set>\n<parameter name='tmp.domain-A.ttp-id' value=\"`$tmp.aai.src-tp.relationship-list.relationship[$pintsidx].relationship-data[0].relationship-value`\" />\n",
+        "comments": "",
+        "x": 4024.5269775390625,
+        "y": 1987.7542724609375,
+        "z": "740154b1.db9c44",
+        "wires": []
+    },
+    {
+        "id": "1c9ed8f.1f298a7",
+        "type": "get-resource",
+        "name": "get-resource src TTP",
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"tunnel-termination-point\" \n\t\tkey=\"tunnel-termination-point.ttp-id = $tmp.domain-A.ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.src-ttp' local-only='false' >\n\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4032.5269775390625,
+        "y": 2039.7542724609375,
+        "z": "740154b1.db9c44",
+        "wires": [
+            [
+                "c8884a5e.cff248"
+            ]
+        ]
+    },
+    {
+        "id": "c8884a5e.cff248",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4239.0269775390625,
+        "y": 2017.7542724609375,
+        "z": "740154b1.db9c44",
+        "wires": [
+            [
+                "ca161250.2600b"
+            ]
+        ]
+    },
+    {
+        "id": "7222973f.63de28",
+        "type": "outcome",
+        "name": "tunnel-termination-point",
+        "xml": "<outcome value='tunnel-termination-point'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3576.6954345703125,
+        "y": 2066.2357788085938,
+        "z": "740154b1.db9c44",
+        "wires": [
+            [
+                "9a193d4a.e0dcc8"
+            ]
+        ]
+    },
+    {
+        "id": "9a193d4a.e0dcc8",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 3803.5269775390625,
+        "y": 2054.7542724609375,
+        "z": "740154b1.db9c44",
+        "wires": [
+            [
+                "961bb541.fa238",
+                "1c9ed8f.1f298a7",
+                "8d06a9c9.1b85a",
+                "63176143.c85c48",
+                "cef3ca9d.2c104"
+            ]
+        ]
+    },
+    {
+        "id": "ca161250.2600b",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 4414.0269775390625,
+        "y": 2013.7542724609375,
+        "z": "740154b1.db9c44",
+        "wires": [
+            [
+                "258887d0.26df98"
+            ]
+        ]
+    },
+    {
+        "id": "8d06a9c9.1b85a",
+        "type": "get-resource",
+        "name": "get-resource src pnf",
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.src-pnf-name\"\n        pfx='tmp.aai.src-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3894.0269775390625,
+        "y": 1857.7542724609375,
+        "z": "740154b1.db9c44",
+        "wires": [
+            [
+                "9a5fd1c3.7d763",
+                "e3871f94.a28688",
+                "67939630.c5f78"
+            ]
+        ]
+    },
+    {
+        "id": "9a5fd1c3.7d763",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4089.527099609375,
+        "y": 1809.7542724609375,
+        "z": "740154b1.db9c44",
+        "wires": [
+            [
+                "7fb21e6a.21f63"
+            ]
+        ]
+    },
+    {
+        "id": "e3871f94.a28688",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4081.527099609375,
+        "y": 1864.7542724609375,
+        "z": "740154b1.db9c44",
+        "wires": [
+            [
+                "3c75373d.b0767"
+            ]
+        ]
+    },
+    {
+        "id": "67939630.c5f78",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4086.527099609375,
+        "y": 1921.7542724609375,
+        "z": "740154b1.db9c44",
+        "wires": [
+            [
+                "8ad73c5e.3d1f"
+            ]
+        ]
+    },
+    {
+        "id": "8ad73c5e.3d1f",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
+        "comments": "",
+        "x": 4238.527099609375,
+        "y": 1922.7542724609375,
+        "z": "740154b1.db9c44",
+        "wires": []
+    },
+    {
+        "id": "3c75373d.b0767",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
+        "comments": "",
+        "x": 4249.527099609375,
+        "y": 1867.7542724609375,
+        "z": "740154b1.db9c44",
+        "wires": []
+    },
+    {
+        "id": "7fb21e6a.21f63",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 4233.909423828125,
+        "y": 1807.4099426269531,
+        "z": "740154b1.db9c44",
+        "wires": [
+            [
+                "a55467d3.0aaea8",
+                "87797c29.69366"
+            ]
+        ]
+    },
+    {
+        "id": "a55467d3.0aaea8",
+        "type": "set",
+        "name": "set domain A node-id and tpn",
+        "xml": "<set>\n<parameter name='domain-A.node-id' value=\"`$tmp.aai.src-pnf.pnf-id`\" />\n<parameter name='domain-A.tpn' value='1' />\n\n\n<parameter name='`tmp.otninfoProtect[$vidx].dstPort.dst-access-node-id`' value=\"`$tmp.aai.src-pnf.pnf-id`\" />\n<parameter name='`tmp.otninfoProtect_length`' value='`$vidx + 1`' />",
+        "comments": "",
+        "x": 4459.0269775390625,
+        "y": 1762.7542724609375,
+        "z": "740154b1.db9c44",
+        "wires": []
+    },
+    {
+        "id": "63176143.c85c48",
+        "type": "break",
+        "name": "break",
+        "xml": "<break>\n",
+        "comments": "",
+        "x": 3981.0269775390625,
+        "y": 2104.7542724609375,
+        "z": "740154b1.db9c44",
+        "wires": []
+    },
+    {
+        "id": "87797c29.69366",
+        "type": "for",
+        "name": "for each relationship",
+        "xml": "<for silentFailure='true' index='pvidx' start='0' end='`$tmp.aai.src-pnf.relationship-list.relationship_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4418.0269775390625,
+        "y": 1821.7542724609375,
+        "z": "740154b1.db9c44",
+        "wires": [
+            [
+                "58b11002.4131b"
+            ]
+        ]
+    },
+    {
+        "id": "cef3ca9d.2c104",
+        "type": "execute",
+        "name": "execute split tp-id to get pnf-name",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<!--<parameter name=\"original_string\" value='`$tmp.aai.src-tp`'/>-->\n<parameter name=\"original_string\" value='`$tmp.aai.src-tp.interface-name`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-src-tp\"/>\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3922.0269775390625,
+        "y": 1651.7542724609375,
+        "z": "740154b1.db9c44",
+        "wires": [
+            [
+                "51326991.7f2898",
+                "d61d1517.27825"
+            ]
+        ]
+    },
+    {
+        "id": "d61d1517.27825",
+        "type": "failure",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4143.0269775390625,
+        "y": 1619.7542724609375,
+        "z": "740154b1.db9c44",
+        "wires": [
+            [
+                "8ed0c03d.565928"
+            ]
+        ]
+    },
+    {
+        "id": "51326991.7f2898",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4143.0269775390625,
+        "y": 1666.7542724609375,
+        "z": "740154b1.db9c44",
+        "wires": [
+            [
+                "a6e04e00.ffd96"
+            ]
+        ]
+    },
+    {
+        "id": "8ed0c03d.565928",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 4308.0269775390625,
+        "y": 1616.7542724609375,
+        "z": "740154b1.db9c44",
+        "wires": [
+            [
+                "14cffe9c.903701"
+            ]
+        ]
+    },
+    {
+        "id": "14cffe9c.903701",
+        "type": "set",
+        "name": "set domain-A.ltpId",
+        "xml": "<set>\n<parameter name='domain-A.ltpId' value='`$param-prefix-src-tp[$param-prefix-src-tp_length -1]`' />\n\n<parameter name='`tmp.otninfoProtect[$vidx].dstPort.dst-ltp-id`' value=\"`$param-prefix-src-tp[$param-prefix-src-tp_length -1]`\" />\n<parameter name='`tmp.otninfoProtect_length`' value='`$vidx + 1`' />",
+        "comments": "",
+        "x": 4490.0269775390625,
+        "y": 1620.7542724609375,
+        "z": "740154b1.db9c44",
+        "wires": []
+    },
+    {
+        "id": "a6e04e00.ffd96",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
+        "comments": "",
+        "x": 4310.0269775390625,
+        "y": 1666.7542724609375,
+        "z": "740154b1.db9c44",
+        "wires": []
+    },
+    {
+        "id": "cc685b27.bd32f",
+        "type": "comment",
+        "name": "Not useful anymore",
+        "info": "this domain-A.ltpId is not used anymore",
+        "comments": "",
+        "x": 4533.0269775390625,
+        "y": 1596.7542724609375,
+        "z": "740154b1.db9c44",
+        "wires": []
+    },
+    {
+        "id": "258887d0.26df98",
+        "type": "set",
+        "name": "set domain A tunnel tp ip",
+        "xml": "<set>\n<parameter name='domain-A.tunnel-tp-id' value=\"`$tmp.aai.src-ttp.tunnel-tp-id`\" />\n\n<parameter name='`tmp.otninfoProtect[$vidx].dstPort.dst-tunnel-tp-id`' value=\"`$tmp.aai.src-ttp.tunnel-tp-id`\" />\n<parameter name='`tmp.otninfoProtect_length`' value='`$vidx + 1`' />\n",
+        "comments": "",
+        "x": 4675.0269775390625,
+        "y": 2010.7542724609375,
+        "z": "740154b1.db9c44",
+        "wires": []
+    },
+    {
+        "id": "7878d7b8.ad7df",
+        "type": "outcome",
+        "name": "network-resource",
+        "xml": "<outcome value='network-resource'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4816.0269775390625,
+        "y": 1825.7542724609375,
+        "z": "740154b1.db9c44",
+        "wires": [
+            [
+                "346dd4d8.896974"
+            ]
+        ]
+    },
+    {
+        "id": "58b11002.4131b",
+        "type": "switchNode",
+        "name": "switch related-to",
+        "xml": "<switch test='`$tmp.aai.src-pnf.relationship-list.relationship[$pvidx].related-to`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4613.0269775390625,
+        "y": 1821.7542724609375,
+        "z": "740154b1.db9c44",
+        "wires": [
+            [
+                "7878d7b8.ad7df"
+            ]
+        ]
+    },
+    {
+        "id": "346dd4d8.896974",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 4993.0269775390625,
+        "y": 1817.7542724609375,
+        "z": "740154b1.db9c44",
+        "wires": [
+            [
+                "dd0e1ad2.389f1",
+                "34802cc8.f036dc",
+                "83c1d591.e453a"
+            ]
+        ]
+    },
+    {
+        "id": "dd0e1ad2.389f1",
+        "type": "set",
+        "name": "set domain A network-id",
+        "xml": "<set>\n<parameter name='tmp.domain-A.network-id' value=\"`$tmp.aai.src-pnf.relationship-list.relationship[$pvidx].relationship-data[0].relationship-value`\" />\n",
+        "comments": "",
+        "x": 5208.0269775390625,
+        "y": 1798.7542724609375,
+        "z": "740154b1.db9c44",
+        "wires": []
+    },
+    {
+        "id": "34802cc8.f036dc",
+        "type": "get-resource",
+        "name": "get-resource src network-resource",
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"network-resource\" \n\t\tkey=\"network-resource.network-id = $tmp.domain-A.network-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.src-network-resource' local-only='false' >\n\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5225.0269775390625,
+        "y": 1862.7542724609375,
+        "z": "740154b1.db9c44",
+        "wires": [
+            [
+                "c18da62b.d46198"
+            ]
+        ]
+    },
+    {
+        "id": "c18da62b.d46198",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5448.5269775390625,
+        "y": 1863.7542724609375,
+        "z": "740154b1.db9c44",
+        "wires": [
+            [
+                "2a6e1402.9f26d4"
+            ]
+        ]
+    },
+    {
+        "id": "2a6e1402.9f26d4",
+        "type": "set",
+        "name": "set domain A network-id, topo-id, client-id, etc",
+        "xml": "<set>\n<parameter name='domain-A.network-id' value=\"`$tmp.aai.src-network-resource.network-id`\" />\n<parameter name='domain-A.provider-id' value=\"`$tmp.aai.src-network-resource.provider-id`\" />\n<parameter name='domain-A.client-id' value=\"`$tmp.aai.src-network-resource.client-id`\" />\n<parameter name='domain-A.te-topo-id' value=\"`$tmp.aai.src-network-resource.te-topo-id`\" />\n<parameter name='domain-A.network-type' value=\"`$tmp.aai.src-network-resource.network-type`\" />\n\n\n<parameter name='`tmp.otninfoProtect[$vidx].dstPort.dst-access-network-id`' value=\"`$tmp.aai.src-network-resource.network-id`\" />\n<parameter name='`tmp.otninfoProtect[$vidx].dstPort.dst-access-provider-id`' value=\"`$tmp.aai.src-network-resource.provider-id`\" />\n<parameter name='`tmp.otninfoProtect[$vidx].dstPort.dst-access-client-id`' value=\"`$tmp.aai.src-network-resource.client-id`\" />\n<parameter name='`tmp.otninfoProtect[$vidx].dstPort.dst-access-topology-id`' value=\"`$tmp.aai.src-network-resource.te-topo-id`\" />\n<parameter name='`tmp.otninfoProtect[$vidx].dstPort.dst-access-network-type`' value=\"`$tmp.aai.src-network-resource.network-type`\" />\n<parameter name='`tmp.otninfoProtect`' value='`$vidx + 1`' />\n\n\n",
+        "comments": "",
+        "x": 5713.0269775390625,
+        "y": 1852.7542724609375,
+        "z": "740154b1.db9c44",
+        "wires": []
+    },
+    {
+        "id": "83c1d591.e453a",
+        "type": "break",
+        "name": "break",
+        "xml": "<break>\n",
+        "comments": "",
+        "x": 5152.0269775390625,
+        "y": 1915.7542724609375,
+        "z": "740154b1.db9c44",
+        "wires": []
+    },
+    {
+        "id": "57f7d786.5549e8",
+        "type": "break",
+        "name": "break",
+        "xml": "<break>\n",
+        "comments": "",
+        "x": 2363.5269775390625,
+        "y": 2581.7542724609375,
+        "z": "740154b1.db9c44",
+        "wires": []
+    },
+    {
+        "id": "e3c2dcef.aae8f8",
+        "type": "get-resource",
+        "name": "get-resource dst tp",
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"p-interface\" \n\t\tkey=\"pnf.pnf-name = $tmp.dst-pnf-name\n\t\t    AND p-interface.interface-name = $tmp.cross-link.dst-ltpId\"\n        pfx='tmp.aai.dst-tp' local-only='false' >\n    \n        <!--AND depth = '0'\"-->\n\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2444.527099609375,
+        "y": 2477.7542724609375,
+        "z": "740154b1.db9c44",
+        "wires": [
+            [
+                "8b9fb321.70992",
+                "205abd09.598d9a",
+                "79e9c51.a089fbc"
+            ]
+        ]
+    },
+    {
+        "id": "8b9fb321.70992",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2667.0269775390625,
+        "y": 2619.7542724609375,
+        "z": "740154b1.db9c44",
+        "wires": [
+            [
+                "6279b5de.cc4ff4"
+            ]
+        ]
+    },
+    {
+        "id": "205abd09.598d9a",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2651.0269775390625,
+        "y": 2670.7542724609375,
+        "z": "740154b1.db9c44",
+        "wires": [
+            [
+                "46e04c65.2008ac"
+            ]
+        ]
+    },
+    {
+        "id": "79e9c51.a089fbc",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2654.0269775390625,
+        "y": 2722.7542724609375,
+        "z": "740154b1.db9c44",
+        "wires": [
+            [
+                "76686faa.840d7"
+            ]
+        ]
+    },
+    {
+        "id": "76686faa.840d7",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
+        "comments": "",
+        "x": 2824.0269775390625,
+        "y": 2725.7542724609375,
+        "z": "740154b1.db9c44",
+        "wires": []
+    },
+    {
+        "id": "46e04c65.2008ac",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
+        "comments": "",
+        "x": 2836.0269775390625,
+        "y": 2674.7542724609375,
+        "z": "740154b1.db9c44",
+        "wires": []
+    },
+    {
+        "id": "8589fea6.82485",
+        "type": "for",
+        "name": "for each relationship",
+        "xml": "<for silentFailure='true' index='pintdidx' start='0' end='`$tmp.aai.dst-tp.relationship-list.relationship_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3023.4097900390625,
+        "y": 2630.4140014648438,
+        "z": "740154b1.db9c44",
+        "wires": [
+            [
+                "12c89e29.9e0a4a"
+            ]
+        ]
+    },
+    {
+        "id": "12c89e29.9e0a4a",
+        "type": "switchNode",
+        "name": "switch related-to",
+        "xml": "<switch test='`$tmp.aai.dst-tp.relationship-list.relationship[$pintdidx].related-to`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3266.4097900390625,
+        "y": 2629.4140014648438,
+        "z": "740154b1.db9c44",
+        "wires": [
+            [
+                "441cee99.bfaf"
+            ]
+        ]
+    },
+    {
+        "id": "6279b5de.cc4ff4",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 2813.0269775390625,
+        "y": 2610.7542724609375,
+        "z": "740154b1.db9c44",
+        "wires": [
+            [
+                "8589fea6.82485"
+            ]
+        ]
+    },
+    {
+        "id": "441cee99.bfaf",
+        "type": "outcome",
+        "name": "tunnel-termination-point",
+        "xml": "<outcome value='tunnel-termination-point'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3522.6954345703125,
+        "y": 2629.2357788085938,
+        "z": "740154b1.db9c44",
+        "wires": [
+            [
+                "ee93bb7d.d7a6"
+            ]
+        ]
+    },
+    {
+        "id": "ee93bb7d.d7a6",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 3822.5269775390625,
+        "y": 2626.7542724609375,
+        "z": "740154b1.db9c44",
+        "wires": [
+            [
+                "7f181100.6e913",
+                "d5405c3b.2180e",
+                "a9d72cbf.011738",
+                "aba88a5.2928878",
+                "ce4f5014.a0532"
+            ]
+        ]
+    },
+    {
+        "id": "7f181100.6e913",
+        "type": "set",
+        "name": "set domain C node ttp-id",
+        "xml": "<set>\n<parameter name='tmp.domain-C.ttp-id' value=\"`$tmp.aai.dst-tp.relationship-list.relationship[$pintdidx].relationship-data[0].relationship-value`\" />\n",
+        "comments": "",
+        "x": 4064.5269775390625,
+        "y": 2580.7542724609375,
+        "z": "740154b1.db9c44",
+        "wires": []
+    },
+    {
+        "id": "d5405c3b.2180e",
+        "type": "get-resource",
+        "name": "get-resource dst TTP",
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"tunnel-termination-point\" \n\t\tkey=\"tunnel-termination-point.ttp-id = $tmp.domain-C.ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.dst-ttp' local-only='false' >\n\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4054.5269775390625,
+        "y": 2631.7542724609375,
+        "z": "740154b1.db9c44",
+        "wires": [
+            [
+                "d43d5001.cef3c8"
+            ]
+        ]
+    },
+    {
+        "id": "d43d5001.cef3c8",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4242.0269775390625,
+        "y": 2629.7542724609375,
+        "z": "740154b1.db9c44",
+        "wires": [
+            [
+                "e0b1256e.3d7278"
+            ]
+        ]
+    },
+    {
+        "id": "e0b1256e.3d7278",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 4431.0269775390625,
+        "y": 2618.7542724609375,
+        "z": "740154b1.db9c44",
+        "wires": [
+            [
+                "2dbd68c.e7c9e98"
+            ]
+        ]
+    },
+    {
+        "id": "aba88a5.2928878",
+        "type": "get-resource",
+        "name": "get-resource dst pnf",
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.dst-pnf-name\"\n        pfx='tmp.aai.dst-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3891.0269775390625,
+        "y": 2460.7542724609375,
+        "z": "740154b1.db9c44",
+        "wires": [
+            [
+                "dc3d15fa.81276",
+                "84f6f122.84593",
+                "df513d92.eaab28"
+            ]
+        ]
+    },
+    {
+        "id": "df513d92.eaab28",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4086.527099609375,
+        "y": 2412.7542724609375,
+        "z": "740154b1.db9c44",
+        "wires": [
+            [
+                "992d2ff.35fffd"
+            ]
+        ]
+    },
+    {
+        "id": "84f6f122.84593",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4078.527099609375,
+        "y": 2467.7542724609375,
+        "z": "740154b1.db9c44",
+        "wires": [
+            [
+                "326a3ad9.081e7e"
+            ]
+        ]
+    },
+    {
+        "id": "dc3d15fa.81276",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4083.527099609375,
+        "y": 2524.7542724609375,
+        "z": "740154b1.db9c44",
+        "wires": [
+            [
+                "a9233954.28abb8"
+            ]
+        ]
+    },
+    {
+        "id": "992d2ff.35fffd",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 4230.909423828125,
+        "y": 2410.409942626953,
+        "z": "740154b1.db9c44",
+        "wires": [
+            [
+                "faa22dd5.212148",
+                "9949d4ef.001688"
+            ]
+        ]
+    },
+    {
+        "id": "326a3ad9.081e7e",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
+        "comments": "",
+        "x": 4246.527099609375,
+        "y": 2470.7542724609375,
+        "z": "740154b1.db9c44",
+        "wires": []
+    },
+    {
+        "id": "a9233954.28abb8",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
+        "comments": "",
+        "x": 4235.527099609375,
+        "y": 2525.7542724609375,
+        "z": "740154b1.db9c44",
+        "wires": []
+    },
+    {
+        "id": "faa22dd5.212148",
+        "type": "set",
+        "name": "set domain C node-id and tpn",
+        "xml": "<set>\n<parameter name='domain-C.node-id' value=\"`$tmp.aai.dst-pnf.pnf-id`\" />\n<parameter name='domain-C.tpn' value='1' />\n\n\n<parameter name='`tmp.otninfoProtect[$vidx + 1].srcPort.src-access-node-id`' value=\"`$tmp.aai.dst-pnf.pnf-id`\" />\n<parameter name='`tmp.otninfoProtect_length`' value='`$vidx + 2`' />",
+        "comments": "",
+        "x": 4440.0269775390625,
+        "y": 2377.7542724609375,
+        "z": "740154b1.db9c44",
+        "wires": []
+    },
+    {
+        "id": "a9d72cbf.011738",
+        "type": "break",
+        "name": "break",
+        "xml": "<break>\n",
+        "comments": "",
+        "x": 4010.0269775390625,
+        "y": 2672.7542724609375,
+        "z": "740154b1.db9c44",
+        "wires": []
+    },
+    {
+        "id": "9949d4ef.001688",
+        "type": "for",
+        "name": "for each relationship",
+        "xml": "<for silentFailure='true' index='mvidx' start='0' end='`$tmp.aai.dst-pnf.relationship-list.relationship_length`' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4419.0269775390625,
+        "y": 2428.7542724609375,
+        "z": "740154b1.db9c44",
+        "wires": [
+            [
+                "b61d11ba.55b168"
+            ]
+        ]
+    },
+    {
+        "id": "ce4f5014.a0532",
+        "type": "execute",
+        "name": "execute split tp-id to get pnf-name",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.dst-tp`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-dst-tp\"/>\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3930.0269775390625,
+        "y": 2275.7542724609375,
+        "z": "740154b1.db9c44",
+        "wires": [
+            [
+                "3a973be3.1f749c",
+                "bccf88ee.38b55"
+            ]
+        ]
+    },
+    {
+        "id": "bccf88ee.38b55",
+        "type": "failure",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4151.0269775390625,
+        "y": 2243.7542724609375,
+        "z": "740154b1.db9c44",
+        "wires": [
+            [
+                "f5e2899d.2e99e8"
+            ]
+        ]
+    },
+    {
+        "id": "3a973be3.1f749c",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4151.0269775390625,
+        "y": 2290.7542724609375,
+        "z": "740154b1.db9c44",
+        "wires": [
+            [
+                "c9477994.8451e8"
+            ]
+        ]
+    },
+    {
+        "id": "f5e2899d.2e99e8",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 4316.0269775390625,
+        "y": 2240.7542724609375,
+        "z": "740154b1.db9c44",
+        "wires": [
+            [
+                "aecbcfe0.6e5048"
+            ]
+        ]
+    },
+    {
+        "id": "aecbcfe0.6e5048",
+        "type": "set",
+        "name": "set domain-C.ltpId",
+        "xml": "<set>\n<parameter name='domain-C.ltpId' value='`$param-prefix-dst-tp[$param-prefix-dst-tp_length -1]`' />\n\n<parameter name='`tmp.otninfoProtect[$vidx + 1].srcPort.src-ltp-id`' value=\"`$param-prefix-dst-tp[$param-prefix-dst-tp_length -1]`\" />\n<parameter name='`tmp.otninfoProtect_length`' value='`$vidx + 2`' />",
+        "comments": "",
+        "x": 4512.0269775390625,
+        "y": 2237.7542724609375,
+        "z": "740154b1.db9c44",
+        "wires": []
+    },
+    {
+        "id": "c9477994.8451e8",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
+        "comments": "",
+        "x": 4318.0269775390625,
+        "y": 2290.7542724609375,
+        "z": "740154b1.db9c44",
+        "wires": []
+    },
+    {
+        "id": "abda304.2cd6cd",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 5032.5269775390625,
+        "y": 2430.7542724609375,
+        "z": "740154b1.db9c44",
+        "wires": [
+            [
+                "5c6e614a.9cad28",
+                "37c15682.dfe52a",
+                "ea1db027.01377"
+            ]
+        ]
+    },
+    {
+        "id": "8a710596.36ea6",
+        "type": "outcome",
+        "name": "network-resource",
+        "xml": "<outcome value='network-resource'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4819.5269775390625,
+        "y": 2429.7542724609375,
+        "z": "740154b1.db9c44",
+        "wires": [
+            [
+                "abda304.2cd6cd"
+            ]
+        ]
+    },
+    {
+        "id": "2dbd68c.e7c9e98",
+        "type": "set",
+        "name": "set domain C tunnel tp id",
+        "xml": "<set>\n<parameter name='domain-C.tunnel-tp-id' value=\"`$tmp.aai.dst-ttp.tunnel-tp-id`\" />\n\n<parameter name='`tmp.otninfoProtect[$vidx + 1].srcPort.src-tunnel-tp-id`' value=\"`$tmp.aai.dst-ttp.tunnel-tp-id`\" />\n<parameter name='`tmp.otninfoProtect_length`' value='`$vidx + 2`' />",
+        "comments": "",
+        "x": 4664.0269775390625,
+        "y": 2617.7542724609375,
+        "z": "740154b1.db9c44",
+        "wires": []
+    },
+    {
+        "id": "b61d11ba.55b168",
+        "type": "switchNode",
+        "name": "switch related-to",
+        "xml": "<switch test='`$tmp.aai.dst-pnf.relationship-list.relationship[$mvidx].related-to`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4614.0269775390625,
+        "y": 2428.7542724609375,
+        "z": "740154b1.db9c44",
+        "wires": [
+            [
+                "8a710596.36ea6"
+            ]
+        ]
+    },
+    {
+        "id": "ea1db027.01377",
+        "type": "break",
+        "name": "break",
+        "xml": "<break>\n",
+        "comments": "",
+        "x": 5238.0269775390625,
+        "y": 2508.7542724609375,
+        "z": "740154b1.db9c44",
+        "wires": []
+    },
+    {
+        "id": "12cd95a6.c3a7d2",
+        "type": "comment",
+        "name": "Not useful anymore",
+        "info": "this domain-B.ltpId is not used anymore",
+        "comments": "",
+        "x": 4555.0269775390625,
+        "y": 2209.7542724609375,
+        "z": "740154b1.db9c44",
+        "wires": []
+    },
+    {
+        "id": "5c6e614a.9cad28",
+        "type": "set",
+        "name": "set domain C network-id",
+        "xml": "<set>\n<parameter name='tmp.domain-C.network-id' value=\"`$tmp.aai.dst-pnf.relationship-list.relationship[$mvidx].relationship-data[0].relationship-value`\" />\n",
+        "comments": "",
+        "x": 5302.5269775390625,
+        "y": 2406.7542724609375,
+        "z": "740154b1.db9c44",
+        "wires": []
+    },
+    {
+        "id": "37c15682.dfe52a",
+        "type": "get-resource",
+        "name": "get-resource dst network-resource",
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"network-resource\" \n\t\tkey=\"network-resource.network-id = $tmp.domain-C.network-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.dst-network-resource' local-only='false' >\n\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5312.5269775390625,
+        "y": 2452.7542724609375,
+        "z": "740154b1.db9c44",
+        "wires": [
+            [
+                "826de71a.33a62"
+            ]
+        ]
+    },
+    {
+        "id": "826de71a.33a62",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5528.0269775390625,
+        "y": 2443.7542724609375,
+        "z": "740154b1.db9c44",
+        "wires": [
+            [
+                "2f251a3.863a066"
+            ]
+        ]
+    },
+    {
+        "id": "2f251a3.863a066",
+        "type": "set",
+        "name": "set domain B network-id, topo-id, client-id, etc",
+        "xml": "<set>\n<parameter name='domain-C.network-id' value=\"`$tmp.aai.dst-network-resource.network-id`\" />\n<parameter name='domain-C.provider-id' value=\"`$tmp.aai.dst-network-resource.provider-id`\" />\n<parameter name='domain-C.client-id' value=\"`$tmp.aai.dst-network-resource.client-id`\" />\n<parameter name='domain-C.te-topo-id' value=\"`$tmp.aai.dst-network-resource.te-topo-id`\" />\n<parameter name='domain-C.network-type' value=\"`$tmp.aai.dst-network-resource.network-type`\" />\n\n\n<parameter name='`tmp.otninfoProtect[$vidx + 1].srcPort.src-access-network-id`' value=\"`$tmp.aai.dst-network-resource.network-id`\" />\n<parameter name='`tmp.otninfoProtect[$vidx + 1].srcPort.src-access-provider-id`' value=\"`$tmp.aai.dst-network-resource.provider-id`\" />\n<parameter name='`tmp.otninfoProtect[$vidx + 1].srcPort.src-access-client-id`' value=\"`$tmp.aai.dst-network-resource.client-id`\" />\n<parameter name='`tmp.otninfoProtect[$vidx + 1].srcPort.src-access-topology-id`' value=\"`$tmp.aai.dst-network-resource.te-topo-id`\" />\n<parameter name='`tmp.otninfoProtect[$vidx + 1].srcPort.src-access-network-type`' value=\"`$tmp.aai.dst-network-resource.network-type`\" />\n<parameter name='`tmp.otninfoProtect`' value='`$vidx + 2`' />",
+        "comments": "",
+        "x": 5782.5269775390625,
+        "y": 2449.7542724609375,
+        "z": "740154b1.db9c44",
+        "wires": []
+    },
+    {
+        "id": "825fbafd.18c12",
+        "type": "switchNode",
+        "name": "switch $hasSecondary",
+        "xml": "<switch test='`$hasSecondary`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2689.199951171875,
+        "y": 268.0833282470703,
+        "z": "740154b1.db9c44",
+        "wires": [
+            [
+                "88dc17ca.c3603",
+                "d63ef024.cfef08"
+            ]
+        ]
+    },
+    {
+        "id": "88dc17ca.c3603",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2880.199951171875,
+        "y": 272.0833282470703,
+        "z": "740154b1.db9c44",
+        "wires": [
+            [
+                "85988dae.be2118"
+            ]
+        ]
+    },
+    {
+        "id": "85988dae.be2118",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 3007.199951171875,
+        "y": 271.0833282470703,
+        "z": "740154b1.db9c44",
+        "wires": [
+            [
+                "1486884a.a84de"
+            ]
+        ]
+    },
+    {
+        "id": "1486884a.a84de",
+        "type": "switchNode",
+        "name": "switch 2-ROOTS in same domain?",
+        "xml": "<!-- This is to check the provider-id of ROOt and SECONDARY-ROOT-->\n<switch test='`$param-prefix-domainB[$param-prefix-domainB_length -9] == $param-prefix-domainC[$param-prefix-domainC_length -9]`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3230.083251953125,
+        "y": 265.9666442871094,
+        "z": "740154b1.db9c44",
+        "wires": [
+            [
+                "baa46e2a.1397b",
+                "5009aa1a.49b42c"
+            ]
+        ]
+    },
+    {
+        "id": "baa46e2a.1397b",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3437.083251953125,
+        "y": 202.96664428710938,
+        "z": "740154b1.db9c44",
+        "wires": [
+            [
+                "9723b3.a56f645"
+            ]
+        ]
+    },
+    {
+        "id": "5009aa1a.49b42c",
+        "type": "outcomeTrue",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3367.083251953125,
+        "y": 393.9666748046875,
+        "z": "740154b1.db9c44",
+        "wires": [
+            [
+                "9e442fe7.197ca8"
+            ]
+        ]
+    },
+    {
+        "id": "9723b3.a56f645",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 3579.083251953125,
+        "y": 192.96664428710938,
+        "z": "740154b1.db9c44",
+        "wires": [
+            [
+                "74ae9ae0.0891cc",
+                "a08d8202.0e48d8"
+            ]
+        ]
+    },
+    {
+        "id": "9e442fe7.197ca8",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 3493.083251953125,
+        "y": 393.9666748046875,
+        "z": "740154b1.db9c44",
+        "wires": [
+            [
+                "7af5d9ce.fbbb7"
+            ]
+        ]
+    },
+    {
+        "id": "821af63c.9d499",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 2489.966796875,
+        "y": 271.0833435058594,
+        "z": "740154b1.db9c44",
+        "wires": [
+            [
+                "825fbafd.18c12"
+            ]
+        ]
+    },
+    {
+        "id": "d63ef024.cfef08",
+        "type": "outcomeTrue",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2884.933349609375,
+        "y": 224.0833282470703,
+        "z": "740154b1.db9c44",
+        "wires": [
+            [
+                "3d7e803.580f08"
+            ]
+        ]
+    },
+    {
+        "id": "74ae9ae0.0891cc",
+        "type": "set",
+        "name": "set otnTopoIdDst",
+        "xml": "<set>\n<parameter name='otnTopoIdDst' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />\n",
+        "comments": "",
+        "x": 3737.666748046875,
+        "y": 172.0833282470703,
+        "z": "740154b1.db9c44",
+        "wires": []
+    },
+    {
+        "id": "a08d8202.0e48d8",
+        "type": "set",
+        "name": "set otnTopoIdDstBackup",
+        "xml": "<set>\n<parameter name='otnTopoIdDstBackup' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />\n",
+        "comments": "",
+        "x": 3759.666748046875,
+        "y": 220.0833282470703,
+        "z": "740154b1.db9c44",
+        "wires": []
+    },
+    {
+        "id": "7af5d9ce.fbbb7",
+        "type": "set",
+        "name": "set otnTopoIdDst",
+        "xml": "<set>\n<parameter name='otnTopoIdDst' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />\n",
+        "comments": "",
+        "x": 3663.666748046875,
+        "y": 394.0833435058594,
+        "z": "740154b1.db9c44",
+        "wires": []
+    },
+    {
+        "id": "dccf569f.2f16c",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 2558.683349609375,
+        "y": 345.8833312988281,
+        "z": "740154b1.db9c44",
+        "wires": [
+            [
+                "bb64af5d.7bf708"
+            ]
+        ]
+    },
+    {
+        "id": "bb64af5d.7bf708",
+        "type": "switchNode",
+        "name": "switch $hasSecondary",
+        "xml": "<switch test='`$hasSecondary`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2757.91650390625,
+        "y": 342.88331604003906,
+        "z": "740154b1.db9c44",
+        "wires": [
+            [
+                "c6cf934.ca6387"
+            ]
+        ]
+    },
+    {
+        "id": "c6cf934.ca6387",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2948.91650390625,
+        "y": 346.88331604003906,
+        "z": "740154b1.db9c44",
+        "wires": [
+            [
+                "84398364.2e39d"
+            ]
+        ]
+    },
+    {
+        "id": "84398364.2e39d",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 3075.91650390625,
+        "y": 345.88331604003906,
+        "z": "740154b1.db9c44",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "cdc2b636.8886c8",
+        "type": "switchNode",
+        "name": "switch secondarySolutions empty?",
+        "xml": "<switch test='`length($otn-oof.secondarySolutions) == 0`'>\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1419.566650390625,
+        "y": 1649.566650390625,
+        "z": "740154b1.db9c44",
+        "wires": [
+            [
+                "930ebbc8.d33d1",
+                "e9824426.b9b25"
+            ]
+        ]
+    },
+    {
+        "id": "930ebbc8.d33d1",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1645.4666748046875,
+        "y": 1621.566650390625,
+        "z": "740154b1.db9c44",
+        "wires": [
+            [
+                "82cb40cb.6ece7"
+            ]
+        ]
+    },
+    {
+        "id": "e9824426.b9b25",
+        "type": "outcomeFalse",
+        "name": "false",
+        "xml": "<outcome value='false'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1643.4666748046875,
+        "y": 1671.566650390625,
+        "z": "740154b1.db9c44",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "82cb40cb.6ece7",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1787.566650390625,
+        "y": 1621.566650390625,
+        "z": "740154b1.db9c44",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "7d4b4351.930cbc",
+        "type": "switchNode",
+        "name": "switch $hasSecondary",
+        "xml": "<switch test='`$hasSecondary`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 798.4666748046875,
+        "y": 1838.566650390625,
+        "z": "740154b1.db9c44",
+        "wires": [
+            [
+                "9310b044.9b3228"
+            ]
+        ]
+    },
+    {
+        "id": "9310b044.9b3228",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 984.4666748046875,
+        "y": 1839.566650390625,
+        "z": "740154b1.db9c44",
+        "wires": [
+            [
+                "40a7bba6.ae5b54"
+            ]
+        ]
+    },
+    {
+        "id": "40a7bba6.ae5b54",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1114.4666748046875,
+        "y": 1839.566650390625,
+        "z": "740154b1.db9c44",
+        "wires": [
+            [
+                "e1473f30.10032"
+            ]
+        ]
     }
 ]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/resources/graph.versions b/platform-logic/generic-resource-api/src/main/resources/graph.versions
index 5c897a5b..fec2db13 100755
--- a/platform-logic/generic-resource-api/src/main/resources/graph.versions
+++ b/platform-logic/generic-resource-api/src/main/resources/graph.versions
@@ -292,9 +292,11 @@ GENERIC-RESOURCE-API performance-data-collector ${project.version} sync
 GENERIC-RESOURCE-API cll-vnf-topology-operation-cll-create-clean ${project.version} sync
 GENERIC-RESOURCE-API cll-vnf-topology-operation-cll-F1 ${project.version} sync
 GENERIC-RESOURCE-API cll-vnf-topology-operation-cll-F1-Activate ${project.version} sync
+GENERIC-RESOURCE-API cll-vnf-topology-operation-cll-F1-Activate-w-Protection ${project.version} sync
 GENERIC-RESOURCE-API cll-vnf-topology-operation-cll-logic ${project.version} sync
 GENERIC-RESOURCE-API cll-vnf-topology-operation-cll-helper-find-connectivity ${project.version} sync
 GENERIC-RESOURCE-API cll-vnf-topology-operation-cll-helper-find-ROOT-conn ${project.version} sync
+GENERIC-RESOURCE-API cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn ${project.version} sync
 GENERIC-RESOURCE-API cll-vnf-topology-operation-find-maximum-used-tpn ${project.version} sync
 GENERIC-RESOURCE-API cll-vnf-topology-operation-cll-delete ${project.version} sync
 GENERIC-RESOURCE-API cll-vnf-topology-operation-cll-modify ${project.version} sync
diff --git a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate-w-Protection.xml b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate-w-Protection.xml
new file mode 100644
index 00000000..97b72469
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate-w-Protection.xml
@@ -0,0 +1,834 @@
+<service-logic
+        xmlns='http://www.onap.org/sdnc/svclogic'
+        xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>
+    <method rpc='cll-vnf-topology-operation-cll-F1-Activate-w-Protection' mode='sync'>
+        <block atomic="true">
+            <set>
+                <parameter name='`leaf-tunnels-list.`' value='' />
+                <parameter name='`leaf-tunnels-list_length`' value='0' />
+                <parameter name='`leaftunsidx`' value='0' />
+            </set>
+            <set>
+                <parameter name='tmp.aai.all-vpn-bindings.' value="" />
+            </set>
+            <execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >
+                <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />
+                <parameter name='contextPrefix' value='prop' />
+            </execute>
+            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                          resource="vpn-bindings"
+                          key="selflink = 'https://aai.onap:8443/aai/v24/network/vpn-bindings"
+                          local-only="false"
+                          pfx="tmp.aai.all-vpn-bindings" >
+                <outcome value='success'>
+                    <block atomic="true">
+                        <for index='vpnbidx' start='0' end='`$tmp.aai.all-vpn-bindings.vpn-binding_length`' >
+                            <block atomic='true'>
+                                <block atomic='true'>
+                                    <set>
+                                        <parameter name='tmp.aai.vpn-binding.' value="" />
+                                    </set>
+                                    <set>
+                                        <parameter name='tmp.aai.vpn-binding.' value="`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].`" />
+                                    </set>
+                                    <switch test="`$tmp.aai.vpn-binding.operational-status != 'Activated' `">
+                                        <outcome value='true'>
+                                            <block atomic="true">
+                                                <set>
+                                                    <parameter name='gfp-n' value='`$tmp.aai.vpn-binding.route-distinguisher`' />
+                                                </set>
+                                                <switch test='`$tmp.aai.vpn-binding.dst-access-ltp-id`'>
+                                                    <outcome value='Other'>
+                                                        <switch test='`$tmp.aai.vpn-binding.src-access-ltp-id`'>
+                                                            <outcome value=''>
+                                                                <block atomic="true">
+                                                                    <set>
+                                                                        <parameter name='tmp.aai.vpn-bindingA.' value="`$tmp.aai.vpn-binding.`" />
+                                                                        <parameter name='tmp.aai.connectivityA.' value="`$tmp.aai.connectivity.`" />
+                                                                    </set>
+                                                                    <set>
+                                                                        <parameter name='src-node-id' value='`$tmp.aai.vpn-bindingA.src-access-node-id`' />
+                                                                        <parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingA.dst-access-node-id`' />
+                                                                        <!--<parameter name='dst-tpn-id' value='1' />-->
+                                                                        <parameter name='dst-tpn-id' value='`$tmp.aai.vpn-bindingA.customer-vpn-id`' />
+                                                                        <parameter name='dst-ttp-id' value='`$tmp.aai.vpn-bindingA.dst-access-ltp-id`' />
+                                                                        <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />
+                                                                        <parameter name='otn-tunnel-name-src-domain' value='`$tmp.aai.vpn-bindingA.vpn-name`' />
+                                                                        <parameter name='client-id' value='`$tmp.aai.vpn-bindingA.access-client-id`' />
+                                                                        <parameter name='provider-id' value='`$tmp.aai.vpn-bindingA.access-provider-id`' />
+                                                                        <parameter name='topology-id' value='`$tmp.aai.vpn-bindingA.access-topology-id`' />
+                                                                    </set>
+                                                                    <set>
+                                                                        <parameter name='tmp.src.domainA.pnf-name' value="`'networkId-providerId-' +
+                                                   $tmp.aai.vpn-bindingA.access-provider-id + '-clientId-' +
+                                                   $tmp.aai.vpn-bindingA.access-client-id + '-topologyId-' +
+                                                   $tmp.aai.vpn-bindingA.access-topology-id + '-nodeId-' +
+                                                   $tmp.aai.vpn-bindingA.src-access-node-id`" />
+                                                                    </set>
+                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                  resource="pnf"
+                                                                                  key="pnf.pnf-name = $tmp.src.domainA.pnf-name"
+                                                                                  pfx='tmp.aai.source-pnf' local-only='false' >
+                                                                        <!--AND depth = '0'"-->
+                                                                        <outcome value='success'>
+                                                                            <block>
+                                                                                <for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >
+                                                                                    <switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>
+                                                                                        <outcome value='esr-thirdparty-sdnc'>
+                                                                                            <block atomic="true">
+                                                                                                <set>
+                                                                                                    <parameter name='tmp.domainA.esr-thirdparty-id' value="`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`" />
+                                                                                                </set>
+                                                                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                              resource="esr-thirdparty-sdnc"
+                                                                                                              key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainA.esr-thirdparty-id AND
+		     depth = '1'"
+                                                                                                              pfx='tmp.aai.domainA.esr-thirdparty-sdnc' local-only='false' >
+                                                                                                    <outcome value='success'>
+                                                                                                        <block>
+                                                                                                            <set>
+                                                                                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.url' value="`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
+                                                                                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.user' value="`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
+                                                                                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.password' value="`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />
+                                                                                                                <!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->
+                                                                                                                <!--<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />-->
+                                                                                                                <!--<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />-->
+                                                                                                                <!--<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />-->
+                                                                                                                <!--<parameter name="format" value="json"/>-->
+                                                                                                                <!--<parameter name="httpMethod" value="get"/>-->
+                                                                                                                <!--<parameter name="responsePrefix" value="topology"/>-->
+                                                                                                                <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->
+                                                                                                                <!--<parameter name="trustStorePassword" value="adminadmin"/>-->
+                                                                                                                <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->
+                                                                                                                <!--<parameter name="keyStorePassword" value="adminadmin"/>-->
+                                                                                                            </set>
+                                                                                                        </block>
+                                                                                                    </outcome>
+                                                                                                    <outcome value='not-found'>
+                                                                                                        <return status='failure'>
+                                                                                                            <parameter name='ack-final' value='Y'/>
+                                                                                                            <parameter name="error-code" value="500" />
+                                                                                                            <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                        </return>
+                                                                                                    </outcome>
+                                                                                                    <outcome value='Other'>
+                                                                                                        <return status='failure'>
+                                                                                                            <parameter name='ack-final' value='Y'/>
+                                                                                                            <parameter name="error-code" value="500" />
+                                                                                                            <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                        </return>
+                                                                                                    </outcome>
+                                                                                                </get-resource>
+                                                                                            </block>
+                                                                                        </outcome>
+                                                                                    </switch>
+                                                                                </for>
+                                                                            </block>
+                                                                        </outcome>
+                                                                        <outcome value='not-found'>
+                                                                            <return status='failure'>
+                                                                                <parameter name='ack-final' value='Y'/>
+                                                                                <parameter name="error-code" value="500" />
+                                                                                <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                            </return>
+                                                                        </outcome>
+                                                                        <outcome value='Other'>
+                                                                            <return status='failure'>
+                                                                                <parameter name='ack-final' value='Y'/>
+                                                                                <parameter name="error-code" value="500" />
+                                                                                <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                            </return>
+                                                                        </outcome>
+                                                                    </get-resource>
+                                                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                                        <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.cll-otn-src-domain-creation.templatefile`" />
+                                                                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-te:te'`" />
+                                                                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.user`" />
+                                                                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.password`" />
+                                                                        <parameter name="format" value="json"/>
+                                                                        <parameter name="httpMethod" value="patch"/>
+                                                                        <parameter name="responsePrefix" value="otn-oof"/>
+                                                                        <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
+                                                                        <parameter name="trustStorePassword" value="adminadmin"/>
+                                                                        <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                                                                        <parameter name="keyStorePassword" value="adminadmin"/>
+                                                                        <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
+                                                                        <outcome value='failure'>
+                                                                            <return status='failure'>
+                                                                                <parameter name='ack-final' value='Y'/>
+                                                                                <parameter name="error-code" value="500" />
+                                                                                <parameter name="error-message" value="Error executing Create OTN tunnel rest api" />
+                                                                            </return>
+                                                                        </outcome>
+                                                                        <outcome value='success'>
+                                                                            <block atomic="true"></block>
+                                                                        </outcome>
+                                                                    </execute>
+                                                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
+                                                                            key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingA.vpn-id' >
+                                                                        <parameter name='vpn-id' value='`$tmp.aai.vpn-bindingA.vpn-id`' />
+                                                                        <parameter name='vpn-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />
+                                                                        <parameter name='operational-status' value='Activated' />
+                                                                    </update>
+                                                                    <set>
+                                                                        <parameter name='`leaf-tunnels-list[$leaftunsidx].tunnel-name`' value='`$tmp.aai.vpn-binding.vpn-name`' />
+                                                                        <parameter name='`leaf-tunnels-list[$leaftunsidx].vpn-id`' value='`$tmp.aai.vpn-binding.vpn-id`' />
+                                                                        <parameter name='`leaf-tunnels-list_length`' value='`$leaftunsidx + 1`' />
+                                                                    </set>
+                                                                    <set>
+                                                                        <parameter name='`leaftunsidx`' value='`$leaftunsidx + 1`' />
+                                                                    </set>
+                                                                </block>
+                                                            </outcome>
+                                                            <outcome value='Other'>
+                                                                <block atomic="true">
+                                                                    <set>
+                                                                        <parameter name='tmp.aai.vpn-bindingG.' value="`$tmp.aai.vpn-binding.`" />
+                                                                        <parameter name='tmp.aai.connectivityG.' value="`$tmp.aai.connectivity.`" />
+                                                                    </set>
+                                                                    <set>
+                                                                        <parameter name='src-node-id' value='`$tmp.aai.vpn-bindingG.src-access-node-id`' />
+                                                                        <parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingG.dst-access-node-id`' />
+                                                                        <!--<parameter name='dst-tpn-id' value='1' />-->
+                                                                        <parameter name='src-tpn-id' value='`$tmp.aai.vpn-bindingG.customer-vpn-id`' />
+                                                                        <parameter name='dst-tpn-id' value='`$tmp.aai.vpn-bindingG.customer-vpn-id`' />
+                                                                        <parameter name='src-ttp-id' value='`$tmp.aai.vpn-bindingG.src-access-ltp-id`' />
+                                                                        <parameter name='dst-ttp-id' value='`$tmp.aai.vpn-bindingG.dst-access-ltp-id`' />
+                                                                        <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />
+                                                                        <parameter name='otn-tunnel-name-domainG' value='`$tmp.aai.vpn-bindingG.vpn-name`' />
+                                                                        <parameter name='client-id' value='`$tmp.aai.vpn-bindingG.access-client-id`' />
+                                                                        <parameter name='provider-id' value='`$tmp.aai.vpn-bindingG.access-provider-id`' />
+                                                                        <parameter name='topology-id' value='`$tmp.aai.vpn-bindingG.access-topology-id`' />
+                                                                    </set>
+                                                                    <set>
+                                                                        <parameter name='tmp.domainG.pnf-name' value="`'networkId-providerId-' +
+                                                   $tmp.aai.vpn-bindingG.access-provider-id + '-clientId-' +
+                                                   $tmp.aai.vpn-bindingG.access-client-id + '-topologyId-' +
+                                                   $tmp.aai.vpn-bindingG.access-topology-id + '-nodeId-' +
+                                                   $tmp.aai.vpn-bindingG.src-access-node-id`" />
+                                                                    </set>
+                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                  resource="pnf"
+                                                                                  key="pnf.pnf-name = $tmp.domainG.pnf-name"
+                                                                                  pfx='tmp.aai.domainG-pnf' local-only='false' >
+                                                                        <!--AND depth = '0'"-->
+                                                                        <outcome value='success'>
+                                                                            <block>
+                                                                                <for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.domainG-pnf.relationship-list.relationship_length`' >
+                                                                                    <switch test='`$tmp.aai.domainG-pnf.relationship-list.relationship[$spvidx].related-to`'>
+                                                                                        <outcome value='esr-thirdparty-sdnc'>
+                                                                                            <block atomic="true">
+                                                                                                <set>
+                                                                                                    <parameter name='tmp.domainG.esr-thirdparty-id' value="`$tmp.aai.domainG-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`" />
+                                                                                                </set>
+                                                                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                              resource="esr-thirdparty-sdnc"
+                                                                                                              key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainG.esr-thirdparty-id AND
+		     depth = '1'"
+                                                                                                              pfx='tmp.aai.domainG.esr-thirdparty-sdnc' local-only='false' >
+                                                                                                    <outcome value='success'>
+                                                                                                        <block>
+                                                                                                            <set>
+                                                                                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.url' value="`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
+                                                                                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.user' value="`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
+                                                                                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.password' value="`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />
+                                                                                                                <!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->
+                                                                                                                <!--<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />-->
+                                                                                                                <!--<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />-->
+                                                                                                                <!--<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />-->
+                                                                                                                <!--<parameter name="format" value="json"/>-->
+                                                                                                                <!--<parameter name="httpMethod" value="get"/>-->
+                                                                                                                <!--<parameter name="responsePrefix" value="topology"/>-->
+                                                                                                                <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->
+                                                                                                                <!--<parameter name="trustStorePassword" value="adminadmin"/>-->
+                                                                                                                <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->
+                                                                                                                <!--<parameter name="keyStorePassword" value="adminadmin"/>-->
+                                                                                                            </set>
+                                                                                                        </block>
+                                                                                                    </outcome>
+                                                                                                    <outcome value='not-found'>
+                                                                                                        <return status='failure'>
+                                                                                                            <parameter name='ack-final' value='Y'/>
+                                                                                                            <parameter name="error-code" value="500" />
+                                                                                                            <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                        </return>
+                                                                                                    </outcome>
+                                                                                                    <outcome value='Other'>
+                                                                                                        <return status='failure'>
+                                                                                                            <parameter name='ack-final' value='Y'/>
+                                                                                                            <parameter name="error-code" value="500" />
+                                                                                                            <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                        </return>
+                                                                                                    </outcome>
+                                                                                                </get-resource>
+                                                                                            </block>
+                                                                                        </outcome>
+                                                                                    </switch>
+                                                                                </for>
+                                                                            </block>
+                                                                        </outcome>
+                                                                        <outcome value='not-found'>
+                                                                            <return status='failure'>
+                                                                                <parameter name='ack-final' value='Y'/>
+                                                                                <parameter name="error-code" value="500" />
+                                                                                <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                            </return>
+                                                                        </outcome>
+                                                                        <outcome value='Other'>
+                                                                            <return status='failure'>
+                                                                                <parameter name='ack-final' value='Y'/>
+                                                                                <parameter name="error-code" value="500" />
+                                                                                <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                            </return>
+                                                                        </outcome>
+                                                                    </get-resource>
+                                                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                                        <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.cll-otn-domainG-creation.templatefile`" />
+                                                                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainG.url + '/restconf/data/ietf-te:te'`" />
+                                                                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainG.user`" />
+                                                                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainG.password`" />
+                                                                        <parameter name="format" value="json"/>
+                                                                        <parameter name="httpMethod" value="patch"/>
+                                                                        <parameter name="responsePrefix" value="otn-oof"/>
+                                                                        <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
+                                                                        <parameter name="trustStorePassword" value="adminadmin"/>
+                                                                        <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                                                                        <parameter name="keyStorePassword" value="adminadmin"/>
+                                                                        <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
+                                                                        <outcome value='failure'>
+                                                                            <return status='failure'>
+                                                                                <parameter name='ack-final' value='Y'/>
+                                                                                <parameter name="error-code" value="500" />
+                                                                                <parameter name="error-message" value="Error executing Create OTN tunnel rest api" />
+                                                                            </return>
+                                                                        </outcome>
+                                                                        <outcome value='success'>
+                                                                            <block atomic="true"></block>
+                                                                        </outcome>
+                                                                    </execute>
+                                                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
+                                                                            key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingG.vpn-id' >
+                                                                        <parameter name='vpn-id' value='`$tmp.aai.vpn-bindingG.vpn-id`' />
+                                                                        <parameter name='vpn-name' value='`$tmp.aai.vpn-bindingG.vpn-name`' />
+                                                                        <parameter name='operational-status' value='Activated' />
+                                                                    </update>
+                                                                </block>
+                                                            </outcome>
+                                                        </switch>
+                                                    </outcome>
+                                                    <outcome value=''>
+                                                        <switch test='`$tmp.aai.vpn-binding.src-access-ltp-id`'>
+                                                            <outcome value='Other'>
+                                                                <block atomic="true">
+                                                                    <set>
+                                                                        <parameter name='tmp.aai.vpn-bindingB.' value="`$tmp.aai.vpn-binding.`" />
+                                                                        <parameter name='tmp.aai.connectivityB.' value="`$tmp.aai.connectivity.`" />
+                                                                    </set>
+                                                                    <set>
+                                                                        <parameter name='src-node-id' value='`$tmp.aai.vpn-bindingB.src-access-node-id`' />
+                                                                        <parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingB.dst-access-node-id`' />
+                                                                        <!--<parameter name='src-tpn-id' value='1' />-->
+                                                                        <parameter name='src-tpn-id' value='`$tmp.aai.vpn-bindingB.customer-vpn-id`' />
+                                                                        <parameter name='src-ttp-id' value='`$tmp.aai.vpn-bindingB.src-access-ltp-id`' />
+                                                                        <parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />
+                                                                        <parameter name='otn-tunnel-name-dst-domain' value='`$tmp.aai.vpn-bindingB.vpn-name`' />
+                                                                        <parameter name='client-id' value='`$tmp.aai.vpn-bindingB.access-client-id`' />
+                                                                        <parameter name='provider-id' value='`$tmp.aai.vpn-bindingB.access-provider-id`' />
+                                                                        <parameter name='topology-id' value='`$tmp.aai.vpn-bindingB.access-topology-id`' />
+                                                                    </set>
+                                                                    <set>
+                                                                        <parameter name='tmp.dst.domainB.pnf-name' value="`'networkId-providerId-' +
+                                                   $tmp.aai.vpn-bindingB.access-provider-id + '-clientId-' +
+                                                   $tmp.aai.vpn-bindingB.access-client-id + '-topologyId-' +
+                                                   $tmp.aai.vpn-bindingB.access-topology-id + '-nodeId-' +
+                                                   $tmp.aai.vpn-bindingB.dst-access-node-id`" />
+                                                                    </set>
+                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                  resource="pnf"
+                                                                                  key="pnf.pnf-name = $tmp.dst.domainB.pnf-name"
+                                                                                  pfx='tmp.aai.destination-pnf' local-only='false' >
+                                                                        <!--AND depth = '0'"-->
+                                                                        <outcome value='success'>
+                                                                            <block>
+                                                                                <for silentFailure='true' index='dpvidx' start='0' end='`$tmp.aai.destination-pnf.relationship-list.relationship_length`' >
+                                                                                    <switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>
+                                                                                        <outcome value='esr-thirdparty-sdnc'>
+                                                                                            <block atomic="true">
+                                                                                                <set>
+                                                                                                    <parameter name='tmp.domainB.esr-thirdparty-id' value="`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`" />
+                                                                                                </set>
+                                                                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                              resource="esr-thirdparty-sdnc"
+                                                                                                              key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainB.esr-thirdparty-id AND
+		     depth = '1'"
+                                                                                                              pfx='tmp.aai.domainB.esr-thirdparty-sdnc' local-only='false' >
+                                                                                                    <outcome value='success'>
+                                                                                                        <block>
+                                                                                                            <set>
+                                                                                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.url' value="`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
+                                                                                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.user' value="`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
+                                                                                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.password' value="`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />
+                                                                                                                <!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->
+                                                                                                                <!--<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />-->
+                                                                                                                <!--<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />-->
+                                                                                                                <!--<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />-->
+                                                                                                                <!--<parameter name="format" value="json"/>-->
+                                                                                                                <!--<parameter name="httpMethod" value="get"/>-->
+                                                                                                                <!--<parameter name="responsePrefix" value="topology"/>-->
+                                                                                                                <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->
+                                                                                                                <!--<parameter name="trustStorePassword" value="adminadmin"/>-->
+                                                                                                                <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->
+                                                                                                                <!--<parameter name="keyStorePassword" value="adminadmin"/>-->
+                                                                                                            </set>
+                                                                                                        </block>
+                                                                                                    </outcome>
+                                                                                                    <outcome value='not-found'>
+                                                                                                        <return status='failure'>
+                                                                                                            <parameter name='ack-final' value='Y'/>
+                                                                                                            <parameter name="error-code" value="500" />
+                                                                                                            <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                        </return>
+                                                                                                    </outcome>
+                                                                                                    <outcome value='Other'>
+                                                                                                        <return status='failure'>
+                                                                                                            <parameter name='ack-final' value='Y'/>
+                                                                                                            <parameter name="error-code" value="500" />
+                                                                                                            <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                        </return>
+                                                                                                    </outcome>
+                                                                                                </get-resource>
+                                                                                            </block>
+                                                                                        </outcome>
+                                                                                    </switch>
+                                                                                </for>
+                                                                            </block>
+                                                                        </outcome>
+                                                                        <outcome value='not-found'>
+                                                                            <return status='failure'>
+                                                                                <parameter name='ack-final' value='Y'/>
+                                                                                <parameter name="error-code" value="500" />
+                                                                                <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                            </return>
+                                                                        </outcome>
+                                                                        <outcome value='Other'>
+                                                                            <return status='failure'>
+                                                                                <parameter name='ack-final' value='Y'/>
+                                                                                <parameter name="error-code" value="500" />
+                                                                                <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                            </return>
+                                                                        </outcome>
+                                                                    </get-resource>
+                                                                    <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                                        <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.cll-otn-dst-domain-creation.templatefile`" />
+                                                                        <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/data/ietf-te:te'`" />
+                                                                        <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainB.user`" />
+                                                                        <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainB.password`" />
+                                                                        <parameter name="format" value="json"/>
+                                                                        <parameter name="httpMethod" value="patch"/>
+                                                                        <parameter name="responsePrefix" value="otn-oof"/>
+                                                                        <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
+                                                                        <parameter name="trustStorePassword" value="adminadmin"/>
+                                                                        <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                                                                        <parameter name="keyStorePassword" value="adminadmin"/>
+                                                                        <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
+                                                                        <outcome value='failure'>
+                                                                            <return status='failure'>
+                                                                                <parameter name='ack-final' value='Y'/>
+                                                                                <parameter name="error-code" value="500" />
+                                                                                <parameter name="error-message" value="Error executing Create OTN tunnel rest api" />
+                                                                            </return>
+                                                                        </outcome>
+                                                                        <outcome value='success'>
+                                                                            <block atomic="true"></block>
+                                                                        </outcome>
+                                                                    </execute>
+                                                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
+                                                                            key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingB.vpn-id' >
+                                                                        <parameter name='vpn-id' value='`$tmp.aai.vpn-bindingB.vpn-id`' />
+                                                                        <parameter name='vpn-name' value='`$tmp.aai.vpn-bindingB.vpn-name`' />
+                                                                        <parameter name='operational-status' value='Activated' />
+                                                                    </update>
+                                                                    <set>
+                                                                        <parameter name='`root-tunnels-list[$roottunsidx].tunnel-name`' value='`$tmp.aai.vpn-binding.vpn-name`' />
+                                                                        <parameter name='`root-tunnels-list[$roottunsidx].vpn-id`' value='`$tmp.aai.vpn-binding.vpn-id`' />
+                                                                        <parameter name='`root-tunnels-list_length`' value='`$roottunsidx + 1`' />
+                                                                    </set>
+                                                                    <set>
+                                                                        <parameter name='`roottunsidx`' value='`$roottunsidx + 1`' />
+                                                                    </set>
+                                                                </block>
+                                                            </outcome>
+                                                            <outcome value=''>
+                                                                <return status='failure'>
+                                                                    <parameter name='error-code' value='' />
+                                                                    <parameter name='error-message' value='' />
+                                                                </return>
+                                                            </outcome>
+                                                        </switch>
+                                                    </outcome>
+                                                </switch>
+                                            </block>
+                                        </outcome>
+                                        <outcome value='false'>
+                                            <block></block>
+                                        </outcome>
+                                    </switch>
+                                </block>
+                            </block>
+                        </for>
+                    </block>
+                </outcome>
+                <outcome value='not-found'></outcome>
+                <outcome value='failure'>
+                    <return status='failure'>
+                        <parameter name='error-code' value='' />
+                        <parameter name='error-message' value='' />
+                    </return>
+                </outcome>
+            </get-resource>
+            <!--<get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" -->
+            <!--	resource="service-instance"-->
+            <!--	key='service-instance.service-instance-id = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.service-instance-id-->
+            <!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.global-customer-id -->
+            <!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.subscription-service-type'-->
+            <!--	local-only="false"-->
+            <!--	force="true" pfx="tmp.aai.service-instance">-->
+            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                          resource="service-instance"
+                          key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id
+         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id
+         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'
+                          local-only="false"
+                          force="true" pfx="tmp.aai.service-instance">
+                <!--$vnf-topology-operation-input.service-information.service-instance-id-->
+                <outcome value='success'>
+                    <for index='rel-index' start='0' end='`$tmp.aai.service-instance.relationship-list.relationship_length`' >
+                        <switch test='`$tmp.aai.service-instance.relationship-list.relationship[$rel-index].related-to`'>
+                            <outcome value='connectivity'>
+                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                              resource="connectivity"
+                                              key="connectivity.connectivity-id = $tmp.aai.service-instance.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value"
+                                              local-only="false"
+                                              pfx="tmp.aai.connectivity" >
+                                    <outcome value='success'>
+                                        <switch test="`$tmp.aai.connectivity.operational-status != 'Activated' `">
+                                            <outcome value='false'>
+                                                <block></block>
+                                            </outcome>
+                                            <outcome value='true'>
+                                                <block atomic="true">
+                                                    <switch test="`$tmp.aai.connectivity.vpn-type != 'mdsc' `">
+                                                        <outcome value='true'>
+                                                            <block>
+                                                                <set>
+                                                                    <parameter name='`ethernet-srv-end-points-list.`' value='' />
+                                                                    <parameter name='`ethernet-srv-end-points-list_length`' value='0' />
+                                                                    <parameter name='`epidx`' value='0' />
+                                                                </set>
+                                                                <for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.connectivity.relationship-list.relationship_length`' >
+                                                                    <switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>
+                                                                        <outcome value='uni'>
+                                                                            <block atomic="true">
+                                                                                <set>
+                                                                                    <parameter name='tmp.aai.uni.' value='' />
+                                                                                </set>
+                                                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                              resource="uni"
+                                                                                              key="uni.id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value"
+                                                                                              local-only="false"
+                                                                                              pfx="tmp.aai.uni" >
+                                                                                    <outcome value='not-found'>
+                                                                                        <return status='failure'>
+                                                                                            <parameter name='ack-final' value='Y'/>
+                                                                                            <parameter name="error-code" value="500" />
+                                                                                            <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
+                                                                                        </return>
+                                                                                    </outcome>
+                                                                                    <outcome value='failure'>
+                                                                                        <return status='failure'>
+                                                                                            <parameter name='error-code' value='' />
+                                                                                            <parameter name='error-message' value='' />
+                                                                                        </return>
+                                                                                    </outcome>
+                                                                                    <outcome value='success'>
+                                                                                        <block atomic="true"></block>
+                                                                                    </outcome>
+                                                                                </get-resource>
+                                                                                <switch test="`$tmp.aai.uni.type`">
+                                                                                    <outcome value='leaf'>
+                                                                                        <block>
+                                                                                            <set>
+                                                                                                <parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:leaf-access' />
+                                                                                            </set>
+                                                                                        </block>
+                                                                                    </outcome>
+                                                                                    <outcome value='root'>
+                                                                                        <block>
+                                                                                            <set>
+                                                                                                <parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:root-primary' />
+                                                                                            </set>
+                                                                                        </block>
+                                                                                    </outcome>
+                                                                                    <outcome value='secondary-root'>
+                                                                                        <block>
+                                                                                            <set>
+                                                                                                <parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:root-backup' />
+                                                                                            </set>
+                                                                                        </block>
+                                                                                    </outcome>
+                                                                                    <outcome value='Other'>
+                                                                                        <block></block>
+                                                                                    </outcome>
+                                                                                </switch>
+                                                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
+                                                                                    <parameter name="original_string" value='`$tmp.aai.uni.id`'/>
+                                                                                    <!--<parameter name="regex" value="[^-]+$"/>-->
+                                                                                    <parameter name="regex" value="[-]+"/>
+                                                                                    <parameter name="ctx_memory_result_key" value="param-prefix-uni"/>
+                                                                                    <outcome value='success'>
+                                                                                        <block atomic="true">
+                                                                                            <set>
+                                                                                                <parameter name='tmp.uni-node-id-short' value='`$param-prefix-uni[$param-prefix-uni_length -4]`' />
+                                                                                            </set>
+                                                                                        </block>
+                                                                                    </outcome>
+                                                                                    <outcome value='failure'>
+                                                                                        <return status='failure'>
+                                                                                            <parameter name='error-code' value='' />
+                                                                                            <parameter name='error-message' value="An error occured while splitting sna1_route" />
+                                                                                        </return>
+                                                                                    </outcome>
+                                                                                </execute>
+                                                                                <set>
+                                                                                    <!--<parameter name='`ethernet-srv-end-points-list[$epidx].ethernet-end-point-name`' value='`$tmp.aai.connectivity.connectivity-id`' />-->
+                                                                                    <parameter name='`ethernet-srv-end-points-list[$epidx].ethernet-end-point-name`' value='`$tmp.aai.uni.id`' />
+                                                                                    <parameter name='`ethernet-srv-end-points-list[$epidx].index-number`' value='0' />
+                                                                                    <parameter name='`ethernet-srv-end-points-list[$epidx].eth-node-id`' value='`$tmp.uni-node-id-short`' />
+                                                                                    <parameter name='`ethernet-srv-end-points-list[$epidx].eth-node-tp-id`' value='`$tmp.aai.uni.tp-id`' />
+                                                                                    <parameter name='`ethernet-srv-end-points-list[$epidx].leafOrRootAccess`' value='`$leafOrRootAccess`' />
+                                                                                    <parameter name='`ethernet-srv-end-points-list[$epidx].cvlan`' value='`$tmp.aai.connectivity.cvlan`' />
+                                                                                    <parameter name='`ethernet-srv-end-points-list[$epidx].CIR`' value='`$tmp.aai.uni.data-source * 1000000`' />
+                                                                                    <parameter name='`ethernet-srv-end-points-list[$epidx].EIR`' value='`$tmp.aai.uni.data-source * 1000000`' />
+                                                                                    <parameter name='`ethernet-srv-end-points-list_length`' value='`$epidx + 1`' />
+                                                                                </set>
+                                                                                <set>
+                                                                                    <parameter name='`epidx`' value='`$epidx + 1`' />
+                                                                                </set>
+                                                                            </block>
+                                                                        </outcome>
+                                                                    </switch>
+                                                                </for>
+                                                                <set>
+                                                                    <parameter name='filenameclleths' value="`$leafOrRootAccess + $tmp.aai.connectivity.access-node-id`" />
+                                                                </set>
+                                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >
+                                                                    <parameter name="filename" value="`$filenameclleths`" />
+                                                                </execute>
+                                                                <set>
+                                                                    <parameter name='`otn-tunnels-name-list.`' value='' />
+                                                                    <parameter name='`otn-tunnels-name-list_length`' value='0' />
+                                                                    <parameter name='`otntunsidx`' value='0' />
+                                                                </set>
+                                                                <for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.connectivity.relationship-list.relationship_length`' >
+                                                                    <switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>
+                                                                        <outcome value='vpn-binding'>
+                                                                            <block atomic="true">
+                                                                                <set>
+                                                                                    <parameter name='tmp.aai.vpn-binding.' value='' />
+                                                                                </set>
+                                                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                              resource="vpn-binding"
+                                                                                              key="vpn-binding.vpn-id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value"
+                                                                                              local-only="false"
+                                                                                              pfx="tmp.aai.vpn-binding" >
+                                                                                    <outcome value='not-found'>
+                                                                                        <return status='failure'>
+                                                                                            <parameter name='ack-final' value='Y'/>
+                                                                                            <parameter name="error-code" value="500" />
+                                                                                            <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
+                                                                                        </return>
+                                                                                    </outcome>
+                                                                                    <outcome value='failure'>
+                                                                                        <return status='failure'>
+                                                                                            <parameter name='error-code' value='' />
+                                                                                            <parameter name='error-message' value='' />
+                                                                                        </return>
+                                                                                    </outcome>
+                                                                                    <outcome value='success'>
+                                                                                        <block atomic="true">
+                                                                                            <set>
+                                                                                                <parameter name='`otn-tunnels-name-list[$otntunsidx].otn-tunnel-name`' value='`$tmp.aai.vpn-binding.vpn-name`' />
+                                                                                                <parameter name='`otn-tunnels-name-list[$otntunsidx].vpn-id`' value='`$tmp.aai.vpn-binding.vpn-id`' />
+                                                                                                <parameter name='`otn-tunnels-name-list_length`' value='`$otntunsidx + 1`' />
+                                                                                            </set>
+                                                                                            <set>
+                                                                                                <parameter name='`otntunsidx`' value='`$otntunsidx + 1`' />
+                                                                                            </set>
+                                                                                        </block>
+                                                                                    </outcome>
+                                                                                </get-resource>
+                                                                            </block>
+                                                                        </outcome>
+                                                                    </switch>
+                                                                </for>
+                                                                <set>
+                                                                    <parameter name='filenamecllotns' value="`leafrootOTNtunnelnames`" />
+                                                                </set>
+                                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >
+                                                                    <parameter name="filename" value="`$filenamecllotns`" />
+                                                                </execute>
+                                                                <block atomic="true">
+                                                                    <set>
+                                                                        <parameter name='tmp.pnf-name-forUrl' value="`'networkId-providerId-' +
+                                                   $tmp.aai.connectivity.access-provider-id + '-clientId-' +
+                                                   $tmp.aai.connectivity.access-client-id + '-topologyId-' +
+                                                   $tmp.aai.connectivity.access-topology-id + '-nodeId-' +
+                                                   $tmp.aai.connectivity.access-node-id`" />
+                                                                    </set>
+                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                  resource="pnf"
+                                                                                  key="pnf.pnf-name = $tmp.pnf-name-forUrl"
+                                                                                  pfx='tmp.aai.source-pnf' local-only='false' >
+                                                                        <!--AND depth = '0'"-->
+                                                                        <outcome value='success'>
+                                                                            <block>
+                                                                                <for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >
+                                                                                    <switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>
+                                                                                        <outcome value='esr-thirdparty-sdnc'>
+                                                                                            <block atomic="true">
+                                                                                                <set>
+                                                                                                    <parameter name='tmp.domainConn.esr-thirdparty-id' value="`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`" />
+                                                                                                </set>
+                                                                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                              resource="esr-thirdparty-sdnc"
+                                                                                                              key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainConn.esr-thirdparty-id AND
+		     depth = '1'"
+                                                                                                              pfx='tmp.aai.domainConn.esr-thirdparty-sdnc' local-only='false' >
+                                                                                                    <outcome value='success'>
+                                                                                                        <block>
+                                                                                                            <set>
+                                                                                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.domainConn.url' value="`$tmp.aai.domainConn.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
+                                                                                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.domainConn.user' value="`$tmp.aai.domainConn.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
+                                                                                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.domainConn.password' value="`$tmp.aai.domainConn.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />
+                                                                                                                <!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->
+                                                                                                                <!--<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />-->
+                                                                                                                <!--<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />-->
+                                                                                                                <!--<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />-->
+                                                                                                                <!--<parameter name="format" value="json"/>-->
+                                                                                                                <!--<parameter name="httpMethod" value="get"/>-->
+                                                                                                                <!--<parameter name="responsePrefix" value="topology"/>-->
+                                                                                                                <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->
+                                                                                                                <!--<parameter name="trustStorePassword" value="adminadmin"/>-->
+                                                                                                                <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->
+                                                                                                                <!--<parameter name="keyStorePassword" value="adminadmin"/>-->
+                                                                                                            </set>
+                                                                                                        </block>
+                                                                                                    </outcome>
+                                                                                                    <outcome value='not-found'>
+                                                                                                        <return status='failure'>
+                                                                                                            <parameter name='ack-final' value='Y'/>
+                                                                                                            <parameter name="error-code" value="500" />
+                                                                                                            <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                        </return>
+                                                                                                    </outcome>
+                                                                                                    <outcome value='Other'>
+                                                                                                        <return status='failure'>
+                                                                                                            <parameter name='ack-final' value='Y'/>
+                                                                                                            <parameter name="error-code" value="500" />
+                                                                                                            <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                        </return>
+                                                                                                    </outcome>
+                                                                                                </get-resource>
+                                                                                            </block>
+                                                                                        </outcome>
+                                                                                    </switch>
+                                                                                </for>
+                                                                            </block>
+                                                                        </outcome>
+                                                                        <outcome value='not-found'>
+                                                                            <return status='failure'>
+                                                                                <parameter name='ack-final' value='Y'/>
+                                                                                <parameter name="error-code" value="500" />
+                                                                                <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                            </return>
+                                                                        </outcome>
+                                                                        <outcome value='Other'>
+                                                                            <return status='failure'>
+                                                                                <parameter name='ack-final' value='Y'/>
+                                                                                <parameter name="error-code" value="500" />
+                                                                                <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                            </return>
+                                                                        </outcome>
+                                                                    </get-resource>
+                                                                </block>
+                                                                <set>
+                                                                    <!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->
+                                                                    <parameter name='eth-service-name' value='`$tmp.aai.connectivity.etht-svc-name`' />
+                                                                    <parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />
+                                                                    <parameter name='provider-id' value='`$tmp.aai.connectivity.access-provider-id`' />
+                                                                    <parameter name='client-id' value='`$tmp.aai.connectivity.access-client-id`' />
+                                                                    <parameter name='topology-id' value='`$tmp.aai.connectivity.access-topology-id`' />
+                                                                    <!--<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />-->
+                                                                    <!--<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->
+                                                                    <!--<parameter name='index-number' value='0' />-->
+                                                                    <!--<parameter name='eth-node-id' value='`$tmp.aai.connectivityA.access-node-id`' />-->
+                                                                    <!--<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityA.access-ltp-id`' />-->
+                                                                    <!--<parameter name='CIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />-->
+                                                                    <!--<parameter name='EIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />-->
+                                                                    <!--<parameter name='cvlan' value='`$tmp.aai.connectivityA.cvlan`' />-->
+                                                                </set>
+                                                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                                    <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.cll-ethernet-service-loop-protection.templatefile`" />
+                                                                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`" />
+                                                                    <!--<parameter name="restapiUrl" value="`$prop.restapi.connection-oof-url`" />-->
+                                                                    <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`" />
+                                                                    <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`" />
+                                                                    <parameter name="format" value="json"/>
+                                                                    <parameter name="httpMethod" value="patch"/>
+                                                                    <parameter name='dirPath' value="/opt/onap/sdnc/restconfapi/yang" />
+                                                                    <parameter name="responsePrefix" value="vpn-result"/>
+                                                                    <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
+                                                                    <parameter name="trustStorePassword" value="adminadmin"/>
+                                                                    <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                                                                    <parameter name="keyStorePassword" value="adminadmin"/>
+                                                                    <outcome value='failure'></outcome>
+                                                                    <outcome value='success'>
+                                                                        <block atomic="true">
+                                                                            <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
+                                                                                    key='connectivity.connectivity-id = $tmp.aai.connectivity.connectivity-id'>
+                                                                                <parameter name='connectivity-id' value='`$tmp.aai.connectivity.connectivity-id`' />
+                                                                                <parameter name='operational-status' value='Activated' />
+                                                                            </update>
+                                                                        </block>
+                                                                    </outcome>
+                                                                </execute>
+                                                            </block>
+                                                        </outcome>
+                                                    </switch>
+                                                </block>
+                                            </outcome>
+                                        </switch>
+                                    </outcome>
+                                    <outcome value='not-found'></outcome>
+                                    <outcome value='failure'>
+                                        <return status='failure'>
+                                            <parameter name='error-code' value='' />
+                                            <parameter name='error-message' value='' />
+                                        </return>
+                                    </outcome>
+                                </get-resource>
+                            </outcome>
+                        </switch>
+                    </for>
+                </outcome>
+                <outcome value='not-found'></outcome>
+                <outcome value='failure'>
+                    <return status='failure'>
+                        <parameter name='error-code' value='' />
+                        <parameter name='error-message' value='' />
+                    </return>
+                </outcome>
+            </get-resource>
+        </block>
+    </method>
+</service-logic>
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate.xml b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate.xml
index b2057862..662c46a9 100644
--- a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1-Activate.xml
@@ -517,537 +517,294 @@
                                             </outcome>
                                             <outcome value='true'>
                                                 <block atomic="true">
-                                                    <switch test="`$tmp.aai.connectivity.vpn-type`">
-                                                        <outcome value='leaf'>
-                                                            <block>
-                                                                <set>
-                                                                    <parameter name='`ethernet-srv-end-points-list.`' value='' />
-                                                                    <parameter name='`ethernet-srv-end-points-list_length`' value='0' />
-                                                                    <parameter name='`epidx`' value='0' />
-                                                                </set>
-                                                                <set>
-                                                                    <parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:leaf-access' />
-                                                                </set>
-                                                                <for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.connectivity.relationship-list.relationship_length`' >
-                                                                    <switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>
-                                                                        <outcome value='uni'>
-                                                                            <block atomic="true">
+                                                    <block>
+                                                        <for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.connectivity.relationship-list.relationship_length`' >
+                                                            <switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>
+                                                                <outcome value='uni'>
+                                                                    <block atomic="true">
+                                                                        <set>
+                                                                            <parameter name='tmp.aai.uni.' value='' />
+                                                                        </set>
+                                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                      resource="uni"
+                                                                                      key="uni.id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value"
+                                                                                      local-only="false"
+                                                                                      pfx="tmp.aai.uni" >
+                                                                            <outcome value='not-found'>
+                                                                                <return status='failure'>
+                                                                                    <parameter name='ack-final' value='Y'/>
+                                                                                    <parameter name="error-code" value="500" />
+                                                                                    <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
+                                                                                </return>
+                                                                            </outcome>
+                                                                            <outcome value='failure'>
+                                                                                <return status='failure'>
+                                                                                    <parameter name='error-code' value='' />
+                                                                                    <parameter name='error-message' value='' />
+                                                                                </return>
+                                                                            </outcome>
+                                                                            <outcome value='success'>
+                                                                                <block atomic="true"></block>
+                                                                            </outcome>
+                                                                        </get-resource>
+                                                                        <switch test="`$tmp.aai.uni.type`">
+                                                                            <outcome value='leaf'>
                                                                                 <set>
-                                                                                    <parameter name='tmp.aai.uni.' value='' />
+                                                                                    <parameter name='`ethernet-srv-end-points-list.`' value='' />
+                                                                                    <parameter name='`ethernet-srv-end-points-list_length`' value='0' />
+                                                                                    <parameter name='`epidx`' value='0' />
                                                                                 </set>
-                                                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                                                                                              resource="uni"
-                                                                                              key="uni.id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value"
-                                                                                              local-only="false"
-                                                                                              pfx="tmp.aai.uni" >
-                                                                                    <outcome value='not-found'>
-                                                                                        <return status='failure'>
-                                                                                            <parameter name='ack-final' value='Y'/>
-                                                                                            <parameter name="error-code" value="500" />
-                                                                                            <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
-                                                                                        </return>
-                                                                                    </outcome>
-                                                                                    <outcome value='failure'>
-                                                                                        <return status='failure'>
-                                                                                            <parameter name='error-code' value='' />
-                                                                                            <parameter name='error-message' value='' />
-                                                                                        </return>
-                                                                                    </outcome>
-                                                                                    <outcome value='success'>
-                                                                                        <block atomic="true"></block>
-                                                                                    </outcome>
-                                                                                </get-resource>
-                                                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
-                                                                                    <parameter name="original_string" value='`$tmp.aai.uni.id`'/>
-                                                                                    <!--<parameter name="regex" value="[^-]+$"/>-->
-                                                                                    <parameter name="regex" value="[-]+"/>
-                                                                                    <parameter name="ctx_memory_result_key" value="param-prefix-uni"/>
-                                                                                    <outcome value='success'>
-                                                                                        <block atomic="true">
-                                                                                            <set>
-                                                                                                <parameter name='tmp.uni-node-id-short' value='`$param-prefix-uni[$param-prefix-uni_length -4]`' />
-                                                                                            </set>
-                                                                                        </block>
-                                                                                    </outcome>
-                                                                                    <outcome value='failure'>
-                                                                                        <return status='failure'>
-                                                                                            <parameter name='error-code' value='' />
-                                                                                            <parameter name='error-message' value="An error occured while splitting sna1_route" />
-                                                                                        </return>
-                                                                                    </outcome>
-                                                                                </execute>
                                                                                 <set>
-                                                                                    <!--<parameter name='`ethernet-srv-end-points-list[$epidx].ethernet-end-point-name`' value='`$tmp.aai.connectivity.connectivity-id`' />-->
-                                                                                    <parameter name='`ethernet-srv-end-points-list[$epidx].ethernet-end-point-name`' value='`$tmp.aai.uni.id`' />
-                                                                                    <parameter name='`ethernet-srv-end-points-list[$epidx].index-number`' value='0' />
-                                                                                    <parameter name='`ethernet-srv-end-points-list[$epidx].eth-node-id`' value='`$tmp.uni-node-id-short`' />
-                                                                                    <parameter name='`ethernet-srv-end-points-list[$epidx].eth-node-tp-id`' value='`$tmp.aai.uni.tp-id`' />
-                                                                                    <parameter name='`ethernet-srv-end-points-list[$epidx].leafOrRootAccess`' value='`$leafOrRootAccess`' />
-                                                                                    <parameter name='`ethernet-srv-end-points-list[$epidx].cvlan`' value='`$tmp.aai.connectivity.cvlan`' />
-                                                                                    <parameter name='`ethernet-srv-end-points-list[$epidx].CIR`' value='`$tmp.aai.uni.data-source * 1000000`' />
-                                                                                    <parameter name='`ethernet-srv-end-points-list[$epidx].EIR`' value='`$tmp.aai.uni.data-source * 1000000`' />
-                                                                                    <parameter name='`ethernet-srv-end-points-list_length`' value='`$epidx + 1`' />
+                                                                                    <parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:leaf-access' />
                                                                                 </set>
+                                                                            </outcome>
+                                                                            <outcome value='root'>
                                                                                 <set>
-                                                                                    <parameter name='`epidx`' value='`$epidx + 1`' />
+                                                                                    <parameter name='`ethernet-srv-end-points-list.`' value='' />
+                                                                                    <parameter name='`ethernet-srv-end-points-list_length`' value='0' />
+                                                                                    <parameter name='`epidx`' value='0' />
                                                                                 </set>
-                                                                            </block>
-                                                                        </outcome>
-                                                                    </switch>
-                                                                </for>
-                                                                <set>
-                                                                    <parameter name='filenameclleths' value="`$leafOrRootAccess + $tmp.aai.connectivity.access-node-id`" />
-                                                                </set>
-                                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >
-                                                                    <parameter name="filename" value="`$filenameclleths`" />
-                                                                </execute>
-                                                                <set>
-                                                                    <parameter name='`otn-tunnels-name-list.`' value='' />
-                                                                    <parameter name='`otn-tunnels-name-list_length`' value='0' />
-                                                                    <parameter name='`otntunsidx`' value='0' />
-                                                                </set>
-                                                                <for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.connectivity.relationship-list.relationship_length`' >
-                                                                    <switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>
-                                                                        <outcome value='vpn-binding'>
-                                                                            <block atomic="true">
-                                                                                <set>
-                                                                                    <parameter name='tmp.aai.vpn-binding.' value='' />
-                                                                                </set>
-                                                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                                                                                              resource="vpn-binding"
-                                                                                              key="vpn-binding.vpn-id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value"
-                                                                                              local-only="false"
-                                                                                              pfx="tmp.aai.vpn-binding" >
-                                                                                    <outcome value='not-found'>
-                                                                                        <return status='failure'>
-                                                                                            <parameter name='ack-final' value='Y'/>
-                                                                                            <parameter name="error-code" value="500" />
-                                                                                            <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
-                                                                                        </return>
-                                                                                    </outcome>
-                                                                                    <outcome value='failure'>
-                                                                                        <return status='failure'>
-                                                                                            <parameter name='error-code' value='' />
-                                                                                            <parameter name='error-message' value='' />
-                                                                                        </return>
-                                                                                    </outcome>
-                                                                                    <outcome value='success'>
-                                                                                        <block atomic="true">
-                                                                                            <set>
-                                                                                                <parameter name='`otn-tunnels-name-list[$otntunsidx].otn-tunnel-name`' value='`$tmp.aai.vpn-binding.vpn-name`' />
-                                                                                                <parameter name='`otn-tunnels-name-list[$otntunsidx].vpn-id`' value='`$tmp.aai.vpn-binding.vpn-id`' />
-                                                                                                <parameter name='`otn-tunnels-name-list_length`' value='`$otntunsidx + 1`' />
-                                                                                            </set>
-                                                                                            <set>
-                                                                                                <parameter name='`otntunsidx`' value='`$otntunsidx + 1`' />
-                                                                                            </set>
-                                                                                        </block>
-                                                                                    </outcome>
-                                                                                </get-resource>
-                                                                            </block>
-                                                                        </outcome>
-                                                                    </switch>
-                                                                </for>
-                                                                <set>
-                                                                    <parameter name='filenamecllotns' value="`leafrootOTNtunnelnames`" />
-                                                                </set>
-                                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >
-                                                                    <parameter name="filename" value="`$filenamecllotns`" />
-                                                                </execute>
-                                                                <block atomic="true">
-                                                                    <set>
-                                                                        <parameter name='tmp.pnf-name-forUrl' value="`'networkId-providerId-' +
-                                                   $tmp.aai.connectivity.access-provider-id + '-clientId-' +
-                                                   $tmp.aai.connectivity.access-client-id + '-topologyId-' +
-                                                   $tmp.aai.connectivity.access-topology-id + '-nodeId-' +
-                                                   $tmp.aai.connectivity.access-node-id`" />
-                                                                    </set>
-                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                                                                                  resource="pnf"
-                                                                                  key="pnf.pnf-name = $tmp.pnf-name-forUrl"
-                                                                                  pfx='tmp.aai.source-pnf' local-only='false' >
-                                                                        <!--AND depth = '0'"-->
-                                                                        <outcome value='success'>
-                                                                            <block>
-                                                                                <for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >
-                                                                                    <switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>
-                                                                                        <outcome value='esr-thirdparty-sdnc'>
-                                                                                            <block atomic="true">
-                                                                                                <set>
-                                                                                                    <parameter name='tmp.domainConn.esr-thirdparty-id' value="`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`" />
-                                                                                                </set>
-                                                                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                                                                                                              resource="esr-thirdparty-sdnc"
-                                                                                                              key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainConn.esr-thirdparty-id AND
-		     depth = '1'"
-                                                                                                              pfx='tmp.aai.domainConn.esr-thirdparty-sdnc' local-only='false' >
-                                                                                                    <outcome value='success'>
-                                                                                                        <block>
-                                                                                                            <set>
-                                                                                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.domainConn.url' value="`$tmp.aai.domainConn.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
-                                                                                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.domainConn.user' value="`$tmp.aai.domainConn.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
-                                                                                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.domainConn.password' value="`$tmp.aai.domainConn.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />
-                                                                                                                <!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->
-                                                                                                                <!--<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />-->
-                                                                                                                <!--<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />-->
-                                                                                                                <!--<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />-->
-                                                                                                                <!--<parameter name="format" value="json"/>-->
-                                                                                                                <!--<parameter name="httpMethod" value="get"/>-->
-                                                                                                                <!--<parameter name="responsePrefix" value="topology"/>-->
-                                                                                                                <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->
-                                                                                                                <!--<parameter name="trustStorePassword" value="adminadmin"/>-->
-                                                                                                                <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->
-                                                                                                                <!--<parameter name="keyStorePassword" value="adminadmin"/>-->
-                                                                                                            </set>
-                                                                                                        </block>
-                                                                                                    </outcome>
-                                                                                                    <outcome value='not-found'>
-                                                                                                        <return status='failure'>
-                                                                                                            <parameter name='ack-final' value='Y'/>
-                                                                                                            <parameter name="error-code" value="500" />
-                                                                                                            <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                                                                                        </return>
-                                                                                                    </outcome>
-                                                                                                    <outcome value='Other'>
-                                                                                                        <return status='failure'>
-                                                                                                            <parameter name='ack-final' value='Y'/>
-                                                                                                            <parameter name="error-code" value="500" />
-                                                                                                            <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                                                                                        </return>
-                                                                                                    </outcome>
-                                                                                                </get-resource>
-                                                                                            </block>
-                                                                                        </outcome>
-                                                                                    </switch>
-                                                                                </for>
-                                                                            </block>
-                                                                        </outcome>
-                                                                        <outcome value='not-found'>
-                                                                            <return status='failure'>
-                                                                                <parameter name='ack-final' value='Y'/>
-                                                                                <parameter name="error-code" value="500" />
-                                                                                <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                                                            </return>
-                                                                        </outcome>
-                                                                        <outcome value='Other'>
-                                                                            <return status='failure'>
-                                                                                <parameter name='ack-final' value='Y'/>
-                                                                                <parameter name="error-code" value="500" />
-                                                                                <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                                                            </return>
-                                                                        </outcome>
-                                                                    </get-resource>
-                                                                </block>
-                                                                <set>
-                                                                    <!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->
-                                                                    <parameter name='eth-service-name' value='`$tmp.aai.connectivity.etht-svc-name`' />
-                                                                    <parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />
-                                                                    <parameter name='provider-id' value='`$tmp.aai.connectivity.access-provider-id`' />
-                                                                    <parameter name='client-id' value='`$tmp.aai.connectivity.access-client-id`' />
-                                                                    <parameter name='topology-id' value='`$tmp.aai.connectivity.access-topology-id`' />
-                                                                    <!--<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />-->
-                                                                    <!--<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->
-                                                                    <!--<parameter name='index-number' value='0' />-->
-                                                                    <!--<parameter name='eth-node-id' value='`$tmp.aai.connectivityA.access-node-id`' />-->
-                                                                    <!--<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityA.access-ltp-id`' />-->
-                                                                    <!--<parameter name='CIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />-->
-                                                                    <!--<parameter name='EIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />-->
-                                                                    <!--<parameter name='cvlan' value='`$tmp.aai.connectivityA.cvlan`' />-->
-                                                                </set>
-                                                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                                                    <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.cll-ethernet-service-loop.templatefile`" />
-                                                                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`" />
-                                                                    <!--<parameter name="restapiUrl" value="`$prop.restapi.connection-oof-url`" />-->
-                                                                    <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`" />
-                                                                    <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`" />
-                                                                    <parameter name="format" value="json"/>
-                                                                    <parameter name="httpMethod" value="patch"/>
-                                                                    <parameter name='dirPath' value="/opt/onap/sdnc/restconfapi/yang" />
-                                                                    <parameter name="responsePrefix" value="vpn-result"/>
-                                                                    <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
-                                                                    <parameter name="trustStorePassword" value="adminadmin"/>
-                                                                    <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
-                                                                    <parameter name="keyStorePassword" value="adminadmin"/>
-                                                                    <outcome value='failure'></outcome>
-                                                                    <outcome value='success'>
-                                                                        <block atomic="true">
-                                                                            <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
-                                                                                    key='connectivity.connectivity-id = $tmp.aai.connectivity.connectivity-id'>
-                                                                                <parameter name='connectivity-id' value='`$tmp.aai.connectivity.connectivity-id`' />
-                                                                                <parameter name='operational-status' value='Activated' />
-                                                                            </update>
-                                                                        </block>
-                                                                    </outcome>
-                                                                </execute>
-                                                            </block>
-                                                        </outcome>
-                                                        <outcome value='root'>
-                                                            <block>
-                                                                <set>
-                                                                    <parameter name='`ethernet-srv-end-points-list.`' value='' />
-                                                                    <parameter name='`ethernet-srv-end-points-list_length`' value='0' />
-                                                                    <parameter name='`epidx`' value='0' />
-                                                                </set>
-                                                                <set>
-                                                                    <parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:root-primary' />
-                                                                </set>
-                                                                <for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.connectivity.relationship-list.relationship_length`' >
-                                                                    <switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>
-                                                                        <outcome value='uni'>
-                                                                            <block atomic="true">
-                                                                                <set>
-                                                                                    <parameter name='tmp.aai.uni.' value='' />
-                                                                                </set>
-                                                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                                                                                              resource="uni"
-                                                                                              key="uni.id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value"
-                                                                                              local-only="false"
-                                                                                              pfx="tmp.aai.uni" >
-                                                                                    <outcome value='not-found'>
-                                                                                        <return status='failure'>
-                                                                                            <parameter name='ack-final' value='Y'/>
-                                                                                            <parameter name="error-code" value="500" />
-                                                                                            <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
-                                                                                        </return>
-                                                                                    </outcome>
-                                                                                    <outcome value='failure'>
-                                                                                        <return status='failure'>
-                                                                                            <parameter name='error-code' value='' />
-                                                                                            <parameter name='error-message' value='' />
-                                                                                        </return>
-                                                                                    </outcome>
-                                                                                    <outcome value='success'>
-                                                                                        <block atomic="true"></block>
-                                                                                    </outcome>
-                                                                                </get-resource>
-                                                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
-                                                                                    <parameter name="original_string" value='`$tmp.aai.uni.id`'/>
-                                                                                    <!--<parameter name="regex" value="[^-]+$"/>-->
-                                                                                    <parameter name="regex" value="[-]+"/>
-                                                                                    <parameter name="ctx_memory_result_key" value="param-prefix-uni"/>
-                                                                                    <outcome value='success'>
-                                                                                        <block atomic="true">
-                                                                                            <set>
-                                                                                                <parameter name='tmp.uni-node-id-short' value='`$param-prefix-uni[$param-prefix-uni_length -4]`' />
-                                                                                            </set>
-                                                                                        </block>
-                                                                                    </outcome>
-                                                                                    <outcome value='failure'>
-                                                                                        <return status='failure'>
-                                                                                            <parameter name='error-code' value='' />
-                                                                                            <parameter name='error-message' value="An error occured while splitting sna1_route" />
-                                                                                        </return>
-                                                                                    </outcome>
-                                                                                </execute>
                                                                                 <set>
-                                                                                    <!--<parameter name='`ethernet-srv-end-points-list[$epidx].ethernet-end-point-name`' value='`$tmp.aai.connectivity.connectivity-id`' />-->
-                                                                                    <parameter name='`ethernet-srv-end-points-list[$epidx].ethernet-end-point-name`' value='`$tmp.aai.uni.id`' />
-                                                                                    <parameter name='`ethernet-srv-end-points-list[$epidx].index-number`' value='0' />
-                                                                                    <parameter name='`ethernet-srv-end-points-list[$epidx].eth-node-id`' value='`$tmp.uni-node-id-short`' />
-                                                                                    <parameter name='`ethernet-srv-end-points-list[$epidx].eth-node-tp-id`' value='`$tmp.aai.uni.tp-id`' />
-                                                                                    <parameter name='`ethernet-srv-end-points-list[$epidx].leafOrRootAccess`' value='`$leafOrRootAccess`' />
-                                                                                    <parameter name='`ethernet-srv-end-points-list[$epidx].cvlan`' value='`$tmp.aai.connectivity.cvlan`' />
-                                                                                    <parameter name='`ethernet-srv-end-points-list[$epidx].CIR`' value='`$tmp.aai.uni.data-source * 1000000`' />
-                                                                                    <parameter name='`ethernet-srv-end-points-list[$epidx].EIR`' value='`$tmp.aai.uni.data-source * 1000000`' />
-                                                                                    <parameter name='`ethernet-srv-end-points-list_length`' value='`$epidx + 1`' />
+                                                                                    <parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:root-primary' />
                                                                                 </set>
+                                                                            </outcome>
+                                                                            <outcome value='root-secondary'>
                                                                                 <set>
-                                                                                    <parameter name='`epidx`' value='`$epidx + 1`' />
+                                                                                    <parameter name='`ethernet-srv-end-points-list.`' value='' />
+                                                                                    <parameter name='`ethernet-srv-end-points-list_length`' value='0' />
+                                                                                    <parameter name='`epidx`' value='0' />
                                                                                 </set>
-                                                                            </block>
-                                                                        </outcome>
-                                                                    </switch>
-                                                                </for>
-                                                                <set>
-                                                                    <parameter name='filenameclleths' value="`$leafOrRootAccess + $tmp.aai.connectivity.access-node-id`" />
-                                                                </set>
-                                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >
-                                                                    <parameter name="filename" value="`$filenameclleths`" />
-                                                                </execute>
-                                                                <set>
-                                                                    <parameter name='`otn-tunnels-name-list.`' value='' />
-                                                                    <parameter name='`otn-tunnels-name-list_length`' value='0' />
-                                                                    <parameter name='`otntunsidx`' value='0' />
-                                                                </set>
-                                                                <for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.connectivity.relationship-list.relationship_length`' >
-                                                                    <switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>
-                                                                        <outcome value='vpn-binding'>
-                                                                            <block atomic="true">
                                                                                 <set>
-                                                                                    <parameter name='tmp.aai.vpn-binding.' value='' />
+                                                                                    <parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:root-secondary' />
                                                                                 </set>
-                                                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                                                                                              resource="vpn-binding"
-                                                                                              key="vpn-binding.vpn-id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value"
-                                                                                              local-only="false"
-                                                                                              pfx="tmp.aai.vpn-binding" >
-                                                                                    <outcome value='not-found'>
-                                                                                        <return status='failure'>
-                                                                                            <parameter name='ack-final' value='Y'/>
-                                                                                            <parameter name="error-code" value="500" />
-                                                                                            <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
-                                                                                        </return>
-                                                                                    </outcome>
-                                                                                    <outcome value='failure'>
-                                                                                        <return status='failure'>
-                                                                                            <parameter name='error-code' value='' />
-                                                                                            <parameter name='error-message' value='' />
-                                                                                        </return>
-                                                                                    </outcome>
-                                                                                    <outcome value='success'>
-                                                                                        <block atomic="true">
-                                                                                            <set>
-                                                                                                <parameter name='`otn-tunnels-name-list[$otntunsidx].otn-tunnel-name`' value='`$tmp.aai.vpn-binding.vpn-name`' />
-                                                                                                <parameter name='`otn-tunnels-name-list[$otntunsidx].vpn-id`' value='`$tmp.aai.vpn-binding.vpn-id`' />
-                                                                                                <parameter name='`otn-tunnels-name-list_length`' value='`$otntunsidx + 1`' />
-                                                                                            </set>
-                                                                                            <set>
-                                                                                                <parameter name='`otntunsidx`' value='`$otntunsidx + 1`' />
-                                                                                            </set>
-                                                                                        </block>
-                                                                                    </outcome>
-                                                                                </get-resource>
-                                                                            </block>
-                                                                        </outcome>
-                                                                    </switch>
-                                                                </for>
-                                                                <set>
-                                                                    <parameter name='filenamecllotns' value="`leafrootOTNtunnelnames`" />
-                                                                </set>
-                                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >
-                                                                    <parameter name="filename" value="`$filenamecllotns`" />
-                                                                </execute>
-                                                                <block atomic="true">
-                                                                    <set>
-                                                                        <parameter name='tmp.pnf-name-forUrl' value="`'networkId-providerId-' +
+                                                                            </outcome>
+                                                                            <outcome value='Other'>
+                                                                                <block></block>
+                                                                            </outcome>
+                                                                        </switch>
+                                                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
+                                                                            <parameter name="original_string" value='`$tmp.aai.uni.id`'/>
+                                                                            <!--<parameter name="regex" value="[^-]+$"/>-->
+                                                                            <parameter name="regex" value="[-]+"/>
+                                                                            <parameter name="ctx_memory_result_key" value="param-prefix-uni"/>
+                                                                            <outcome value='success'>
+                                                                                <block atomic="true">
+                                                                                    <set>
+                                                                                        <parameter name='tmp.uni-node-id-short' value='`$param-prefix-uni[$param-prefix-uni_length -4]`' />
+                                                                                    </set>
+                                                                                </block>
+                                                                            </outcome>
+                                                                            <outcome value='failure'>
+                                                                                <return status='failure'>
+                                                                                    <parameter name='error-code' value='' />
+                                                                                    <parameter name='error-message' value="An error occured while splitting sna1_route" />
+                                                                                </return>
+                                                                            </outcome>
+                                                                        </execute>
+                                                                        <set>
+                                                                            <!--<parameter name='`ethernet-srv-end-points-list[$epidx].ethernet-end-point-name`' value='`$tmp.aai.connectivity.connectivity-id`' />-->
+                                                                            <parameter name='`ethernet-srv-end-points-list[$epidx].ethernet-end-point-name`' value='`$tmp.aai.uni.id`' />
+                                                                            <parameter name='`ethernet-srv-end-points-list[$epidx].index-number`' value='0' />
+                                                                            <parameter name='`ethernet-srv-end-points-list[$epidx].eth-node-id`' value='`$tmp.uni-node-id-short`' />
+                                                                            <parameter name='`ethernet-srv-end-points-list[$epidx].eth-node-tp-id`' value='`$tmp.aai.uni.tp-id`' />
+                                                                            <parameter name='`ethernet-srv-end-points-list[$epidx].leafOrRootAccess`' value='`$leafOrRootAccess`' />
+                                                                            <parameter name='`ethernet-srv-end-points-list[$epidx].cvlan`' value='`$tmp.aai.connectivity.cvlan`' />
+                                                                            <parameter name='`ethernet-srv-end-points-list[$epidx].CIR`' value='`$tmp.aai.uni.data-source * 1000000`' />
+                                                                            <parameter name='`ethernet-srv-end-points-list[$epidx].EIR`' value='`$tmp.aai.uni.data-source * 1000000`' />
+                                                                            <parameter name='`ethernet-srv-end-points-list_length`' value='`$epidx + 1`' />
+                                                                        </set>
+                                                                        <set>
+                                                                            <parameter name='`epidx`' value='`$epidx + 1`' />
+                                                                        </set>
+                                                                    </block>
+                                                                </outcome>
+                                                            </switch>
+                                                        </for>
+                                                        <set>
+                                                            <parameter name='filenameclleths' value="`$leafOrRootAccess + $tmp.aai.connectivity.access-node-id`" />
+                                                        </set>
+                                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >
+                                                            <parameter name="filename" value="`$filenameclleths`" />
+                                                        </execute>
+                                                        <set>
+                                                            <parameter name='`otn-tunnels-name-list.`' value='' />
+                                                            <parameter name='`otn-tunnels-name-list_length`' value='0' />
+                                                            <parameter name='`otntunsidx`' value='0' />
+                                                        </set>
+                                                        <for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.connectivity.relationship-list.relationship_length`' >
+                                                            <switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>
+                                                                <outcome value='vpn-binding'>
+                                                                    <block atomic="true">
+                                                                        <set>
+                                                                            <parameter name='tmp.aai.vpn-binding.' value='' />
+                                                                        </set>
+                                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                      resource="vpn-binding"
+                                                                                      key="vpn-binding.vpn-id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value"
+                                                                                      local-only="false"
+                                                                                      pfx="tmp.aai.vpn-binding" >
+                                                                            <outcome value='not-found'>
+                                                                                <return status='failure'>
+                                                                                    <parameter name='ack-final' value='Y'/>
+                                                                                    <parameter name="error-code" value="500" />
+                                                                                    <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
+                                                                                </return>
+                                                                            </outcome>
+                                                                            <outcome value='failure'>
+                                                                                <return status='failure'>
+                                                                                    <parameter name='error-code' value='' />
+                                                                                    <parameter name='error-message' value='' />
+                                                                                </return>
+                                                                            </outcome>
+                                                                            <outcome value='success'>
+                                                                                <block atomic="true">
+                                                                                    <set>
+                                                                                        <parameter name='`otn-tunnels-name-list[$otntunsidx].otn-tunnel-name`' value='`$tmp.aai.vpn-binding.vpn-name`' />
+                                                                                        <parameter name='`otn-tunnels-name-list[$otntunsidx].vpn-id`' value='`$tmp.aai.vpn-binding.vpn-id`' />
+                                                                                        <parameter name='`otn-tunnels-name-list_length`' value='`$otntunsidx + 1`' />
+                                                                                    </set>
+                                                                                    <set>
+                                                                                        <parameter name='`otntunsidx`' value='`$otntunsidx + 1`' />
+                                                                                    </set>
+                                                                                </block>
+                                                                            </outcome>
+                                                                        </get-resource>
+                                                                    </block>
+                                                                </outcome>
+                                                            </switch>
+                                                        </for>
+                                                        <set>
+                                                            <parameter name='filenamecllotns' value="`leafrootOTNtunnelnames`" />
+                                                        </set>
+                                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >
+                                                            <parameter name="filename" value="`$filenamecllotns`" />
+                                                        </execute>
+                                                        <block atomic="true">
+                                                            <set>
+                                                                <parameter name='tmp.pnf-name-forUrl' value="`'networkId-providerId-' +
                                                    $tmp.aai.connectivity.access-provider-id + '-clientId-' +
                                                    $tmp.aai.connectivity.access-client-id + '-topologyId-' +
                                                    $tmp.aai.connectivity.access-topology-id + '-nodeId-' +
                                                    $tmp.aai.connectivity.access-node-id`" />
-                                                                    </set>
-                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                                                                                  resource="pnf"
-                                                                                  key="pnf.pnf-name = $tmp.pnf-name-forUrl"
-                                                                                  pfx='tmp.aai.source-pnf' local-only='false' >
-                                                                        <!--AND depth = '0'"-->
-                                                                        <outcome value='success'>
-                                                                            <block>
-                                                                                <for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >
-                                                                                    <switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>
-                                                                                        <outcome value='esr-thirdparty-sdnc'>
-                                                                                            <block atomic="true">
-                                                                                                <set>
-                                                                                                    <parameter name='tmp.domainConn.esr-thirdparty-id' value="`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`" />
-                                                                                                </set>
-                                                                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                                                                                                              resource="esr-thirdparty-sdnc"
-                                                                                                              key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainConn.esr-thirdparty-id AND
+                                                            </set>
+                                                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                          resource="pnf"
+                                                                          key="pnf.pnf-name = $tmp.pnf-name-forUrl"
+                                                                          pfx='tmp.aai.source-pnf' local-only='false' >
+                                                                <!--AND depth = '0'"-->
+                                                                <outcome value='success'>
+                                                                    <block>
+                                                                        <for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >
+                                                                            <switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>
+                                                                                <outcome value='esr-thirdparty-sdnc'>
+                                                                                    <block atomic="true">
+                                                                                        <set>
+                                                                                            <parameter name='tmp.domainConn.esr-thirdparty-id' value="`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`" />
+                                                                                        </set>
+                                                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                      resource="esr-thirdparty-sdnc"
+                                                                                                      key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainConn.esr-thirdparty-id AND
 		     depth = '1'"
-                                                                                                              pfx='tmp.aai.domainConn.esr-thirdparty-sdnc' local-only='false' >
-                                                                                                    <outcome value='success'>
-                                                                                                        <block>
-                                                                                                            <set>
-                                                                                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.domainConn.url' value="`$tmp.aai.domainConn.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
-                                                                                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.domainConn.user' value="`$tmp.aai.domainConn.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
-                                                                                                                <parameter name='prop.sdncRestApi.thirdpartySdnc.domainConn.password' value="`$tmp.aai.domainConn.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />
-                                                                                                                <!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->
-                                                                                                                <!--<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />-->
-                                                                                                                <!--<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />-->
-                                                                                                                <!--<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />-->
-                                                                                                                <!--<parameter name="format" value="json"/>-->
-                                                                                                                <!--<parameter name="httpMethod" value="get"/>-->
-                                                                                                                <!--<parameter name="responsePrefix" value="topology"/>-->
-                                                                                                                <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->
-                                                                                                                <!--<parameter name="trustStorePassword" value="adminadmin"/>-->
-                                                                                                                <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->
-                                                                                                                <!--<parameter name="keyStorePassword" value="adminadmin"/>-->
-                                                                                                            </set>
-                                                                                                        </block>
-                                                                                                    </outcome>
-                                                                                                    <outcome value='not-found'>
-                                                                                                        <return status='failure'>
-                                                                                                            <parameter name='ack-final' value='Y'/>
-                                                                                                            <parameter name="error-code" value="500" />
-                                                                                                            <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                                                                                        </return>
-                                                                                                    </outcome>
-                                                                                                    <outcome value='Other'>
-                                                                                                        <return status='failure'>
-                                                                                                            <parameter name='ack-final' value='Y'/>
-                                                                                                            <parameter name="error-code" value="500" />
-                                                                                                            <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                                                                                        </return>
-                                                                                                    </outcome>
-                                                                                                </get-resource>
-                                                                                            </block>
-                                                                                        </outcome>
-                                                                                    </switch>
-                                                                                </for>
-                                                                            </block>
-                                                                        </outcome>
-                                                                        <outcome value='not-found'>
-                                                                            <return status='failure'>
-                                                                                <parameter name='ack-final' value='Y'/>
-                                                                                <parameter name="error-code" value="500" />
-                                                                                <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                                                            </return>
-                                                                        </outcome>
-                                                                        <outcome value='Other'>
-                                                                            <return status='failure'>
-                                                                                <parameter name='ack-final' value='Y'/>
-                                                                                <parameter name="error-code" value="500" />
-                                                                                <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                                                            </return>
-                                                                        </outcome>
-                                                                    </get-resource>
+                                                                                                      pfx='tmp.aai.domainConn.esr-thirdparty-sdnc' local-only='false' >
+                                                                                            <outcome value='success'>
+                                                                                                <block>
+                                                                                                    <set>
+                                                                                                        <parameter name='prop.sdncRestApi.thirdpartySdnc.domainConn.url' value="`$tmp.aai.domainConn.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
+                                                                                                        <parameter name='prop.sdncRestApi.thirdpartySdnc.domainConn.user' value="`$tmp.aai.domainConn.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
+                                                                                                        <parameter name='prop.sdncRestApi.thirdpartySdnc.domainConn.password' value="`$tmp.aai.domainConn.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />
+                                                                                                        <!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->
+                                                                                                        <!--<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />-->
+                                                                                                        <!--<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />-->
+                                                                                                        <!--<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />-->
+                                                                                                        <!--<parameter name="format" value="json"/>-->
+                                                                                                        <!--<parameter name="httpMethod" value="get"/>-->
+                                                                                                        <!--<parameter name="responsePrefix" value="topology"/>-->
+                                                                                                        <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->
+                                                                                                        <!--<parameter name="trustStorePassword" value="adminadmin"/>-->
+                                                                                                        <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->
+                                                                                                        <!--<parameter name="keyStorePassword" value="adminadmin"/>-->
+                                                                                                    </set>
+                                                                                                </block>
+                                                                                            </outcome>
+                                                                                            <outcome value='not-found'>
+                                                                                                <return status='failure'>
+                                                                                                    <parameter name='ack-final' value='Y'/>
+                                                                                                    <parameter name="error-code" value="500" />
+                                                                                                    <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                </return>
+                                                                                            </outcome>
+                                                                                            <outcome value='Other'>
+                                                                                                <return status='failure'>
+                                                                                                    <parameter name='ack-final' value='Y'/>
+                                                                                                    <parameter name="error-code" value="500" />
+                                                                                                    <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                </return>
+                                                                                            </outcome>
+                                                                                        </get-resource>
+                                                                                    </block>
+                                                                                </outcome>
+                                                                            </switch>
+                                                                        </for>
+                                                                    </block>
+                                                                </outcome>
+                                                                <outcome value='not-found'>
+                                                                    <return status='failure'>
+                                                                        <parameter name='ack-final' value='Y'/>
+                                                                        <parameter name="error-code" value="500" />
+                                                                        <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                    </return>
+                                                                </outcome>
+                                                                <outcome value='Other'>
+                                                                    <return status='failure'>
+                                                                        <parameter name='ack-final' value='Y'/>
+                                                                        <parameter name="error-code" value="500" />
+                                                                        <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                    </return>
+                                                                </outcome>
+                                                            </get-resource>
+                                                        </block>
+                                                        <set>
+                                                            <!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->
+                                                            <parameter name='eth-service-name' value='`$tmp.aai.connectivity.etht-svc-name`' />
+                                                            <parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />
+                                                            <parameter name='provider-id' value='`$tmp.aai.connectivity.access-provider-id`' />
+                                                            <parameter name='client-id' value='`$tmp.aai.connectivity.access-client-id`' />
+                                                            <parameter name='topology-id' value='`$tmp.aai.connectivity.access-topology-id`' />
+                                                            <!--<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />-->
+                                                            <!--<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->
+                                                            <!--<parameter name='index-number' value='0' />-->
+                                                            <!--<parameter name='eth-node-id' value='`$tmp.aai.connectivityA.access-node-id`' />-->
+                                                            <!--<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityA.access-ltp-id`' />-->
+                                                            <!--<parameter name='CIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />-->
+                                                            <!--<parameter name='EIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />-->
+                                                            <!--<parameter name='cvlan' value='`$tmp.aai.connectivityA.cvlan`' />-->
+                                                        </set>
+                                                        <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                            <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.cll-ethernet-service-loop.templatefile`" />
+                                                            <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`" />
+                                                            <!--<parameter name="restapiUrl" value="`$prop.restapi.connection-oof-url`" />-->
+                                                            <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`" />
+                                                            <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`" />
+                                                            <parameter name="format" value="json"/>
+                                                            <parameter name="httpMethod" value="patch"/>
+                                                            <parameter name='dirPath' value="/opt/onap/sdnc/restconfapi/yang" />
+                                                            <parameter name="responsePrefix" value="vpn-result"/>
+                                                            <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
+                                                            <parameter name="trustStorePassword" value="adminadmin"/>
+                                                            <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                                                            <parameter name="keyStorePassword" value="adminadmin"/>
+                                                            <outcome value='failure'></outcome>
+                                                            <outcome value='success'>
+                                                                <block atomic="true">
+                                                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
+                                                                            key='connectivity.connectivity-id = $tmp.aai.connectivity.connectivity-id'>
+                                                                        <parameter name='connectivity-id' value='`$tmp.aai.connectivity.connectivity-id`' />
+                                                                        <parameter name='operational-status' value='Activated' />
+                                                                    </update>
                                                                 </block>
-                                                                <set>
-                                                                    <!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->
-                                                                    <parameter name='eth-service-name' value='`$tmp.aai.connectivity.etht-svc-name`' />
-                                                                    <parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />
-                                                                    <parameter name='provider-id' value='`$tmp.aai.connectivity.access-provider-id`' />
-                                                                    <parameter name='client-id' value='`$tmp.aai.connectivity.access-client-id`' />
-                                                                    <parameter name='topology-id' value='`$tmp.aai.connectivity.access-topology-id`' />
-                                                                    <!--<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />-->
-                                                                    <!--<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->
-                                                                    <!--<parameter name='index-number' value='0' />-->
-                                                                    <!--<parameter name='eth-node-id' value='`$tmp.aai.connectivityA.access-node-id`' />-->
-                                                                    <!--<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityA.access-ltp-id`' />-->
-                                                                    <!--<parameter name='CIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />-->
-                                                                    <!--<parameter name='EIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />-->
-                                                                    <!--<parameter name='cvlan' value='`$tmp.aai.connectivityA.cvlan`' />-->
-                                                                </set>
-                                                                <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                                                    <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.cll-ethernet-service-loop.templatefile`" />
-                                                                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`" />
-                                                                    <!--<parameter name="restapiUrl" value="`$prop.restapi.connection-oof-url`" />-->
-                                                                    <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.user`" />
-                                                                    <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainConn.password`" />
-                                                                    <parameter name="format" value="json"/>
-                                                                    <parameter name="httpMethod" value="patch"/>
-                                                                    <parameter name='dirPath' value="/opt/onap/sdnc/restconfapi/yang" />
-                                                                    <parameter name="responsePrefix" value="vpn-result"/>
-                                                                    <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
-                                                                    <parameter name="trustStorePassword" value="adminadmin"/>
-                                                                    <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
-                                                                    <parameter name="keyStorePassword" value="adminadmin"/>
-                                                                    <outcome value='failure'></outcome>
-                                                                    <outcome value='success'>
-                                                                        <block atomic="true">
-                                                                            <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
-                                                                                    key='connectivity.connectivity-id = $tmp.aai.connectivity.connectivity-id'>
-                                                                                <parameter name='connectivity-id' value='`$tmp.aai.connectivity.connectivity-id`' />
-                                                                                <parameter name='operational-status' value='Activated' />
-                                                                            </update>
-                                                                        </block>
-                                                                    </outcome>
-                                                                </execute>
-                                                            </block>
-                                                        </outcome>
-                                                        <outcome value='Other'>
-                                                            <block></block>
-                                                        </outcome>
-                                                    </switch>
+                                                            </outcome>
+                                                        </execute>
+                                                    </block>
                                                 </block>
                                             </outcome>
                                         </switch>
diff --git a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1.xml b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1.xml
index c0981140..a874168f 100644
--- a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1.xml
@@ -208,6 +208,7 @@
                                     <parameter name='connectivity-id' value='`$uuid.connectivity-otnidx-uuid`' />
                                     <!--<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />-->
                                     <parameter name='operational-status' value='Created' />
+                                    <parameter name='access-provider-id' value='`$tmp.access-provider-id`' />
                                     <!--<parameter name='access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->
                                     <!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->
                                     <!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->
@@ -327,6 +328,338 @@
                     </switch>
                 </block>
             </for>
+            <switch test="`$tmp.otninfoProtect_length > 0`">
+                <outcome value='true'>
+                    <block atomic='true'>
+                        <set>
+                            <parameter name='tmp.srcdstpnf-name' value='' />
+                            <parameter name='prop.vpn-binding-otnidx-uuid' value='' />
+                            <parameter name='tmp.access-provider-id' value='' />
+                            <parameter name='tmp.access-client-id' value='' />
+                            <parameter name='tmp.access-topology-id' value='' />
+                            <parameter name='tmp.srcdstpnf-id' value='' />
+                            <parameter name='tmp.aai.srcdst-pnf.' value='' />
+                            <parameter name='tmp.domainG.esr-thirdparty-id' value='' />
+                            <parameter name='tmp.aai.domainG.esr-thirdparty-sdnc.' value='' />
+                            <parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.url' value='' />
+                            <parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.user' value='' />
+                            <parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.password' value='' />
+                            <parameter name='tmp.srcTtpdstTtpPair' value='' />
+                        </set>
+                        <for index='otnidx' start='0' end='`$tmp.otninfoProtect_length`' >
+                            <block atomic='true'>
+                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
+                                    <parameter name="ctx-destination" value="prop.vpn-binding-otnidx-uuid"/>
+                                </execute>
+                                <switch test="`$tmp.otninfoProtect[$otnidx].dstPort.dst-access-provider-id == ''`">
+                                    <outcome value='true'>
+                                        <set>
+                                            <parameter name='tmp.access-provider-id' value='`$tmp.otninfoProtect[$otnidx].srcPort.src-access-provider-id`' />
+                                            <parameter name='tmp.access-client-id' value='`$tmp.otninfoProtect[$otnidx].srcPort.src-access-client-id`' />
+                                            <parameter name='tmp.access-topology-id' value='`$tmp.otninfoProtect[$otnidx].srcPort.src-access-topology-id`' />
+                                            <parameter name='tmp.srcdstpnf-id' value='`$tmp.otninfoProtect[$otnidx].srcPort.src-access-node-id`' />
+                                        </set>
+                                    </outcome>
+                                    <outcome value='false'>
+                                        <set>
+                                            <parameter name='tmp.access-provider-id' value='`$tmp.otninfoProtect[$otnidx].dstPort.dst-access-provider-id`' />
+                                            <parameter name='tmp.access-client-id' value='`$tmp.otninfoProtect[$otnidx].dstPort.dst-access-client-id`' />
+                                            <parameter name='tmp.access-topology-id' value='`$tmp.otninfoProtect[$otnidx].dstPort.dst-access-topology-id`' />
+                                            <parameter name='tmp.srcdstpnf-id' value='`$tmp.otninfoProtect[$otnidx].dstPort.dst-access-node-id`' />
+                                        </set>
+                                    </outcome>
+                                </switch>
+                                <set>
+                                    <parameter name='tmp.srcdstpnf-name' value="`'networkId-providerId-' +
+                                             $tmp.access-provider-id + '-clientId-' +
+                                             $tmp.access-client-id + '-topologyId-' +
+                                             $tmp.access-topology-id + '-nodeId-' +
+                                             $tmp.srcdstpnf-id`" />
+                                </set>
+                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                              resource="pnf"
+                                              key="pnf.pnf-name = $tmp.srcdstpnf-name"
+                                              pfx='tmp.aai.srcdst-pnf' local-only='false' >
+                                    <!--AND depth = '0'"-->
+                                    <outcome value='success'>
+                                        <block>
+                                            <for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.srcdst-pnf.relationship-list.relationship_length`' >
+                                                <switch test='`$tmp.aai.srcdst-pnf.relationship-list.relationship[$spvidx].related-to`'>
+                                                    <outcome value='esr-thirdparty-sdnc'>
+                                                        <block atomic="true">
+                                                            <set>
+                                                                <parameter name='tmp.domainG.esr-thirdparty-id' value="`$tmp.aai.srcdst-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`" />
+                                                            </set>
+                                                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                          resource="esr-thirdparty-sdnc"
+                                                                          key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainG.esr-thirdparty-id AND
+		     depth = '1'"
+                                                                          pfx='tmp.aai.domainG.esr-thirdparty-sdnc' local-only='false' >
+                                                                <outcome value='success'>
+                                                                    <block>
+                                                                        <set>
+                                                                            <parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.url' value="`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
+                                                                            <parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.user' value="`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
+                                                                            <parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.password' value="`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />
+                                                                            <!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->
+                                                                            <!--<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />-->
+                                                                            <!--<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />-->
+                                                                            <!--<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />-->
+                                                                            <!--<parameter name="format" value="json"/>-->
+                                                                            <!--<parameter name="httpMethod" value="get"/>-->
+                                                                            <!--<parameter name="responsePrefix" value="topology"/>-->
+                                                                            <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->
+                                                                            <!--<parameter name="trustStorePassword" value="adminadmin"/>-->
+                                                                            <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->
+                                                                            <!--<parameter name="keyStorePassword" value="adminadmin"/>-->
+                                                                        </set>
+                                                                    </block>
+                                                                </outcome>
+                                                                <outcome value='not-found'>
+                                                                    <return status='failure'>
+                                                                        <parameter name='ack-final' value='Y'/>
+                                                                        <parameter name="error-code" value="500" />
+                                                                        <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                    </return>
+                                                                </outcome>
+                                                                <outcome value='Other'>
+                                                                    <return status='failure'>
+                                                                        <parameter name='ack-final' value='Y'/>
+                                                                        <parameter name="error-code" value="500" />
+                                                                        <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                    </return>
+                                                                </outcome>
+                                                            </get-resource>
+                                                        </block>
+                                                    </outcome>
+                                                </switch>
+                                            </for>
+                                        </block>
+                                    </outcome>
+                                    <outcome value='not-found'>
+                                        <return status='failure'>
+                                            <parameter name='ack-final' value='Y'/>
+                                            <parameter name="error-code" value="500" />
+                                            <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                        </return>
+                                    </outcome>
+                                    <outcome value='Other'>
+                                        <return status='failure'>
+                                            <parameter name='ack-final' value='Y'/>
+                                            <parameter name="error-code" value="500" />
+                                            <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                        </return>
+                                    </outcome>
+                                </get-resource>
+                                <switch test='`$otnidx == 0`'>
+                                    <outcome value='true'>
+                                        <block>
+                                            <set>
+                                                <parameter name='tmp.domainG-src-access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />
+                                                <parameter name='tmp.domainG-dst-access-node-id' value='`$tmp.otninfoProtect[$otnidx].dstPort.dst-access-node-id`' />
+                                            </set>
+                                        </block>
+                                    </outcome>
+                                    <outcome value='false'>
+                                        <switch test='`$otnidx == $tmp.otninfoProtect_length - 1`'>
+                                            <outcome value='true'>
+                                                <block>
+                                                    <set>
+                                                        <parameter name='tmp.domainG-src-access-node-id' value='`$tmp.otninfoProtect[$otnidx].srcPort.src-access-node-id`' />
+                                                        <parameter name='tmp.domainG-dst-access-node-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -3]`' />
+                                                    </set>
+                                                </block>
+                                            </outcome>
+                                            <outcome value='false'>
+                                                <set>
+                                                    <parameter name='tmp.domainG-src-access-node-id' value='`$tmp.otninfoProtect[$otnidx].srcPort.src-access-node-id`' />
+                                                    <parameter name='tmp.domainG-dst-access-node-id' value='`$tmp.otninfoProtect[$otnidx].dstPort.dst-access-node-id`' />
+                                                </set>
+                                            </outcome>
+                                        </switch>
+                                    </outcome>
+                                </switch>
+                                <set>
+                                    <parameter name='tmp.srcTtpdstTtpPair' value="`$tmp.otninfoProtect[$otnidx].srcPort.src-tunnel-tp-id + ',' +
+                                               $tmp.otninfootninfoProtect.dstPort.dst-tunnel-tp-id`" />
+                                </set>
+                                <set>
+                                    <parameter name='tmp.current-provider-id' value='`$tmp.access-provider-id`' />
+                                    <parameter name='tmp.current-cvlan-id' value='`$tmp.aai.network-route-A.logical-interface-id`' />
+                                </set>
+                                <call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-connectivity' mode='sync' ></call>
+                                <set>
+                                    <parameter name='prop.ethernet-service-name' value='`$middle-man-conn.etht-svc-name`' />
+                                </set>
+                                <switch test="`$found-connectivity`">
+                                    <outcome value='false'>
+                                        <block>
+                                            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
+                                                  key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid' >
+                                                <parameter name='vpn-id' value='`$prop.vpn-binding-otnidx-uuid`' />
+                                                <parameter name='vpn-name' value="`$prop.otn-tunnel-name + '-protection'`" />
+                                                <!--<parameter name='customer-vpn-id' value='`($idx + 1) * 10`' />-->
+                                                <!--<parameter name='customer-vpn-id' value='`($maxtpn + $gfp)`' />-->
+                                                <parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />
+                                                <!--<parameter name='access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->
+                                                <parameter name='access-provider-id' value='`$tmp.access-provider-id`' />
+                                                <!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->
+                                                <parameter name='access-client-id' value='`$tmp.access-client-id`' />
+                                                <!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->
+                                                <parameter name='access-topology-id' value='`$tmp.access-topology-id`' />
+                                                <!--<parameter name='src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->
+                                                <parameter name='src-access-node-id' value='`$tmp.domainG-src-access-node-id`' />
+                                                <parameter name='src-access-ltp-id' value='`$tmp.otninfoProtect[$otnidx].srcPort.src-tunnel-tp-id`' />
+                                                <!--<parameter name='dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />-->
+                                                <parameter name='dst-access-node-id' value='`$tmp.domainG-dst-access-node-id`' />
+                                                <parameter name='dst-access-ltp-id' value='`$tmp.otninfoProtect[$otnidx].dstPort.dst-tunnel-tp-id`' />
+                                                <parameter name='route-distinguisher' value='`$gfp`' />
+                                                <parameter name='operational-status' value='Created' />
+                                                <parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />
+                                                <parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />
+                                                <parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />
+                                                <parameter name='vpn-region' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.url`' />
+                                                <parameter name='vpn-description' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.user`' />
+                                                <parameter name='vpn-platform' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.password`' />
+                                                <!-- The following line is in lieu of vpn-binding.slice-id (new attribute in latest AAI) -->
+                                                <!--<parameter name='ops-note' value='`$tmp.aai.service-instance.service-instance-id`' />-->
+                                                <parameter name='slice-id' value='`$tmp.aai.service-instance.service-instance-id`' />
+                                                <parameter name='ops-note' value='`$tmp.srcTtpOtnLayer`' />
+                                                <outcome value='success'>
+                                                    <block></block>
+                                                </outcome>
+                                            </save>
+                                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
+                                                <parameter name="ctx-destination" value="uuid.connectivity-otnidx-uuid"/>
+                                            </execute>
+                                            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
+                                                  key='connectivity.connectivity-id = $uuid.connectivity-otnidx-uuid'>
+                                                <parameter name='connectivity-id' value='`$uuid.connectivity-otnidx-uuid`' />
+                                                <!--<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />-->
+                                                <parameter name='operational-status' value='Created' />
+                                                <parameter name='access-provider-id' value='`$tmp.access-provider-id`' />
+                                                <!--<parameter name='access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->
+                                                <!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->
+                                                <!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->
+                                                <!--<parameter name='access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->
+                                                <!--<parameter name='access-ltp-id' value='``' />-->
+                                                <parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />
+                                                <parameter name='coupling-flag' value='`$srcTtpdstTtpPair`' />
+                                                <!--<parameter name='bandwidth-profile-name' value='`$prop.sotn.etht-svc-name`' />-->
+                                                <parameter name='bandwidth-profile-name' value='`$gfp`' />
+                                                <parameter name='vpn-type' value='dummy' />
+                                                <parameter name='cir' value='`$gfp *1000000`' />
+                                                <parameter name='eir' value='`$gfp *1000000`' />
+                                                <!--<parameter name='cbs' value='`$prop.sotn.cbs`' />-->
+                                                <!--<parameter name='ebs' value='`$prop.sotn.ebs`' />-->
+                                                <!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->
+                                                <!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->
+                                                <parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />
+                                                <parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />
+                                                <parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />
+                                                <parameter name='connectivity-selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` " />
+                                            </save>
+                                            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list'
+                                                  key='connectivity.connectivity-id = $middle-man-conn.connectivity-id'
+                                                  force="true" pfx="tmp.AnAI-data">
+                                                <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />
+                                                <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $uuid.connectivity-otnidx-uuid`" />
+                                                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />
+                                                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$uuid.connectivity-otnidx-uuid`" />
+                                            </save>
+                                            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'
+                                                  key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id
+         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id
+         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'
+                                                  force="true" pfx="tmp.AnAI-data">
+                                                <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />
+                                                <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $uuid.connectivity-otnidx-uuid`" />
+                                                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />
+                                                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$uuid.connectivity-otnidx-uuid`" />
+                                                <!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->
+                                                <!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->
+                                                <!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->
+                                                <!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->
+                                                <!--      force="true" pfx="tmp.AnAI-data">-->
+                                                <!--<parameter name="relationship-list.relationship[0].related-to" value="connectivity" />-->
+                                                <!--<parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $prop.sotn.network-id`" />-->
+                                                <!--<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />-->
+                                                <!--<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.sotn.network-id`" />-->
+                                            </save>
+                                            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list'
+                                                  key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid'
+                                                  force="true" pfx="tmp.AnAI-data">
+                                                <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />
+                                                <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $uuid.connectivity-otnidx-uuid`" />
+                                                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />
+                                                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$uuid.connectivity-otnidx-uuid`" />
+                                            </save>
+                                        </block>
+                                    </outcome>
+                                    <outcome value='true'>
+                                        <block atomic='true'>
+                                            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
+                                                  key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid' >
+                                                <parameter name='vpn-id' value='`$prop.vpn-binding-otnidx-uuid`' />
+                                                <parameter name='vpn-name' value="`$prop.otn-tunnel-name + '-protection'`" />
+                                                <!--<parameter name='customer-vpn-id' value='`($idx + 1) * 10`' />-->
+                                                <!--<parameter name='customer-vpn-id' value='`($maxtpn + $gfp)`' />-->
+                                                <parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />
+                                                <!--<parameter name='access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->
+                                                <parameter name='access-provider-id' value='`$tmp.access-provider-id`' />
+                                                <!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->
+                                                <parameter name='access-client-id' value='`$tmp.access-client-id`' />
+                                                <!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->
+                                                <parameter name='access-topology-id' value='`$tmp.access-topology-id`' />
+                                                <!--<parameter name='src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->
+                                                <parameter name='src-access-node-id' value='`$tmp.domainG-src-access-node-id`' />
+                                                <parameter name='src-access-ltp-id' value='`$tmp.otninfoProtect[$otnidx].srcPort.src-tunnel-tp-id`' />
+                                                <!--<parameter name='dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />-->
+                                                <parameter name='dst-access-node-id' value='`$tmp.domainG-dst-access-node-id`' />
+                                                <parameter name='dst-access-ltp-id' value='`$tmp.otninfoProtect[$otnidx].dstPort.dst-tunnel-tp-id`' />
+                                                <parameter name='route-distinguisher' value='`$gfp`' />
+                                                <parameter name='operational-status' value='Created' />
+                                                <parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />
+                                                <parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />
+                                                <parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />
+                                                <parameter name='vpn-region' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.url`' />
+                                                <parameter name='vpn-description' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.user`' />
+                                                <parameter name='vpn-platform' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.password`' />
+                                                <!-- The following line is in lieu of vpn-binding.slice-id (new attribute in latest AAI) -->
+                                                <!--<parameter name='ops-note' value='`$tmp.aai.service-instance.service-instance-id`' />-->
+                                                <parameter name='slice-id' value='`$tmp.aai.service-instance.service-instance-id`' />
+                                                <parameter name='ops-note' value='`$tmp.srcTtpOtnLayer`' />
+                                                <outcome value='success'>
+                                                    <block></block>
+                                                </outcome>
+                                            </save>
+                                            <set>
+                                                <parameter name='tmp.newFlag' value="`$tmp.the-connectivity.coupling-flag + '-' +
+                                               $tmp.srcTtpdstTtpPair`" />
+                                            </set>
+                                            <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
+                                                    key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id'>
+                                                <parameter name='connectivity-id' value='`$tmp.the-connectivity.connectivity-id`' />
+                                                <parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />
+                                                <parameter name='operational-status' value='Modified' />
+                                                <parameter name='coupling-flag' value='`$tmp.newFlag`' />
+                                            </update>
+                                            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list'
+                                                  key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid'
+                                                  force="true" pfx="tmp.AnAI-data">
+                                                <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />
+                                                <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $tmp.the-connectivity.connectivity-id`" />
+                                                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />
+                                                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$tmp.the-connectivity.connectivity-id`" />
+                                            </save>
+                                        </block>
+                                    </outcome>
+                                </switch>
+                            </block>
+                        </for>
+                    </block>
+                </outcome>
+            </switch>
             <set>
                 <parameter name='domain-A.tunnel-tp-id' value='' />
                 <parameter name='domain-A.node-id' value='' />
diff --git a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-create-clean.xml b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-create-clean.xml
index b928dba4..325b58bd 100644
--- a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-create-clean.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-create-clean.xml
@@ -191,6 +191,12 @@
                                                                                             </outcome>
                                                                                             <outcome value='success'>
                                                                                                 <block>
+                                                                                                    <set>
+                                                                                                        <parameter name='hasSecondary' value="false" />
+                                                                                                        <parameter name='network-route-three' value="" />
+                                                                                                        <parameter name='tmp.aai.network-route-three.' value="" />
+                                                                                                        <parameter name='tmp.aai.network-route-C.' value="" />
+                                                                                                    </set>
                                                                                                     <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
                                                                                                         <parameter name="ctx-destination" value="prop.otn-tunnel-name"/>
                                                                                                     </execute>
@@ -204,6 +210,21 @@
                                                                                                     <set>
                                                                                                         <parameter name='network-route-two' value="`$tmp.aai.logical-link.link-name2`" />
                                                                                                     </set>
+                                                                                                    <set>
+                                                                                                        <parameter name='network-route-three' value="`$tmp.aai.logical-link.segment-id`" />
+                                                                                                    </set>
+                                                                                                    <switch test='`length($network-route-three) == 0`'>
+                                                                                                        <outcome value='true'>
+                                                                                                            <set>
+                                                                                                                <parameter name='hasSecondary' value="false" />
+                                                                                                            </set>
+                                                                                                        </outcome>
+                                                                                                        <outcome value='false'>
+                                                                                                            <set>
+                                                                                                                <parameter name='hasSecondary' value="true" />
+                                                                                                            </set>
+                                                                                                        </outcome>
+                                                                                                    </switch>
                                                                                                     <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
                                                                                                                   resource="network-route"
                                                                                                                   key='network-route.route-id = $network-route-one'
@@ -245,6 +266,16 @@
                                                                                                                             </set>
                                                                                                                         </block>
                                                                                                                     </outcome>
+                                                                                                                    <outcome value='SECONDARY-ROOT'>
+                                                                                                                        <block>
+                                                                                                                            <set>
+                                                                                                                                <parameter name='tmp.aai.network-route-SECONDARY-ROOT.' value="`$tmp.aai.network-route-one.`" />
+                                                                                                                            </set>
+                                                                                                                            <set>
+                                                                                                                                <parameter name='tmp.aai.network-route-C.' value="`$tmp.aai.network-route-one.`" />
+                                                                                                                            </set>
+                                                                                                                        </block>
+                                                                                                                    </outcome>
                                                                                                                 </switch>
                                                                                                             </block>
                                                                                                         </outcome>
@@ -290,6 +321,60 @@
                                                                                                                             </set>
                                                                                                                         </block>
                                                                                                                     </outcome>
+                                                                                                                    <outcome value='SECONDARY-ROOT'>
+                                                                                                                        <block>
+                                                                                                                            <set>
+                                                                                                                                <parameter name='tmp.aai.network-route-SECONDARY-ROOT.' value="`$tmp.aai.network-route-two.`" />
+                                                                                                                            </set>
+                                                                                                                            <set>
+                                                                                                                                <parameter name='tmp.aai.network-route-C.' value="`$tmp.aai.network-route-two.`" />
+                                                                                                                            </set>
+                                                                                                                        </block>
+                                                                                                                    </outcome>
+                                                                                                                </switch>
+                                                                                                            </block>
+                                                                                                        </outcome>
+                                                                                                    </get-resource>
+                                                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                  resource="network-route"
+                                                                                                                  key='network-route.route-id = $network-route-three'
+                                                                                                                  local-only="false"
+                                                                                                                  force="true" pfx="tmp.aai.network-route-three">
+                                                                                                        <outcome value='not-found'></outcome>
+                                                                                                        <outcome value='failure'></outcome>
+                                                                                                        <outcome value='success'>
+                                                                                                            <block atomic="true">
+                                                                                                                <switch test='`$tmp.aai.network-route-three.type`'>
+                                                                                                                    <outcome value='ROOT'>
+                                                                                                                        <block>
+                                                                                                                            <set>
+                                                                                                                                <parameter name='tmp.aai.network-route-ROOT.' value="`$tmp.aai.network-route-two.`" />
+                                                                                                                            </set>
+                                                                                                                            <set>
+                                                                                                                                <parameter name='tmp.aai.network-route-B.' value="`$tmp.aai.network-route-two.`" />
+                                                                                                                            </set>
+                                                                                                                        </block>
+                                                                                                                    </outcome>
+                                                                                                                    <outcome value='LEAF'>
+                                                                                                                        <block>
+                                                                                                                            <set>
+                                                                                                                                <parameter name='tmp.aai.network-route-LEAF.' value="`$tmp.aai.network-route-two.`" />
+                                                                                                                            </set>
+                                                                                                                            <set>
+                                                                                                                                <parameter name='tmp.aai.network-route-A.' value="`$tmp.aai.network-route-two.`" />
+                                                                                                                            </set>
+                                                                                                                        </block>
+                                                                                                                    </outcome>
+                                                                                                                    <outcome value='SECONDARY-ROOT'>
+                                                                                                                        <block>
+                                                                                                                            <set>
+                                                                                                                                <parameter name='tmp.aai.network-route-SECONDARY-ROOT.' value="`$tmp.aai.network-route-three.`" />
+                                                                                                                            </set>
+                                                                                                                            <set>
+                                                                                                                                <parameter name='tmp.aai.network-route-C.' value="`$tmp.aai.network-route-three.`" />
+                                                                                                                            </set>
+                                                                                                                        </block>
+                                                                                                                    </outcome>
                                                                                                                 </switch>
                                                                                                             </block>
                                                                                                         </outcome>
@@ -696,6 +781,191 @@
                                                                                                         <parameter name='tmp.ROOT.uni-p-interface-long' value="`$tmp.aai.network-route-B.next-hop + '-' + $tmp.aai.network-route-B.logical-interface-id`" />
                                                                                                         <parameter name='tmp.ROOT.uni-tp-id' value="`$tmp.dst.ltpId`" />
                                                                                                     </set>
+                                                                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
+                                                                                                        <parameter name="original_string" value='`$tmp.aai.network-route-C.next-hop`'/>
+                                                                                                        <!--<parameter name="regex" value="[^-]+$"/>-->
+                                                                                                        <parameter name="regex" value="[-]+"/>
+                                                                                                        <parameter name="ctx_memory_result_key" value="param-prefix-domainC-pnfName"/>
+                                                                                                        <outcome value='success'>
+                                                                                                            <block atomic="true">
+                                                                                                                <set>
+                                                                                                                    <parameter name='tmp.dst.domainC.pnf-name' value="`$param-prefix-domainC-pnfName[0] + '-' +
+                                                   $param-prefix-domainC-pnfName[1] + '-' +
+                                                   $param-prefix-domainC-pnfName[2] + '-' +
+                                                   $param-prefix-domainC-pnfName[3] + '-' +
+                                                   $param-prefix-domainC-pnfName[4] + '-' +
+                                                   $param-prefix-domainC-pnfName[5] + '-' +
+                                                   $param-prefix-domainC-pnfName[6] + '-' +
+                                                   $param-prefix-domainC-pnfName[7] + '-' +
+                                                   $param-prefix-domainC-pnfName[8]`" />
+                                                                                                                </set>
+                                                                                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                              resource="pnf"
+                                                                                                                              key="pnf.pnf-name = $tmp.dst.domainC.pnf-name"
+                                                                                                                              pfx='tmp.aai.destination-secondary-pnf' local-only='false' >
+                                                                                                                    <!--AND depth = '0'"-->
+                                                                                                                    <outcome value='success'>
+                                                                                                                        <block>
+                                                                                                                            <for silentFailure='true' index='dpvidx' start='0' end='`$tmp.aai.destination-secondary-pnf.relationship-list.relationship_length`' >
+                                                                                                                                <switch test='`$tmp.aai.destination-secondary-pnf.relationship-list.relationship[$dpvidx].related-to`'>
+                                                                                                                                    <outcome value='esr-thirdparty-sdnc'>
+                                                                                                                                        <block atomic="true">
+                                                                                                                                            <set>
+                                                                                                                                                <parameter name='tmp.domainC.esr-thirdparty-id' value="`$tmp.aai.destination-secondary-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`" />
+                                                                                                                                            </set>
+                                                                                                                                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                                                          resource="esr-thirdparty-sdnc"
+                                                                                                                                                          key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainC.esr-thirdparty-id AND
+		     depth = '1'"
+                                                                                                                                                          pfx='tmp.aai.domainC.esr-thirdparty-sdnc' local-only='false' >
+                                                                                                                                                <outcome value='success'>
+                                                                                                                                                    <block>
+                                                                                                                                                        <set>
+                                                                                                                                                            <parameter name='prop.sdncRestApi.thirdpartySdnc.domainC.url' value="`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
+                                                                                                                                                            <parameter name='prop.sdncRestApi.thirdpartySdnc.domainC.user' value="`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
+                                                                                                                                                            <parameter name='prop.sdncRestApi.thirdpartySdnc.domainC.password' value="`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />
+                                                                                                                                                            <!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->
+                                                                                                                                                            <!--<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />-->
+                                                                                                                                                            <!--<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />-->
+                                                                                                                                                            <!--<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />-->
+                                                                                                                                                            <!--<parameter name="format" value="json"/>-->
+                                                                                                                                                            <!--<parameter name="httpMethod" value="get"/>-->
+                                                                                                                                                            <!--<parameter name="responsePrefix" value="topology"/>-->
+                                                                                                                                                            <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->
+                                                                                                                                                            <!--<parameter name="trustStorePassword" value="adminadmin"/>-->
+                                                                                                                                                            <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->
+                                                                                                                                                            <!--<parameter name="keyStorePassword" value="adminadmin"/>-->
+                                                                                                                                                        </set>
+                                                                                                                                                    </block>
+                                                                                                                                                </outcome>
+                                                                                                                                                <outcome value='not-found'>
+                                                                                                                                                    <return status='failure'>
+                                                                                                                                                        <parameter name='ack-final' value='Y'/>
+                                                                                                                                                        <parameter name="error-code" value="500" />
+                                                                                                                                                        <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                                                                    </return>
+                                                                                                                                                </outcome>
+                                                                                                                                                <outcome value='Other'>
+                                                                                                                                                    <return status='failure'>
+                                                                                                                                                        <parameter name='ack-final' value='Y'/>
+                                                                                                                                                        <parameter name="error-code" value="500" />
+                                                                                                                                                        <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                                                                    </return>
+                                                                                                                                                </outcome>
+                                                                                                                                            </get-resource>
+                                                                                                                                        </block>
+                                                                                                                                    </outcome>
+                                                                                                                                    <outcome value='network-resource'>
+                                                                                                                                        <block atomic="true">
+                                                                                                                                            <set>
+                                                                                                                                                <parameter name='tmp.domainC.eth-network-id' value="`$tmp.aai.destination-secondary-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`" />
+                                                                                                                                            </set>
+                                                                                                                                        </block>
+                                                                                                                                    </outcome>
+                                                                                                                                </switch>
+                                                                                                                            </for>
+                                                                                                                        </block>
+                                                                                                                    </outcome>
+                                                                                                                    <outcome value='not-found'>
+                                                                                                                        <return status='failure'>
+                                                                                                                            <parameter name='ack-final' value='Y'/>
+                                                                                                                            <parameter name="error-code" value="500" />
+                                                                                                                            <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                                        </return>
+                                                                                                                    </outcome>
+                                                                                                                    <outcome value='Other'>
+                                                                                                                        <return status='failure'>
+                                                                                                                            <parameter name='ack-final' value='Y'/>
+                                                                                                                            <parameter name="error-code" value="500" />
+                                                                                                                            <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                                        </return>
+                                                                                                                    </outcome>
+                                                                                                                </get-resource>
+                                                                                                            </block>
+                                                                                                        </outcome>
+                                                                                                        <outcome value='failure'></outcome>
+                                                                                                    </execute>
+                                                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                  resource="p-interface"
+                                                                                                                  key="pnf.pnf-name = $tmp.dst.domainC.pnf-name
+	        AND p-interface.interface-name = $tmp.aai.network-route-C.next-hop"
+                                                                                                                  local-only="false"
+                                                                                                                  pfx="tmp.aai.network-route-C.p-interface-dst" >
+                                                                                                        <!--<get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" -->
+                                                                                                        <!--	resource="p-interface"-->
+                                                                                                        <!--	    key="pnf.pnf-name = $unique-src-node-Id-->
+                                                                                                        <!--	        and p-interface.interface-name = $tmp.aai.endpointA.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value"-->
+                                                                                                        <!--		local-only="false" -->
+                                                                                                        <!--		pfx="tmp.aai.endpointA.p-interface-src" >-->
+                                                                                                        <outcome value='success'>
+                                                                                                            <block atomic="true">
+                                                                                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
+                                                                                                                    <parameter name="original_string" value='`$tmp.aai.network-route-C.p-interface-dst.interface-name`'/>
+                                                                                                                    <!--<parameter name="regex" value="[^-]+$"/>-->
+                                                                                                                    <parameter name="regex" value="[-]+"/>
+                                                                                                                    <parameter name="ctx_memory_result_key" value="param-prefix-domainC"/>
+                                                                                                                    <outcome value='success'>
+                                                                                                                        <block atomic="true">
+                                                                                                                            <set>
+                                                                                                                                <parameter name='tmp.dst-secondary.ltpId' value='`$param-prefix-domainC[$param-prefix-domainC_length -1]`' />
+                                                                                                                            </set>
+                                                                                                                            <set>
+                                                                                                                                <parameter name='tmp.dst-secondary.pnf-name' value='`$param-prefix-domainC[$param-prefix-domainC_length -3]`' />
+                                                                                                                            </set>
+                                                                                                                        </block>
+                                                                                                                    </outcome>
+                                                                                                                    <outcome value='failure'>
+                                                                                                                        <return status='failure'>
+                                                                                                                            <parameter name='error-code' value='' />
+                                                                                                                            <parameter name='error-message' value="An error occured while splitting sna1_route" />
+                                                                                                                        </return>
+                                                                                                                    </outcome>
+                                                                                                                </execute>
+                                                                                                                <for silentFailure='true' index='dividx' start='0' end='`$tmp.aai.network-route-C.p-interface-dst.relationship-list.relationship_length`' >
+                                                                                                                    <switch test='`$tmp.aai.network-route-C.p-interface-dst.relationship-list.relationship[$dividx].related-to`'>
+                                                                                                                        <outcome value='tunnel-termination-point'>
+                                                                                                                            <block atomic="true">
+                                                                                                                                <set>
+                                                                                                                                    <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`" />
+                                                                                                                                </set>
+                                                                                                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                                              resource="tunnel-termination-point"
+                                                                                                                                              key="tunnel-termination-point.ttp-id = $tmp.destination-secondary.ttp-id
+		AND depth = '0'"
+                                                                                                                                              pfx='tmp.aai.destination-secondary-ttp' local-only='false' >
+                                                                                                                                    <outcome value='success'>
+                                                                                                                                        <block atomic="true">
+                                                                                                                                            <set>
+                                                                                                                                                <parameter name='destination-secondary.tunnel-tp-id' value="`$tmp.aai.destination-secondary-ttp.tunnel-tp-id`" />
+                                                                                                                                            </set>
+                                                                                                                                        </block>
+                                                                                                                                    </outcome>
+                                                                                                                                </get-resource>
+                                                                                                                                <break/>
+                                                                                                                            </block>
+                                                                                                                        </outcome>
+                                                                                                                    </switch>
+                                                                                                                </for>
+                                                                                                            </block>
+                                                                                                        </outcome>
+                                                                                                        <outcome value='not-found'></outcome>
+                                                                                                        <outcome value='failure'></outcome>
+                                                                                                    </get-resource>
+                                                                                                    <set>
+                                                                                                        <parameter name='tmp.SECONDARY-ROOT.pnf-name-long' value="`$param-prefix-domainC-pnfName[0] + '-' +
+                                                   $param-prefix-domainC-pnfName[1] + '-' +
+                                                   $param-prefix-domainC-pnfName[2] + '-' +
+                                                   $param-prefix-domainC-pnfName[3] + '-' +
+                                                   $param-prefix-domainC-pnfName[4] + '-' +
+                                                   $param-prefix-domainC-pnfName[5] + '-' +
+                                                   $param-prefix-domainC-pnfName[6] + '-' +
+                                                   $param-prefix-domainC-pnfName[7] + '-' +
+                                                   $param-prefix-domainC-pnfName[8]`" />
+                                                                                                        <!--<parameter name='tmp.ROOT.pnf-name-short' value="`$param-prefix-domainB-pnfName[8]`" />-->
+                                                                                                        <parameter name='tmp.SECONDARY-ROOT.pnf-name-short' value="`$tmp.dst-secondary.pnf-name`" />
+                                                                                                        <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`" />
+                                                                                                        <parameter name='tmp.SECONDARY-ROOT.uni-tp-id' value="`$tmp.dst-secondary.ltpId`" />
+                                                                                                    </set>
                                                                                                     <call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-logic' mode='sync' ></call>
                                                                                                     <switch test='`$found-middle-man`'>
                                                                                                         <outcome value='false'>
@@ -752,6 +1022,7 @@
                                                                                                                     <parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' />
                                                                                                                     <parameter name='tp-id' value='`$tmp.LEAF.uni-tp-id`' />
                                                                                                                     <parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />
+                                                                                                                    <parameter name='type' value='leaf' />
                                                                                                                     <parameter name='data-source' value='`$gfp`' />
                                                                                                                 </save>
                                                                                                                 <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list'
@@ -818,6 +1089,7 @@
                                                                                                                     <parameter name='id' value='`$tmp.ROOT.uni-p-interface-long`' />
                                                                                                                     <parameter name='tp-id' value='`$tmp.ROOT.uni-tp-id`' />
                                                                                                                     <parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />
+                                                                                                                    <parameter name='type' value='root' />
                                                                                                                     <parameter name='data-source' value='`$gfp`' />
                                                                                                                 </save>
                                                                                                                 <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list'
@@ -828,6 +1100,98 @@
                                                                                                                     <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="uni.id" />
                                                                                                                     <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$tmp.ROOT.uni-p-interface-long`" />
                                                                                                                 </save>
+                                                                                                                <switch test='`$hasSecondary`'>
+                                                                                                                    <outcome value='true'>
+                                                                                                                        <block>
+                                                                                                                            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni'
+                                                                                                                                  key='uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long'>
+                                                                                                                                <parameter name='id' value='`$tmp.SECONDARY-ROOT.uni-p-interface-long`' />
+                                                                                                                                <parameter name='tp-id' value='`$tmp.SECONDARY-ROOT.uni-tp-id`' />
+                                                                                                                                <parameter name='cvlan' value='`$tmp.aai.network-route-C.logical-interface-id`' />
+                                                                                                                                <parameter name='type' value='secondary-root' />
+                                                                                                                                <parameter name='data-source' value='`$gfp`' />
+                                                                                                                            </save>
+                                                                                                                            <!-- This is to check the provider-id of ROOt and SECONDARY-ROOT-->
+                                                                                                                            <switch test='`$param-prefix-domainB[$param-prefix-domainB_length -9] == $param-prefix-domainC[$param-prefix-domainC_length -9]`'>
+                                                                                                                                <outcome value='true'>
+                                                                                                                                    <block>
+                                                                                                                                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list'
+                                                                                                                                              key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid'
+                                                                                                                                              force="true" pfx="tmp.AnAI-data">
+                                                                                                                                            <parameter name="relationship-list.relationship[0].related-to" value="uni" />
+                                                                                                                                            <parameter name="relationship-list.relationship[0].related-link" value="`'/network/unis/uni/' + $tmp.SECONDARY-ROOT.uni-p-interface-long`" />
+                                                                                                                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="uni.id" />
+                                                                                                                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$tmp.SECONDARY-ROOT.uni-p-interface-long`" />
+                                                                                                                                        </save>
+                                                                                                                                    </block>
+                                                                                                                                </outcome>
+                                                                                                                                <outcome value='false'>
+                                                                                                                                    <block>
+                                                                                                                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
+                                                                                                                                            <parameter name="ctx-destination" value="prop.connectivity-domainC-uuid"/>
+                                                                                                                                        </execute>
+                                                                                                                                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
+                                                                                                                                              key='connectivity.connectivity-id = $prop.connectivity-domainC-uuid'>
+                                                                                                                                            <parameter name='connectivity-id' value='`$prop.connectivity-domainC-uuid`' />
+                                                                                                                                            <!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' -->
+                                                                                                                                            <!--      key='connectivity.connectivity-id = $tmp.ROOT.uni-p-interface-long'>-->
+                                                                                                                                            <!--<parameter name='connectivity-id' value='`$tmp.ROOT.uni-p-interface-long`' />-->
+                                                                                                                                            <parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />
+                                                                                                                                            <parameter name='operational-status' value='Created' />
+                                                                                                                                            <parameter name='access-provider-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -9]`' />
+                                                                                                                                            <parameter name='access-client-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -7]`' />
+                                                                                                                                            <parameter name='access-topology-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -5]`' />
+                                                                                                                                            <parameter name='access-node-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -3]`' />
+                                                                                                                                            <parameter name='access-ltp-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -1]`' />
+                                                                                                                                            <parameter name='cvlan' value='`$tmp.aai.network-route-C.logical-interface-id`' />
+                                                                                                                                            <parameter name='color-aware' value='`$tmp.SECONDARY-ROOT.uni-p-interface-long`' />
+                                                                                                                                            <parameter name='vpn-type' value='secondary-root' />
+                                                                                                                                            <parameter name='bandwidth-profile-name' value='`$gfp`' />
+                                                                                                                                            <parameter name='cir' value='`$gfp *1000000`' />
+                                                                                                                                            <parameter name='eir' value='`$gfp *1000000`' />
+                                                                                                                                            <parameter name='cbs' value='`$prop.sotn.cbs`' />
+                                                                                                                                            <parameter name='ebs' value='`$prop.sotn.ebs`' />
+                                                                                                                                            <!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->
+                                                                                                                                            <!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->
+                                                                                                                                            <!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->
+                                                                                                                                            <parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />
+                                                                                                                                            <parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />
+                                                                                                                                            <parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />
+                                                                                                                                            <parameter name='connectivity-selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` " />
+                                                                                                                                        </save>
+                                                                                                                                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'
+                                                                                                                                              key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id
+         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id
+         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'
+                                                                                                                                              force="true" pfx="tmp.AnAI-data">
+                                                                                                                                            <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />
+                                                                                                                                            <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $prop.connectivity-domainC-uuid`" />
+                                                                                                                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />
+                                                                                                                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.connectivity-domainC-uuid`" />
+                                                                                                                                            <!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->
+                                                                                                                                            <!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->
+                                                                                                                                            <!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->
+                                                                                                                                            <!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->
+                                                                                                                                            <!--      force="true" pfx="tmp.AnAI-data">-->
+                                                                                                                                            <!--<parameter name="relationship-list.relationship[0].related-to" value="connectivity" />-->
+                                                                                                                                            <!--<parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $prop.sotn.network-id`" />-->
+                                                                                                                                            <!--<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />-->
+                                                                                                                                            <!--<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.sotn.network-id`" />-->
+                                                                                                                                        </save>
+                                                                                                                                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list'
+                                                                                                                                              key='connectivity.connectivity-id = $prop.connectivity-domainC-uuid'
+                                                                                                                                              force="true" pfx="tmp.AnAI-data">
+                                                                                                                                            <parameter name="relationship-list.relationship[0].related-to" value="uni" />
+                                                                                                                                            <parameter name="relationship-list.relationship[0].related-link" value="`'/network/unis/uni/' + $tmp.SECONDARY-ROOT.uni-p-interface-long`" />
+                                                                                                                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="uni.id" />
+                                                                                                                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$tmp.SECONDARY-ROOT.uni-p-interface-long`" />
+                                                                                                                                        </save>
+                                                                                                                                    </block>
+                                                                                                                                </outcome>
+                                                                                                                            </switch>
+                                                                                                                        </block>
+                                                                                                                    </outcome>
+                                                                                                                </switch>
                                                                                                                 <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
                                                                                                                     <parameter name="ctx-destination" value="prop.connectivity-middle-man-uuid"/>
                                                                                                                 </execute>
@@ -915,6 +1279,20 @@
                                                                                                                     <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="uni.id" />
                                                                                                                     <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$tmp.ROOT.uni-p-interface-long`" />
                                                                                                                 </save>
+                                                                                                                <switch test='`$hasSecondary`'>
+                                                                                                                    <outcome value='true'>
+                                                                                                                        <block>
+                                                                                                                            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list'
+                                                                                                                                  key='connectivity.connectivity-id = $middle-man-conn.connectivity-id'
+                                                                                                                                  force="true" pfx="tmp.AnAI-data">
+                                                                                                                                <parameter name="relationship-list.relationship[0].related-to" value="uni" />
+                                                                                                                                <parameter name="relationship-list.relationship[0].related-link" value="`'/network/unis/uni/' + $tmp.SECONDARY-ROOT.uni-p-interface-long`" />
+                                                                                                                                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="uni.id" />
+                                                                                                                                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$tmp.SECONDARY-ROOT.uni-p-interface-long`" />
+                                                                                                                            </save>
+                                                                                                                        </block>
+                                                                                                                    </outcome>
+                                                                                                                </switch>
                                                                                                                 <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list'
                                                                                                                       key='connectivity.connectivity-id = $middle-man-conn.connectivity-id'
                                                                                                                       force="true" pfx="tmp.AnAI-data">
@@ -931,6 +1309,27 @@
                                                                                                                     <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />
                                                                                                                     <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.connectivity-domainB-uuid`" />
                                                                                                                 </save>
+                                                                                                                <switch test='`$hasSecondary`'>
+                                                                                                                    <outcome value='true'>
+                                                                                                                        <block>
+                                                                                                                            <!-- This is to check the provider-id of ROOt and SECONDARY-ROOT-->
+                                                                                                                            <switch test='`$param-prefix-domainB[$param-prefix-domainB_length -9] == $param-prefix-domainC[$param-prefix-domainC_length -9]`'>
+                                                                                                                                <outcome value='false'>
+                                                                                                                                    <block>
+                                                                                                                                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list'
+                                                                                                                                              key='connectivity.connectivity-id = $middle-man-conn.connectivity-id'
+                                                                                                                                              force="true" pfx="tmp.AnAI-data">
+                                                                                                                                            <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />
+                                                                                                                                            <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $prop.connectivity-domainC-uuid`" />
+                                                                                                                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />
+                                                                                                                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.connectivity-domainC-uuid`" />
+                                                                                                                                        </save>
+                                                                                                                                    </block>
+                                                                                                                                </outcome>
+                                                                                                                            </switch>
+                                                                                                                        </block>
+                                                                                                                    </outcome>
+                                                                                                                </switch>
                                                                                                                 <call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-F1' mode='sync' ></call>
                                                                                                             </block>
                                                                                                         </outcome>
@@ -967,6 +1366,43 @@
                                                                                                                         </block>
                                                                                                                     </outcome>
                                                                                                                 </get-resource>
+                                                                                                                <switch test='`$hasSecondary`'>
+                                                                                                                    <outcome value='true'>
+                                                                                                                        <block>
+                                                                                                                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                                          resource="uni"
+                                                                                                                                          key="uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long"
+                                                                                                                                          local-only="false"
+                                                                                                                                          pfx="tmp.aai.secondaryrootuni" >
+                                                                                                                                <outcome value='not-found'>
+                                                                                                                                    <return status='failure'>
+                                                                                                                                        <parameter name='ack-final' value='Y'/>
+                                                                                                                                        <parameter name="error-code" value="500" />
+                                                                                                                                        <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
+                                                                                                                                    </return>
+                                                                                                                                </outcome>
+                                                                                                                                <outcome value='failure'>
+                                                                                                                                    <return status='failure'>
+                                                                                                                                        <parameter name='error-code' value='' />
+                                                                                                                                        <parameter name='error-message' value='' />
+                                                                                                                                    </return>
+                                                                                                                                </outcome>
+                                                                                                                                <outcome value='success'>
+                                                                                                                                    <block atomic="true">
+                                                                                                                                        <set>
+                                                                                                                                            <parameter name='tmp.newbw' value='`$tmp.aai.secondaryrootuni.data-source + $gfp`' />
+                                                                                                                                        </set>
+                                                                                                                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni'
+                                                                                                                                                key='uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long'>
+                                                                                                                                            <parameter name='id' value='`$tmp.SECONDARY-ROOT.uni-p-interface-long`' />
+                                                                                                                                            <parameter name='data-source' value='`$tmp.newbw`' />
+                                                                                                                                        </update>
+                                                                                                                                    </block>
+                                                                                                                                </outcome>
+                                                                                                                            </get-resource>
+                                                                                                                        </block>
+                                                                                                                    </outcome>
+                                                                                                                </switch>
                                                                                                                 <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'
                                                                                                                       key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id
          AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id
@@ -1005,6 +1441,7 @@
                                                                                                                                 <parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' />
                                                                                                                                 <parameter name='tp-id' value='`$tmp.LEAF.uni-tp-id`' />
                                                                                                                                 <parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />
+                                                                                                                                <parameter name='type' value='leaf' />
                                                                                                                                 <parameter name='data-source' value='`$gfp`' />
                                                                                                                             </save>
                                                                                                                             <switch test="`$found-connectivity`">
@@ -1157,6 +1594,43 @@
                                                                                                                                     </return>
                                                                                                                                 </outcome>
                                                                                                                             </switch>
+                                                                                                                            <call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn' mode='sync' ></call>
+                                                                                                                            <switch test="`$found-secondary-root-connectivity`">
+                                                                                                                                <outcome value='true'>
+                                                                                                                                    <block atomic='true'>
+                                                                                                                                        <set>
+                                                                                                                                            <!--<parameter name='prop.connectivity-domainB-uuid' value="`$tmp.ROOT.uni-p-interface-long`" />-->
+                                                                                                                                            <!--OR-->
+                                                                                                                                            <parameter name='prop.connectivity-domainC-uuid' value="`$tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`" />
+                                                                                                                                        </set>
+                                                                                                                                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'
+                                                                                                                                              key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id
+         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id
+         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'
+                                                                                                                                              force="true" pfx="tmp.AnAI-data">
+                                                                                                                                            <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />
+                                                                                                                                            <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`" />
+                                                                                                                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />
+                                                                                                                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`" />
+                                                                                                                                            <!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->
+                                                                                                                                            <!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->
+                                                                                                                                            <!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->
+                                                                                                                                            <!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->
+                                                                                                                                            <!--      force="true" pfx="tmp.AnAI-data">-->
+                                                                                                                                            <!--<parameter name="relationship-list.relationship[0].related-to" value="connectivity" />-->
+                                                                                                                                            <!--<parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $prop.sotn.network-id`" />-->
+                                                                                                                                            <!--<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />-->
+                                                                                                                                            <!--<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.sotn.network-id`" />-->
+                                                                                                                                        </save>
+                                                                                                                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
+                                                                                                                                                key='connectivity.connectivity-id = $prop.connectivity-domainC-uuid'>
+                                                                                                                                            <parameter name='connectivity-id' value='`$prop.connectivity-domainC-uuid`' />
+                                                                                                                                            <parameter name='operational-status' value='Modified' />
+                                                                                                                                        </update>
+                                                                                                                                    </block>
+                                                                                                                                </outcome>
+                                                                                                                                <outcome value='false'></outcome>
+                                                                                                                            </switch>
                                                                                                                             <call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-F1' mode='sync' ></call>
                                                                                                                         </block>
                                                                                                                     </outcome>
@@ -1167,6 +1641,7 @@
                                                                                                                                 <parameter name='id' value='`$tmp.LEAF.uni-p-interface-long`' />
                                                                                                                                 <parameter name='tp-id' value='`$tmp.LEAF.uni-tp-id`' />
                                                                                                                                 <parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />
+                                                                                                                                <parameter name='type' value='leaf' />
                                                                                                                                 <parameter name='data-source' value='`$gfp`' />
                                                                                                                             </save>
                                                                                                                             <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list'
@@ -1240,6 +1715,43 @@
                                                                                                                                                     </return>
                                                                                                                                                 </outcome>
                                                                                                                                             </switch>
+                                                                                                                                            <call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn' mode='sync' ></call>
+                                                                                                                                            <switch test="`$found-secondary-root-connectivity`">
+                                                                                                                                                <outcome value='true'>
+                                                                                                                                                    <block atomic='true'>
+                                                                                                                                                        <set>
+                                                                                                                                                            <!--<parameter name='prop.connectivity-domainB-uuid' value="`$tmp.ROOT.uni-p-interface-long`" />-->
+                                                                                                                                                            <!--OR-->
+                                                                                                                                                            <parameter name='prop.connectivity-domainC-uuid' value="`$tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`" />
+                                                                                                                                                        </set>
+                                                                                                                                                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'
+                                                                                                                                                              key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id
+         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id
+         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'
+                                                                                                                                                              force="true" pfx="tmp.AnAI-data">
+                                                                                                                                                            <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />
+                                                                                                                                                            <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`" />
+                                                                                                                                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />
+                                                                                                                                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`" />
+                                                                                                                                                            <!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->
+                                                                                                                                                            <!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->
+                                                                                                                                                            <!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->
+                                                                                                                                                            <!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->
+                                                                                                                                                            <!--      force="true" pfx="tmp.AnAI-data">-->
+                                                                                                                                                            <!--<parameter name="relationship-list.relationship[0].related-to" value="connectivity" />-->
+                                                                                                                                                            <!--<parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $prop.sotn.network-id`" />-->
+                                                                                                                                                            <!--<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />-->
+                                                                                                                                                            <!--<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.sotn.network-id`" />-->
+                                                                                                                                                        </save>
+                                                                                                                                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
+                                                                                                                                                                key='connectivity.connectivity-id = $prop.connectivity-domainC-uuid'>
+                                                                                                                                                            <parameter name='connectivity-id' value='`$prop.connectivity-domainC-uuid`' />
+                                                                                                                                                            <parameter name='operational-status' value='Modified' />
+                                                                                                                                                        </update>
+                                                                                                                                                    </block>
+                                                                                                                                                </outcome>
+                                                                                                                                                <outcome value='false'></outcome>
+                                                                                                                                            </switch>
                                                                                                                                         </block>
                                                                                                                                         <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list'
                                                                                                                                               key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id'
@@ -1414,7 +1926,18 @@
                                         </outcome>
                                     </get-resource>
                                 </for>
-                                <call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-F1-activate' mode='sync' ></call>
+                                <switch test='`$hasSecondary`'>
+                                    <outcome value='false'>
+                                        <block>
+                                            <call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-F1-activate' mode='sync' ></call>
+                                        </block>
+                                    </outcome>
+                                    <outcome value='true'>
+                                        <block>
+                                            <call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-F1-activate-w-Protection' mode='sync' ></call>
+                                        </block>
+                                    </outcome>
+                                </switch>
                             </block>
                         </outcome>
                     </switch>
diff --git a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete.xml b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete.xml
index de311094..1fee37b1 100644
--- a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete.xml
@@ -191,6 +191,12 @@
                                                                                             </outcome>
                                                                                             <outcome value='success'>
                                                                                                 <block>
+                                                                                                    <set>
+                                                                                                        <parameter name='hasSecondary' value="false" />
+                                                                                                        <parameter name='network-route-three' value="" />
+                                                                                                        <parameter name='tmp.aai.network-route-three.' value="" />
+                                                                                                        <parameter name='tmp.aai.network-route-C.' value="" />
+                                                                                                    </set>
                                                                                                     <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
                                                                                                         <parameter name="ctx-destination" value="prop.otn-tunnel-name"/>
                                                                                                     </execute>
@@ -204,6 +210,21 @@
                                                                                                     <set>
                                                                                                         <parameter name='network-route-two' value="`$tmp.aai.logical-link.link-name2`" />
                                                                                                     </set>
+                                                                                                    <set>
+                                                                                                        <parameter name='network-route-three' value="`$tmp.aai.logical-link.segment-id`" />
+                                                                                                    </set>
+                                                                                                    <switch test='`length($network-route-three) == 0`'>
+                                                                                                        <outcome value='true'>
+                                                                                                            <set>
+                                                                                                                <parameter name='hasSecondary' value="false" />
+                                                                                                            </set>
+                                                                                                        </outcome>
+                                                                                                        <outcome value='false'>
+                                                                                                            <set>
+                                                                                                                <parameter name='hasSecondary' value="true" />
+                                                                                                            </set>
+                                                                                                        </outcome>
+                                                                                                    </switch>
                                                                                                     <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
                                                                                                                   resource="network-route"
                                                                                                                   key='network-route.route-id = $network-route-one'
@@ -245,6 +266,16 @@
                                                                                                                             </set>
                                                                                                                         </block>
                                                                                                                     </outcome>
+                                                                                                                    <outcome value='SECONDARY-ROOT'>
+                                                                                                                        <block>
+                                                                                                                            <set>
+                                                                                                                                <parameter name='tmp.aai.network-route-SECONDARY-ROOT.' value="`$tmp.aai.network-route-one.`" />
+                                                                                                                            </set>
+                                                                                                                            <set>
+                                                                                                                                <parameter name='tmp.aai.network-route-C.' value="`$tmp.aai.network-route-one.`" />
+                                                                                                                            </set>
+                                                                                                                        </block>
+                                                                                                                    </outcome>
                                                                                                                 </switch>
                                                                                                             </block>
                                                                                                         </outcome>
@@ -290,6 +321,60 @@
                                                                                                                             </set>
                                                                                                                         </block>
                                                                                                                     </outcome>
+                                                                                                                    <outcome value='SECONDARY-ROOT'>
+                                                                                                                        <block>
+                                                                                                                            <set>
+                                                                                                                                <parameter name='tmp.aai.network-route-SECONDARY-ROOT.' value="`$tmp.aai.network-route-two.`" />
+                                                                                                                            </set>
+                                                                                                                            <set>
+                                                                                                                                <parameter name='tmp.aai.network-route-C.' value="`$tmp.aai.network-route-two.`" />
+                                                                                                                            </set>
+                                                                                                                        </block>
+                                                                                                                    </outcome>
+                                                                                                                </switch>
+                                                                                                            </block>
+                                                                                                        </outcome>
+                                                                                                    </get-resource>
+                                                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                  resource="network-route"
+                                                                                                                  key='network-route.route-id = $network-route-three'
+                                                                                                                  local-only="false"
+                                                                                                                  force="true" pfx="tmp.aai.network-route-three">
+                                                                                                        <outcome value='not-found'></outcome>
+                                                                                                        <outcome value='failure'></outcome>
+                                                                                                        <outcome value='success'>
+                                                                                                            <block atomic="true">
+                                                                                                                <switch test='`$tmp.aai.network-route-three.type`'>
+                                                                                                                    <outcome value='ROOT'>
+                                                                                                                        <block>
+                                                                                                                            <set>
+                                                                                                                                <parameter name='tmp.aai.network-route-ROOT.' value="`$tmp.aai.network-route-two.`" />
+                                                                                                                            </set>
+                                                                                                                            <set>
+                                                                                                                                <parameter name='tmp.aai.network-route-B.' value="`$tmp.aai.network-route-two.`" />
+                                                                                                                            </set>
+                                                                                                                        </block>
+                                                                                                                    </outcome>
+                                                                                                                    <outcome value='LEAF'>
+                                                                                                                        <block>
+                                                                                                                            <set>
+                                                                                                                                <parameter name='tmp.aai.network-route-LEAF.' value="`$tmp.aai.network-route-two.`" />
+                                                                                                                            </set>
+                                                                                                                            <set>
+                                                                                                                                <parameter name='tmp.aai.network-route-A.' value="`$tmp.aai.network-route-two.`" />
+                                                                                                                            </set>
+                                                                                                                        </block>
+                                                                                                                    </outcome>
+                                                                                                                    <outcome value='SECONDARY-ROOT'>
+                                                                                                                        <block>
+                                                                                                                            <set>
+                                                                                                                                <parameter name='tmp.aai.network-route-SECONDARY-ROOT.' value="`$tmp.aai.network-route-three.`" />
+                                                                                                                            </set>
+                                                                                                                            <set>
+                                                                                                                                <parameter name='tmp.aai.network-route-C.' value="`$tmp.aai.network-route-three.`" />
+                                                                                                                            </set>
+                                                                                                                        </block>
+                                                                                                                    </outcome>
                                                                                                                 </switch>
                                                                                                             </block>
                                                                                                         </outcome>
@@ -696,6 +781,191 @@
                                                                                                         <parameter name='tmp.ROOT.uni-p-interface-long' value="`$tmp.aai.network-route-B.next-hop + '-' + $tmp.aai.network-route-B.logical-interface-id`" />
                                                                                                         <parameter name='tmp.ROOT.uni-tp-id' value="`$tmp.dst.ltpId`" />
                                                                                                     </set>
+                                                                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
+                                                                                                        <parameter name="original_string" value='`$tmp.aai.network-route-C.next-hop`'/>
+                                                                                                        <!--<parameter name="regex" value="[^-]+$"/>-->
+                                                                                                        <parameter name="regex" value="[-]+"/>
+                                                                                                        <parameter name="ctx_memory_result_key" value="param-prefix-domainC-pnfName"/>
+                                                                                                        <outcome value='success'>
+                                                                                                            <block atomic="true">
+                                                                                                                <set>
+                                                                                                                    <parameter name='tmp.dst.domainC.pnf-name' value="`$param-prefix-domainC-pnfName[0] + '-' +
+                                                   $param-prefix-domainC-pnfName[1] + '-' +
+                                                   $param-prefix-domainC-pnfName[2] + '-' +
+                                                   $param-prefix-domainC-pnfName[3] + '-' +
+                                                   $param-prefix-domainC-pnfName[4] + '-' +
+                                                   $param-prefix-domainC-pnfName[5] + '-' +
+                                                   $param-prefix-domainC-pnfName[6] + '-' +
+                                                   $param-prefix-domainC-pnfName[7] + '-' +
+                                                   $param-prefix-domainC-pnfName[8]`" />
+                                                                                                                </set>
+                                                                                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                              resource="pnf"
+                                                                                                                              key="pnf.pnf-name = $tmp.dst.domainC.pnf-name"
+                                                                                                                              pfx='tmp.aai.destination-secondary-pnf' local-only='false' >
+                                                                                                                    <!--AND depth = '0'"-->
+                                                                                                                    <outcome value='success'>
+                                                                                                                        <block>
+                                                                                                                            <for silentFailure='true' index='dpvidx' start='0' end='`$tmp.aai.destination-secondary-pnf.relationship-list.relationship_length`' >
+                                                                                                                                <switch test='`$tmp.aai.destination-secondary-pnf.relationship-list.relationship[$dpvidx].related-to`'>
+                                                                                                                                    <outcome value='esr-thirdparty-sdnc'>
+                                                                                                                                        <block atomic="true">
+                                                                                                                                            <set>
+                                                                                                                                                <parameter name='tmp.domainC.esr-thirdparty-id' value="`$tmp.aai.destination-secondary-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`" />
+                                                                                                                                            </set>
+                                                                                                                                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                                                          resource="esr-thirdparty-sdnc"
+                                                                                                                                                          key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainC.esr-thirdparty-id AND
+		     depth = '1'"
+                                                                                                                                                          pfx='tmp.aai.domainC.esr-thirdparty-sdnc' local-only='false' >
+                                                                                                                                                <outcome value='success'>
+                                                                                                                                                    <block>
+                                                                                                                                                        <set>
+                                                                                                                                                            <parameter name='prop.sdncRestApi.thirdpartySdnc.domainC.url' value="`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
+                                                                                                                                                            <parameter name='prop.sdncRestApi.thirdpartySdnc.domainC.user' value="`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
+                                                                                                                                                            <parameter name='prop.sdncRestApi.thirdpartySdnc.domainC.password' value="`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />
+                                                                                                                                                            <!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->
+                                                                                                                                                            <!--<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />-->
+                                                                                                                                                            <!--<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />-->
+                                                                                                                                                            <!--<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />-->
+                                                                                                                                                            <!--<parameter name="format" value="json"/>-->
+                                                                                                                                                            <!--<parameter name="httpMethod" value="get"/>-->
+                                                                                                                                                            <!--<parameter name="responsePrefix" value="topology"/>-->
+                                                                                                                                                            <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->
+                                                                                                                                                            <!--<parameter name="trustStorePassword" value="adminadmin"/>-->
+                                                                                                                                                            <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->
+                                                                                                                                                            <!--<parameter name="keyStorePassword" value="adminadmin"/>-->
+                                                                                                                                                        </set>
+                                                                                                                                                    </block>
+                                                                                                                                                </outcome>
+                                                                                                                                                <outcome value='not-found'>
+                                                                                                                                                    <return status='failure'>
+                                                                                                                                                        <parameter name='ack-final' value='Y'/>
+                                                                                                                                                        <parameter name="error-code" value="500" />
+                                                                                                                                                        <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                                                                    </return>
+                                                                                                                                                </outcome>
+                                                                                                                                                <outcome value='Other'>
+                                                                                                                                                    <return status='failure'>
+                                                                                                                                                        <parameter name='ack-final' value='Y'/>
+                                                                                                                                                        <parameter name="error-code" value="500" />
+                                                                                                                                                        <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                                                                    </return>
+                                                                                                                                                </outcome>
+                                                                                                                                            </get-resource>
+                                                                                                                                        </block>
+                                                                                                                                    </outcome>
+                                                                                                                                    <outcome value='network-resource'>
+                                                                                                                                        <block atomic="true">
+                                                                                                                                            <set>
+                                                                                                                                                <parameter name='tmp.domainC.eth-network-id' value="`$tmp.aai.destination-secondary-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`" />
+                                                                                                                                            </set>
+                                                                                                                                        </block>
+                                                                                                                                    </outcome>
+                                                                                                                                </switch>
+                                                                                                                            </for>
+                                                                                                                        </block>
+                                                                                                                    </outcome>
+                                                                                                                    <outcome value='not-found'>
+                                                                                                                        <return status='failure'>
+                                                                                                                            <parameter name='ack-final' value='Y'/>
+                                                                                                                            <parameter name="error-code" value="500" />
+                                                                                                                            <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                                        </return>
+                                                                                                                    </outcome>
+                                                                                                                    <outcome value='Other'>
+                                                                                                                        <return status='failure'>
+                                                                                                                            <parameter name='ack-final' value='Y'/>
+                                                                                                                            <parameter name="error-code" value="500" />
+                                                                                                                            <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                                        </return>
+                                                                                                                    </outcome>
+                                                                                                                </get-resource>
+                                                                                                            </block>
+                                                                                                        </outcome>
+                                                                                                        <outcome value='failure'></outcome>
+                                                                                                    </execute>
+                                                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                  resource="p-interface"
+                                                                                                                  key="pnf.pnf-name = $tmp.dst.domainC.pnf-name
+	        AND p-interface.interface-name = $tmp.aai.network-route-C.next-hop"
+                                                                                                                  local-only="false"
+                                                                                                                  pfx="tmp.aai.network-route-C.p-interface-dst" >
+                                                                                                        <!--<get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" -->
+                                                                                                        <!--	resource="p-interface"-->
+                                                                                                        <!--	    key="pnf.pnf-name = $unique-src-node-Id-->
+                                                                                                        <!--	        and p-interface.interface-name = $tmp.aai.endpointA.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value"-->
+                                                                                                        <!--		local-only="false" -->
+                                                                                                        <!--		pfx="tmp.aai.endpointA.p-interface-src" >-->
+                                                                                                        <outcome value='success'>
+                                                                                                            <block atomic="true">
+                                                                                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
+                                                                                                                    <parameter name="original_string" value='`$tmp.aai.network-route-C.p-interface-dst.interface-name`'/>
+                                                                                                                    <!--<parameter name="regex" value="[^-]+$"/>-->
+                                                                                                                    <parameter name="regex" value="[-]+"/>
+                                                                                                                    <parameter name="ctx_memory_result_key" value="param-prefix-domainC"/>
+                                                                                                                    <outcome value='success'>
+                                                                                                                        <block atomic="true">
+                                                                                                                            <set>
+                                                                                                                                <parameter name='tmp.dst-secondary.ltpId' value='`$param-prefix-domainC[$param-prefix-domainC_length -1]`' />
+                                                                                                                            </set>
+                                                                                                                            <set>
+                                                                                                                                <parameter name='tmp.dst-secondary.pnf-name' value='`$param-prefix-domainC[$param-prefix-domainC_length -3]`' />
+                                                                                                                            </set>
+                                                                                                                        </block>
+                                                                                                                    </outcome>
+                                                                                                                    <outcome value='failure'>
+                                                                                                                        <return status='failure'>
+                                                                                                                            <parameter name='error-code' value='' />
+                                                                                                                            <parameter name='error-message' value="An error occured while splitting sna1_route" />
+                                                                                                                        </return>
+                                                                                                                    </outcome>
+                                                                                                                </execute>
+                                                                                                                <for silentFailure='true' index='dividx' start='0' end='`$tmp.aai.network-route-C.p-interface-dst.relationship-list.relationship_length`' >
+                                                                                                                    <switch test='`$tmp.aai.network-route-C.p-interface-dst.relationship-list.relationship[$dividx].related-to`'>
+                                                                                                                        <outcome value='tunnel-termination-point'>
+                                                                                                                            <block atomic="true">
+                                                                                                                                <set>
+                                                                                                                                    <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`" />
+                                                                                                                                </set>
+                                                                                                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                                              resource="tunnel-termination-point"
+                                                                                                                                              key="tunnel-termination-point.ttp-id = $tmp.destination-secondary.ttp-id
+		AND depth = '0'"
+                                                                                                                                              pfx='tmp.aai.destination-secondary-ttp' local-only='false' >
+                                                                                                                                    <outcome value='success'>
+                                                                                                                                        <block atomic="true">
+                                                                                                                                            <set>
+                                                                                                                                                <parameter name='destination-secondary.tunnel-tp-id' value="`$tmp.aai.destination-secondary-ttp.tunnel-tp-id`" />
+                                                                                                                                            </set>
+                                                                                                                                        </block>
+                                                                                                                                    </outcome>
+                                                                                                                                </get-resource>
+                                                                                                                                <break/>
+                                                                                                                            </block>
+                                                                                                                        </outcome>
+                                                                                                                    </switch>
+                                                                                                                </for>
+                                                                                                            </block>
+                                                                                                        </outcome>
+                                                                                                        <outcome value='not-found'></outcome>
+                                                                                                        <outcome value='failure'></outcome>
+                                                                                                    </get-resource>
+                                                                                                    <set>
+                                                                                                        <parameter name='tmp.SECONDARY-ROOT.pnf-name-long' value="`$param-prefix-domainC-pnfName[0] + '-' +
+                                                   $param-prefix-domainC-pnfName[1] + '-' +
+                                                   $param-prefix-domainC-pnfName[2] + '-' +
+                                                   $param-prefix-domainC-pnfName[3] + '-' +
+                                                   $param-prefix-domainC-pnfName[4] + '-' +
+                                                   $param-prefix-domainC-pnfName[5] + '-' +
+                                                   $param-prefix-domainC-pnfName[6] + '-' +
+                                                   $param-prefix-domainC-pnfName[7] + '-' +
+                                                   $param-prefix-domainC-pnfName[8]`" />
+                                                                                                        <!--<parameter name='tmp.ROOT.pnf-name-short' value="`$param-prefix-domainB-pnfName[8]`" />-->
+                                                                                                        <parameter name='tmp.SECONDARY-ROOT.pnf-name-short' value="`$tmp.dst-secondary.pnf-name`" />
+                                                                                                        <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`" />
+                                                                                                        <parameter name='tmp.SECONDARY-ROOT.uni-tp-id' value="`$tmp.dst-secondary.ltpId`" />
+                                                                                                    </set>
                                                                                                     <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
                                                                                                                   resource="uni"
                                                                                                                   key="uni.id = $tmp.LEAF.uni-p-interface-long"
@@ -754,6 +1024,43 @@
                                                                                                                         </block>
                                                                                                                     </outcome>
                                                                                                                 </get-resource>
+                                                                                                                <switch test='`$hasSecondary`'>
+                                                                                                                    <outcome value='true'>
+                                                                                                                        <block>
+                                                                                                                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                                          resource="uni"
+                                                                                                                                          key="uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long"
+                                                                                                                                          local-only="false"
+                                                                                                                                          pfx="tmp.aai.secondaryrootuni" >
+                                                                                                                                <outcome value='not-found'>
+                                                                                                                                    <return status='failure'>
+                                                                                                                                        <parameter name='ack-final' value='Y'/>
+                                                                                                                                        <parameter name="error-code" value="500" />
+                                                                                                                                        <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
+                                                                                                                                    </return>
+                                                                                                                                </outcome>
+                                                                                                                                <outcome value='failure'>
+                                                                                                                                    <return status='failure'>
+                                                                                                                                        <parameter name='error-code' value='' />
+                                                                                                                                        <parameter name='error-message' value='' />
+                                                                                                                                    </return>
+                                                                                                                                </outcome>
+                                                                                                                                <outcome value='success'>
+                                                                                                                                    <block atomic="true">
+                                                                                                                                        <set>
+                                                                                                                                            <parameter name='tmp.newbw' value='`$tmp.aai.secondaryrootuni.data-source - $bwToBeDecreased`' />
+                                                                                                                                        </set>
+                                                                                                                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni'
+                                                                                                                                                key='uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long'>
+                                                                                                                                            <parameter name='id' value='`$tmp.SECONDARY-ROOT.uni-p-interface-long`' />
+                                                                                                                                            <parameter name='data-source' value='`$tmp.newbw`' />
+                                                                                                                                        </update>
+                                                                                                                                    </block>
+                                                                                                                                </outcome>
+                                                                                                                            </get-resource>
+                                                                                                                        </block>
+                                                                                                                    </outcome>
+                                                                                                                </switch>
                                                                                                             </block>
                                                                                                         </outcome>
                                                                                                     </get-resource>
@@ -788,15 +1095,19 @@
                                                                                                                                         <block></block>
                                                                                                                                     </outcome>
                                                                                                                                     <outcome value='true'>
-                                                                                                                                        <block atomic="true">
-                                                                                                                                            <set>
-                                                                                                                                                <parameter name='tmp.MMonlyHasROOT' value='false' />
-                                                                                                                                            </set>
-                                                                                                                                            <set>
-                                                                                                                                                <parameter name='tmp.MMstillHasUni' value='true' />
-                                                                                                                                            </set>
-                                                                                                                                            <break/>
-                                                                                                                                        </block>
+                                                                                                                                        <switch test="`$tmp.mmUNI-id-long != $tmp.SECONDARY-ROOT.uni-p-interface-long`">
+                                                                                                                                            <outcome value='true'>
+                                                                                                                                                <block atomic="true">
+                                                                                                                                                    <set>
+                                                                                                                                                        <parameter name='tmp.MMonlyHasROOT' value='false' />
+                                                                                                                                                    </set>
+                                                                                                                                                    <set>
+                                                                                                                                                        <parameter name='tmp.MMstillHasUni' value='true' />
+                                                                                                                                                    </set>
+                                                                                                                                                    <break/>
+                                                                                                                                                </block>
+                                                                                                                                            </outcome>
+                                                                                                                                        </switch>
                                                                                                                                     </outcome>
                                                                                                                                 </switch>
                                                                                                                             </block>
@@ -1149,6 +1460,28 @@
                                                                                                                                                 </return>
                                                                                                                                             </outcome>
                                                                                                                                         </switch>
+                                                                                                                                        <switch test='`$hasSecondary`'>
+                                                                                                                                            <outcome value='true'>
+                                                                                                                                                <block>
+                                                                                                                                                    <!-- This is to check the provider-id of ROOt and SECONDARY-ROOT-->
+                                                                                                                                                    <switch test='`$param-prefix-domainB[$param-prefix-domainB_length -9] == $param-prefix-domainC[$param-prefix-domainC_length -9]`'>
+                                                                                                                                                        <outcome value='true'>
+                                                                                                                                                            <block></block>
+                                                                                                                                                        </outcome>
+                                                                                                                                                        <outcome value='false'>
+                                                                                                                                                            <block>
+                                                                                                                                                                <call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn' mode='sync' ></call>
+                                                                                                                                                                <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
+                                                                                                                                                                        key='connectivity.connectivity-id = $tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id'>
+                                                                                                                                                                    <parameter name='connectivity-id' value='`$tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`' />
+                                                                                                                                                                    <parameter name='operational-status' value='Modified' />
+                                                                                                                                                                </update>
+                                                                                                                                                            </block>
+                                                                                                                                                        </outcome>
+                                                                                                                                                    </switch>
+                                                                                                                                                </block>
+                                                                                                                                            </outcome>
+                                                                                                                                        </switch>
                                                                                                                                     </block>
                                                                                                                                 </outcome>
                                                                                                                                 <outcome value='false'>
@@ -1313,6 +1646,28 @@
                                                                                                                                                             </return>
                                                                                                                                                         </outcome>
                                                                                                                                                     </switch>
+                                                                                                                                                    <switch test='`$hasSecondary`'>
+                                                                                                                                                        <outcome value='true'>
+                                                                                                                                                            <block>
+                                                                                                                                                                <!-- This is to check the provider-id of ROOt and SECONDARY-ROOT-->
+                                                                                                                                                                <switch test='`$param-prefix-domainB[$param-prefix-domainB_length -9] == $param-prefix-domainC[$param-prefix-domainC_length -9]`'>
+                                                                                                                                                                    <outcome value='true'>
+                                                                                                                                                                        <block></block>
+                                                                                                                                                                    </outcome>
+                                                                                                                                                                    <outcome value='false'>
+                                                                                                                                                                        <block>
+                                                                                                                                                                            <call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn' mode='sync' ></call>
+                                                                                                                                                                            <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
+                                                                                                                                                                                    key='connectivity.connectivity-id = $tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id'>
+                                                                                                                                                                                <parameter name='connectivity-id' value='`$tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`' />
+                                                                                                                                                                                <parameter name='operational-status' value='Modified' />
+                                                                                                                                                                            </update>
+                                                                                                                                                                        </block>
+                                                                                                                                                                    </outcome>
+                                                                                                                                                                </switch>
+                                                                                                                                                            </block>
+                                                                                                                                                        </outcome>
+                                                                                                                                                    </switch>
                                                                                                                                                 </block>
                                                                                                                                             </block>
                                                                                                                                         </outcome>
@@ -1452,6 +1807,28 @@
                                                                                                                                                                     </return>
                                                                                                                                                                 </outcome>
                                                                                                                                                             </switch>
+                                                                                                                                                            <switch test='`$hasSecondary`'>
+                                                                                                                                                                <outcome value='true'>
+                                                                                                                                                                    <block>
+                                                                                                                                                                        <!-- This is to check the provider-id of ROOt and SECONDARY-ROOT-->
+                                                                                                                                                                        <switch test='`$param-prefix-domainB[$param-prefix-domainB_length -9] == $param-prefix-domainC[$param-prefix-domainC_length -9]`'>
+                                                                                                                                                                            <outcome value='true'>
+                                                                                                                                                                                <block></block>
+                                                                                                                                                                            </outcome>
+                                                                                                                                                                            <outcome value='false'>
+                                                                                                                                                                                <block>
+                                                                                                                                                                                    <call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn' mode='sync' ></call>
+                                                                                                                                                                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
+                                                                                                                                                                                            key='connectivity.connectivity-id = $tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id'>
+                                                                                                                                                                                        <parameter name='connectivity-id' value='`$tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`' />
+                                                                                                                                                                                        <parameter name='operational-status' value='Modified' />
+                                                                                                                                                                                    </update>
+                                                                                                                                                                                </block>
+                                                                                                                                                                            </outcome>
+                                                                                                                                                                        </switch>
+                                                                                                                                                                    </block>
+                                                                                                                                                                </outcome>
+                                                                                                                                                            </switch>
                                                                                                                                                         </block>
                                                                                                                                                     </outcome>
                                                                                                                                                     <outcome value='false'>
diff --git a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn.xml b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn.xml
new file mode 100644
index 00000000..4edcd13c
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn.xml
@@ -0,0 +1,88 @@
+<service-logic
+        xmlns='http://www.onap.org/sdnc/svclogic'
+        xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>
+    <method rpc='cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn' mode='sync'>
+        <block atomic="true">
+            <set>
+                <parameter name='found-secondary-root-connectivity' value="false" />
+            </set>
+            <set>
+                <parameter name='tmp.aai.SECONDARY-ROOT.connectivity.' value="" />
+            </set>
+            <set>
+                <parameter name='tmp.aai.helper-secondary-root-all-connectivities.' value="" />
+            </set>
+            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                          resource="connectivities"
+                          key="selflink = 'https://aai.onap:8443/aai/v24/network/connectivities/'"
+                          local-only="false"
+                          pfx="tmp.aai.helper-secondary-root-all-connectivities" >
+                <outcome value='success'>
+                    <block atomic="true">
+                        <for index='helprconnidx' start='0' end='`$tmp.aai.helper-secondary-root-all-connectivities.connectivity_length`' >
+                            <block atomic='true'>
+                                <switch test='`$hasSecondary`'>
+                                    <outcome value='true'>
+                                        <block>
+                                            <!-- This is to check the provider-id of ROOt and SECONDARY-ROOT-->
+                                            <switch test='`$param-prefix-domainB[$param-prefix-domainB_length -9] == $param-prefix-domainC[$param-prefix-domainC_length -9]`'>
+                                                <outcome value='true'>
+                                                    <block>
+                                                        <switch test="`$tmp.aai.helper-secondary-root-all-connectivities.connectivity[$helprconnidx].vpn-type`">
+                                                            <outcome value='root'>
+                                                                <block>
+                                                                    <switch test="`$tmp.aai.helper-secondary-root-all-connectivities.connectivity[$helprconnidx].color-aware == $tmp.ROOT.uni-p-interface-long`">
+                                                                        <outcome value='true'>
+                                                                            <block atomic='true'>
+                                                                                <set>
+                                                                                    <parameter name='found-secondary-root-connectivity' value="true" />
+                                                                                </set>
+                                                                                <set>
+                                                                                    <parameter name='tmp.aai.SECONDARY-ROOT.connectivity.' value="`$tmp.aai.helper-secondary-root-all-connectivities.connectivity[$helprconnidx].`" />
+                                                                                </set>
+                                                                                <break/>
+                                                                            </block>
+                                                                        </outcome>
+                                                                    </switch>
+                                                                </block>
+                                                            </outcome>
+                                                        </switch>
+                                                    </block>
+                                                </outcome>
+                                                <outcome value='false'>
+                                                    <block>
+                                                        <switch test="`$tmp.aai.helper-secondary-root-all-connectivities.connectivity[$helprconnidx].vpn-type`">
+                                                            <outcome value='secondary-root'>
+                                                                <block>
+                                                                    <switch test="`$tmp.aai.helper-secondary-root-all-connectivities.connectivity[$helprconnidx].color-aware == $tmp.SECONDARY-ROOT.uni-p-interface-long`">
+                                                                        <outcome value='true'>
+                                                                            <block atomic='true'>
+                                                                                <set>
+                                                                                    <parameter name='found-secondary-root-connectivity' value="true" />
+                                                                                </set>
+                                                                                <set>
+                                                                                    <parameter name='tmp.aai.SECONDARY-ROOT.connectivity.' value="`$tmp.aai.helper-secondary-root-all-connectivities.connectivity[$helprconnidx].`" />
+                                                                                </set>
+                                                                                <break/>
+                                                                            </block>
+                                                                        </outcome>
+                                                                    </switch>
+                                                                </block>
+                                                            </outcome>
+                                                        </switch>
+                                                    </block>
+                                                </outcome>
+                                            </switch>
+                                        </block>
+                                    </outcome>
+                                </switch>
+                            </block>
+                        </for>
+                    </block>
+                </outcome>
+                <outcome value='not-found'></outcome>
+                <outcome value='failure'></outcome>
+            </get-resource>
+        </block>
+    </method>
+</service-logic>
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-modify.xml b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-modify.xml
index d01140f6..7c1d8733 100644
--- a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-modify.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-modify.xml
@@ -191,6 +191,12 @@
                                                                                             </outcome>
                                                                                             <outcome value='success'>
                                                                                                 <block>
+                                                                                                    <set>
+                                                                                                        <parameter name='hasSecondary' value="false" />
+                                                                                                        <parameter name='network-route-three' value="" />
+                                                                                                        <parameter name='tmp.aai.network-route-three.' value="" />
+                                                                                                        <parameter name='tmp.aai.network-route-C.' value="" />
+                                                                                                    </set>
                                                                                                     <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
                                                                                                         <parameter name="ctx-destination" value="prop.otn-tunnel-name"/>
                                                                                                     </execute>
@@ -245,6 +251,16 @@
                                                                                                                             </set>
                                                                                                                         </block>
                                                                                                                     </outcome>
+                                                                                                                    <outcome value='SECONDARY-ROOT'>
+                                                                                                                        <block>
+                                                                                                                            <set>
+                                                                                                                                <parameter name='tmp.aai.network-route-SECONDARY-ROOT.' value="`$tmp.aai.network-route-one.`" />
+                                                                                                                            </set>
+                                                                                                                            <set>
+                                                                                                                                <parameter name='tmp.aai.network-route-C.' value="`$tmp.aai.network-route-one.`" />
+                                                                                                                            </set>
+                                                                                                                        </block>
+                                                                                                                    </outcome>
                                                                                                                 </switch>
                                                                                                             </block>
                                                                                                         </outcome>
@@ -290,6 +306,60 @@
                                                                                                                             </set>
                                                                                                                         </block>
                                                                                                                     </outcome>
+                                                                                                                    <outcome value='SECONDARY-ROOT'>
+                                                                                                                        <block>
+                                                                                                                            <set>
+                                                                                                                                <parameter name='tmp.aai.network-route-SECONDARY-ROOT.' value="`$tmp.aai.network-route-two.`" />
+                                                                                                                            </set>
+                                                                                                                            <set>
+                                                                                                                                <parameter name='tmp.aai.network-route-C.' value="`$tmp.aai.network-route-two.`" />
+                                                                                                                            </set>
+                                                                                                                        </block>
+                                                                                                                    </outcome>
+                                                                                                                </switch>
+                                                                                                            </block>
+                                                                                                        </outcome>
+                                                                                                    </get-resource>
+                                                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                  resource="network-route"
+                                                                                                                  key='network-route.route-id = $network-route-three'
+                                                                                                                  local-only="false"
+                                                                                                                  force="true" pfx="tmp.aai.network-route-three">
+                                                                                                        <outcome value='not-found'></outcome>
+                                                                                                        <outcome value='failure'></outcome>
+                                                                                                        <outcome value='success'>
+                                                                                                            <block atomic="true">
+                                                                                                                <switch test='`$tmp.aai.network-route-three.type`'>
+                                                                                                                    <outcome value='ROOT'>
+                                                                                                                        <block>
+                                                                                                                            <set>
+                                                                                                                                <parameter name='tmp.aai.network-route-ROOT.' value="`$tmp.aai.network-route-two.`" />
+                                                                                                                            </set>
+                                                                                                                            <set>
+                                                                                                                                <parameter name='tmp.aai.network-route-B.' value="`$tmp.aai.network-route-two.`" />
+                                                                                                                            </set>
+                                                                                                                        </block>
+                                                                                                                    </outcome>
+                                                                                                                    <outcome value='LEAF'>
+                                                                                                                        <block>
+                                                                                                                            <set>
+                                                                                                                                <parameter name='tmp.aai.network-route-LEAF.' value="`$tmp.aai.network-route-two.`" />
+                                                                                                                            </set>
+                                                                                                                            <set>
+                                                                                                                                <parameter name='tmp.aai.network-route-A.' value="`$tmp.aai.network-route-two.`" />
+                                                                                                                            </set>
+                                                                                                                        </block>
+                                                                                                                    </outcome>
+                                                                                                                    <outcome value='SECONDARY-ROOT'>
+                                                                                                                        <block>
+                                                                                                                            <set>
+                                                                                                                                <parameter name='tmp.aai.network-route-SECONDARY-ROOT.' value="`$tmp.aai.network-route-three.`" />
+                                                                                                                            </set>
+                                                                                                                            <set>
+                                                                                                                                <parameter name='tmp.aai.network-route-C.' value="`$tmp.aai.network-route-three.`" />
+                                                                                                                            </set>
+                                                                                                                        </block>
+                                                                                                                    </outcome>
                                                                                                                 </switch>
                                                                                                             </block>
                                                                                                         </outcome>
@@ -696,6 +766,191 @@
                                                                                                         <parameter name='tmp.ROOT.uni-p-interface-long' value="`$tmp.aai.network-route-B.next-hop + '-' + $tmp.aai.network-route-B.logical-interface-id`" />
                                                                                                         <parameter name='tmp.ROOT.uni-tp-id' value="`$tmp.dst.ltpId`" />
                                                                                                     </set>
+                                                                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
+                                                                                                        <parameter name="original_string" value='`$tmp.aai.network-route-C.next-hop`'/>
+                                                                                                        <!--<parameter name="regex" value="[^-]+$"/>-->
+                                                                                                        <parameter name="regex" value="[-]+"/>
+                                                                                                        <parameter name="ctx_memory_result_key" value="param-prefix-domainC-pnfName"/>
+                                                                                                        <outcome value='success'>
+                                                                                                            <block atomic="true">
+                                                                                                                <set>
+                                                                                                                    <parameter name='tmp.dst.domainC.pnf-name' value="`$param-prefix-domainC-pnfName[0] + '-' +
+                                                   $param-prefix-domainC-pnfName[1] + '-' +
+                                                   $param-prefix-domainC-pnfName[2] + '-' +
+                                                   $param-prefix-domainC-pnfName[3] + '-' +
+                                                   $param-prefix-domainC-pnfName[4] + '-' +
+                                                   $param-prefix-domainC-pnfName[5] + '-' +
+                                                   $param-prefix-domainC-pnfName[6] + '-' +
+                                                   $param-prefix-domainC-pnfName[7] + '-' +
+                                                   $param-prefix-domainC-pnfName[8]`" />
+                                                                                                                </set>
+                                                                                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                              resource="pnf"
+                                                                                                                              key="pnf.pnf-name = $tmp.dst.domainC.pnf-name"
+                                                                                                                              pfx='tmp.aai.destination-secondary-pnf' local-only='false' >
+                                                                                                                    <!--AND depth = '0'"-->
+                                                                                                                    <outcome value='success'>
+                                                                                                                        <block>
+                                                                                                                            <for silentFailure='true' index='dpvidx' start='0' end='`$tmp.aai.destination-secondary-pnf.relationship-list.relationship_length`' >
+                                                                                                                                <switch test='`$tmp.aai.destination-secondary-pnf.relationship-list.relationship[$dpvidx].related-to`'>
+                                                                                                                                    <outcome value='esr-thirdparty-sdnc'>
+                                                                                                                                        <block atomic="true">
+                                                                                                                                            <set>
+                                                                                                                                                <parameter name='tmp.domainC.esr-thirdparty-id' value="`$tmp.aai.destination-secondary-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`" />
+                                                                                                                                            </set>
+                                                                                                                                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                                                          resource="esr-thirdparty-sdnc"
+                                                                                                                                                          key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainC.esr-thirdparty-id AND
+		     depth = '1'"
+                                                                                                                                                          pfx='tmp.aai.domainC.esr-thirdparty-sdnc' local-only='false' >
+                                                                                                                                                <outcome value='success'>
+                                                                                                                                                    <block>
+                                                                                                                                                        <set>
+                                                                                                                                                            <parameter name='prop.sdncRestApi.thirdpartySdnc.domainC.url' value="`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
+                                                                                                                                                            <parameter name='prop.sdncRestApi.thirdpartySdnc.domainC.user' value="`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
+                                                                                                                                                            <parameter name='prop.sdncRestApi.thirdpartySdnc.domainC.password' value="`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />
+                                                                                                                                                            <!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->
+                                                                                                                                                            <!--<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />-->
+                                                                                                                                                            <!--<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />-->
+                                                                                                                                                            <!--<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />-->
+                                                                                                                                                            <!--<parameter name="format" value="json"/>-->
+                                                                                                                                                            <!--<parameter name="httpMethod" value="get"/>-->
+                                                                                                                                                            <!--<parameter name="responsePrefix" value="topology"/>-->
+                                                                                                                                                            <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->
+                                                                                                                                                            <!--<parameter name="trustStorePassword" value="adminadmin"/>-->
+                                                                                                                                                            <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->
+                                                                                                                                                            <!--<parameter name="keyStorePassword" value="adminadmin"/>-->
+                                                                                                                                                        </set>
+                                                                                                                                                    </block>
+                                                                                                                                                </outcome>
+                                                                                                                                                <outcome value='not-found'>
+                                                                                                                                                    <return status='failure'>
+                                                                                                                                                        <parameter name='ack-final' value='Y'/>
+                                                                                                                                                        <parameter name="error-code" value="500" />
+                                                                                                                                                        <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                                                                    </return>
+                                                                                                                                                </outcome>
+                                                                                                                                                <outcome value='Other'>
+                                                                                                                                                    <return status='failure'>
+                                                                                                                                                        <parameter name='ack-final' value='Y'/>
+                                                                                                                                                        <parameter name="error-code" value="500" />
+                                                                                                                                                        <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                                                                    </return>
+                                                                                                                                                </outcome>
+                                                                                                                                            </get-resource>
+                                                                                                                                        </block>
+                                                                                                                                    </outcome>
+                                                                                                                                    <outcome value='network-resource'>
+                                                                                                                                        <block atomic="true">
+                                                                                                                                            <set>
+                                                                                                                                                <parameter name='tmp.domainC.eth-network-id' value="`$tmp.aai.destination-secondary-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`" />
+                                                                                                                                            </set>
+                                                                                                                                        </block>
+                                                                                                                                    </outcome>
+                                                                                                                                </switch>
+                                                                                                                            </for>
+                                                                                                                        </block>
+                                                                                                                    </outcome>
+                                                                                                                    <outcome value='not-found'>
+                                                                                                                        <return status='failure'>
+                                                                                                                            <parameter name='ack-final' value='Y'/>
+                                                                                                                            <parameter name="error-code" value="500" />
+                                                                                                                            <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                                        </return>
+                                                                                                                    </outcome>
+                                                                                                                    <outcome value='Other'>
+                                                                                                                        <return status='failure'>
+                                                                                                                            <parameter name='ack-final' value='Y'/>
+                                                                                                                            <parameter name="error-code" value="500" />
+                                                                                                                            <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                                        </return>
+                                                                                                                    </outcome>
+                                                                                                                </get-resource>
+                                                                                                            </block>
+                                                                                                        </outcome>
+                                                                                                        <outcome value='failure'></outcome>
+                                                                                                    </execute>
+                                                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                  resource="p-interface"
+                                                                                                                  key="pnf.pnf-name = $tmp.dst.domainC.pnf-name
+	        AND p-interface.interface-name = $tmp.aai.network-route-C.next-hop"
+                                                                                                                  local-only="false"
+                                                                                                                  pfx="tmp.aai.network-route-C.p-interface-dst" >
+                                                                                                        <!--<get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" -->
+                                                                                                        <!--	resource="p-interface"-->
+                                                                                                        <!--	    key="pnf.pnf-name = $unique-src-node-Id-->
+                                                                                                        <!--	        and p-interface.interface-name = $tmp.aai.endpointA.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value"-->
+                                                                                                        <!--		local-only="false" -->
+                                                                                                        <!--		pfx="tmp.aai.endpointA.p-interface-src" >-->
+                                                                                                        <outcome value='success'>
+                                                                                                            <block atomic="true">
+                                                                                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
+                                                                                                                    <parameter name="original_string" value='`$tmp.aai.network-route-C.p-interface-dst.interface-name`'/>
+                                                                                                                    <!--<parameter name="regex" value="[^-]+$"/>-->
+                                                                                                                    <parameter name="regex" value="[-]+"/>
+                                                                                                                    <parameter name="ctx_memory_result_key" value="param-prefix-domainC"/>
+                                                                                                                    <outcome value='success'>
+                                                                                                                        <block atomic="true">
+                                                                                                                            <set>
+                                                                                                                                <parameter name='tmp.dst-secondary.ltpId' value='`$param-prefix-domainC[$param-prefix-domainC_length -1]`' />
+                                                                                                                            </set>
+                                                                                                                            <set>
+                                                                                                                                <parameter name='tmp.dst-secondary.pnf-name' value='`$param-prefix-domainC[$param-prefix-domainC_length -3]`' />
+                                                                                                                            </set>
+                                                                                                                        </block>
+                                                                                                                    </outcome>
+                                                                                                                    <outcome value='failure'>
+                                                                                                                        <return status='failure'>
+                                                                                                                            <parameter name='error-code' value='' />
+                                                                                                                            <parameter name='error-message' value="An error occured while splitting sna1_route" />
+                                                                                                                        </return>
+                                                                                                                    </outcome>
+                                                                                                                </execute>
+                                                                                                                <for silentFailure='true' index='dividx' start='0' end='`$tmp.aai.network-route-C.p-interface-dst.relationship-list.relationship_length`' >
+                                                                                                                    <switch test='`$tmp.aai.network-route-C.p-interface-dst.relationship-list.relationship[$dividx].related-to`'>
+                                                                                                                        <outcome value='tunnel-termination-point'>
+                                                                                                                            <block atomic="true">
+                                                                                                                                <set>
+                                                                                                                                    <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`" />
+                                                                                                                                </set>
+                                                                                                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                                              resource="tunnel-termination-point"
+                                                                                                                                              key="tunnel-termination-point.ttp-id = $tmp.destination-secondary.ttp-id
+		AND depth = '0'"
+                                                                                                                                              pfx='tmp.aai.destination-secondary-ttp' local-only='false' >
+                                                                                                                                    <outcome value='success'>
+                                                                                                                                        <block atomic="true">
+                                                                                                                                            <set>
+                                                                                                                                                <parameter name='destination-secondary.tunnel-tp-id' value="`$tmp.aai.destination-secondary-ttp.tunnel-tp-id`" />
+                                                                                                                                            </set>
+                                                                                                                                        </block>
+                                                                                                                                    </outcome>
+                                                                                                                                </get-resource>
+                                                                                                                                <break/>
+                                                                                                                            </block>
+                                                                                                                        </outcome>
+                                                                                                                    </switch>
+                                                                                                                </for>
+                                                                                                            </block>
+                                                                                                        </outcome>
+                                                                                                        <outcome value='not-found'></outcome>
+                                                                                                        <outcome value='failure'></outcome>
+                                                                                                    </get-resource>
+                                                                                                    <set>
+                                                                                                        <parameter name='tmp.SECONDARY-ROOT.pnf-name-long' value="`$param-prefix-domainC-pnfName[0] + '-' +
+                                                   $param-prefix-domainC-pnfName[1] + '-' +
+                                                   $param-prefix-domainC-pnfName[2] + '-' +
+                                                   $param-prefix-domainC-pnfName[3] + '-' +
+                                                   $param-prefix-domainC-pnfName[4] + '-' +
+                                                   $param-prefix-domainC-pnfName[5] + '-' +
+                                                   $param-prefix-domainC-pnfName[6] + '-' +
+                                                   $param-prefix-domainC-pnfName[7] + '-' +
+                                                   $param-prefix-domainC-pnfName[8]`" />
+                                                                                                        <!--<parameter name='tmp.ROOT.pnf-name-short' value="`$param-prefix-domainB-pnfName[8]`" />-->
+                                                                                                        <parameter name='tmp.SECONDARY-ROOT.pnf-name-short' value="`$tmp.dst-secondary.pnf-name`" />
+                                                                                                        <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`" />
+                                                                                                        <parameter name='tmp.SECONDARY-ROOT.uni-tp-id' value="`$tmp.dst-secondary.ltpId`" />
+                                                                                                    </set>
                                                                                                     <call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-logic' mode='sync' ></call>
                                                                                                     <switch test='`$found-middle-man`'>
                                                                                                         <outcome value='false'>
@@ -828,6 +1083,98 @@
                                                                                                                     <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="uni.id" />
                                                                                                                     <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$tmp.ROOT.uni-p-interface-long`" />
                                                                                                                 </save>
+                                                                                                                <switch test='`$hasSecondary`'>
+                                                                                                                    <outcome value='true'>
+                                                                                                                        <block>
+                                                                                                                            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni'
+                                                                                                                                  key='uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long'>
+                                                                                                                                <parameter name='id' value='`$tmp.SECONDARY-ROOT.uni-p-interface-long`' />
+                                                                                                                                <parameter name='tp-id' value='`$tmp.SECONDARY-ROOT.uni-tp-id`' />
+                                                                                                                                <parameter name='cvlan' value='`$tmp.aai.network-route-C.logical-interface-id`' />
+                                                                                                                                <parameter name='type' value='secondary-root' />
+                                                                                                                                <parameter name='data-source' value='`$gfp`' />
+                                                                                                                            </save>
+                                                                                                                            <!-- This is to check the provider-id of ROOt and SECONDARY-ROOT-->
+                                                                                                                            <switch test='`$param-prefix-domainB[$param-prefix-domainB_length -9] == $param-prefix-domainC[$param-prefix-domainC_length -9]`'>
+                                                                                                                                <outcome value='true'>
+                                                                                                                                    <block>
+                                                                                                                                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list'
+                                                                                                                                              key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid'
+                                                                                                                                              force="true" pfx="tmp.AnAI-data">
+                                                                                                                                            <parameter name="relationship-list.relationship[0].related-to" value="uni" />
+                                                                                                                                            <parameter name="relationship-list.relationship[0].related-link" value="`'/network/unis/uni/' + $tmp.SECONDARY-ROOT.uni-p-interface-long`" />
+                                                                                                                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="uni.id" />
+                                                                                                                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$tmp.SECONDARY-ROOT.uni-p-interface-long`" />
+                                                                                                                                        </save>
+                                                                                                                                    </block>
+                                                                                                                                </outcome>
+                                                                                                                                <outcome value='false'>
+                                                                                                                                    <block>
+                                                                                                                                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
+                                                                                                                                            <parameter name="ctx-destination" value="prop.connectivity-domainC-uuid"/>
+                                                                                                                                        </execute>
+                                                                                                                                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
+                                                                                                                                              key='connectivity.connectivity-id = $prop.connectivity-domainC-uuid'>
+                                                                                                                                            <parameter name='connectivity-id' value='`$prop.connectivity-domainC-uuid`' />
+                                                                                                                                            <!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' -->
+                                                                                                                                            <!--      key='connectivity.connectivity-id = $tmp.ROOT.uni-p-interface-long'>-->
+                                                                                                                                            <!--<parameter name='connectivity-id' value='`$tmp.ROOT.uni-p-interface-long`' />-->
+                                                                                                                                            <parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />
+                                                                                                                                            <parameter name='operational-status' value='Created' />
+                                                                                                                                            <parameter name='access-provider-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -9]`' />
+                                                                                                                                            <parameter name='access-client-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -7]`' />
+                                                                                                                                            <parameter name='access-topology-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -5]`' />
+                                                                                                                                            <parameter name='access-node-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -3]`' />
+                                                                                                                                            <parameter name='access-ltp-id' value='`$param-prefix-domainC[$param-prefix-domainC_length -1]`' />
+                                                                                                                                            <parameter name='cvlan' value='`$tmp.aai.network-route-C.logical-interface-id`' />
+                                                                                                                                            <parameter name='color-aware' value='`$tmp.SECONDARY-ROOT.uni-p-interface-long`' />
+                                                                                                                                            <parameter name='vpn-type' value='secondary-root' />
+                                                                                                                                            <parameter name='bandwidth-profile-name' value='`$gfp`' />
+                                                                                                                                            <parameter name='cir' value='`$gfp *1000000`' />
+                                                                                                                                            <parameter name='eir' value='`$gfp *1000000`' />
+                                                                                                                                            <parameter name='cbs' value='`$prop.sotn.cbs`' />
+                                                                                                                                            <parameter name='ebs' value='`$prop.sotn.ebs`' />
+                                                                                                                                            <!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->
+                                                                                                                                            <!--<parameter name='coupling-flag' value='`$prop.sotn.couplingFlag`' />-->
+                                                                                                                                            <!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->
+                                                                                                                                            <parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />
+                                                                                                                                            <parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />
+                                                                                                                                            <parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />
+                                                                                                                                            <parameter name='connectivity-selflink' value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` " />
+                                                                                                                                        </save>
+                                                                                                                                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'
+                                                                                                                                              key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id
+         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id
+         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'
+                                                                                                                                              force="true" pfx="tmp.AnAI-data">
+                                                                                                                                            <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />
+                                                                                                                                            <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $prop.connectivity-domainC-uuid`" />
+                                                                                                                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />
+                                                                                                                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.connectivity-domainC-uuid`" />
+                                                                                                                                            <!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->
+                                                                                                                                            <!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->
+                                                                                                                                            <!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->
+                                                                                                                                            <!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->
+                                                                                                                                            <!--      force="true" pfx="tmp.AnAI-data">-->
+                                                                                                                                            <!--<parameter name="relationship-list.relationship[0].related-to" value="connectivity" />-->
+                                                                                                                                            <!--<parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $prop.sotn.network-id`" />-->
+                                                                                                                                            <!--<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />-->
+                                                                                                                                            <!--<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.sotn.network-id`" />-->
+                                                                                                                                        </save>
+                                                                                                                                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list'
+                                                                                                                                              key='connectivity.connectivity-id = $prop.connectivity-domainC-uuid'
+                                                                                                                                              force="true" pfx="tmp.AnAI-data">
+                                                                                                                                            <parameter name="relationship-list.relationship[0].related-to" value="uni" />
+                                                                                                                                            <parameter name="relationship-list.relationship[0].related-link" value="`'/network/unis/uni/' + $tmp.SECONDARY-ROOT.uni-p-interface-long`" />
+                                                                                                                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="uni.id" />
+                                                                                                                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$tmp.SECONDARY-ROOT.uni-p-interface-long`" />
+                                                                                                                                        </save>
+                                                                                                                                    </block>
+                                                                                                                                </outcome>
+                                                                                                                            </switch>
+                                                                                                                        </block>
+                                                                                                                    </outcome>
+                                                                                                                </switch>
                                                                                                                 <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
                                                                                                                     <parameter name="ctx-destination" value="prop.connectivity-middle-man-uuid"/>
                                                                                                                 </execute>
@@ -915,6 +1262,20 @@
                                                                                                                     <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="uni.id" />
                                                                                                                     <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$tmp.ROOT.uni-p-interface-long`" />
                                                                                                                 </save>
+                                                                                                                <switch test='`$hasSecondary`'>
+                                                                                                                    <outcome value='true'>
+                                                                                                                        <block>
+                                                                                                                            <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list'
+                                                                                                                                  key='connectivity.connectivity-id = $middle-man-conn.connectivity-id'
+                                                                                                                                  force="true" pfx="tmp.AnAI-data">
+                                                                                                                                <parameter name="relationship-list.relationship[0].related-to" value="uni" />
+                                                                                                                                <parameter name="relationship-list.relationship[0].related-link" value="`'/network/unis/uni/' + $tmp.SECONDARY-ROOT.uni-p-interface-long`" />
+                                                                                                                                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="uni.id" />
+                                                                                                                                <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$tmp.SECONDARY-ROOT.uni-p-interface-long`" />
+                                                                                                                            </save>
+                                                                                                                        </block>
+                                                                                                                    </outcome>
+                                                                                                                </switch>
                                                                                                                 <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list'
                                                                                                                       key='connectivity.connectivity-id = $middle-man-conn.connectivity-id'
                                                                                                                       force="true" pfx="tmp.AnAI-data">
@@ -931,6 +1292,27 @@
                                                                                                                     <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />
                                                                                                                     <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.connectivity-domainB-uuid`" />
                                                                                                                 </save>
+                                                                                                                <switch test='`$hasSecondary`'>
+                                                                                                                    <outcome value='true'>
+                                                                                                                        <block>
+                                                                                                                            <!-- This is to check the provider-id of ROOt and SECONDARY-ROOT-->
+                                                                                                                            <switch test='`$param-prefix-domainB[$param-prefix-domainB_length -9] == $param-prefix-domainC[$param-prefix-domainC_length -9]`'>
+                                                                                                                                <outcome value='false'>
+                                                                                                                                    <block>
+                                                                                                                                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list'
+                                                                                                                                              key='connectivity.connectivity-id = $middle-man-conn.connectivity-id'
+                                                                                                                                              force="true" pfx="tmp.AnAI-data">
+                                                                                                                                            <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />
+                                                                                                                                            <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $prop.connectivity-domainC-uuid`" />
+                                                                                                                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />
+                                                                                                                                            <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.connectivity-domainC-uuid`" />
+                                                                                                                                        </save>
+                                                                                                                                    </block>
+                                                                                                                                </outcome>
+                                                                                                                            </switch>
+                                                                                                                        </block>
+                                                                                                                    </outcome>
+                                                                                                                </switch>
                                                                                                                 <call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-F1' mode='sync' ></call>
                                                                                                             </block>
                                                                                                         </outcome>
@@ -1010,6 +1392,43 @@
                                                                                                                                                                 </block>
                                                                                                                                                             </outcome>
                                                                                                                                                         </get-resource>
+                                                                                                                                                        <switch test='`$hasSecondary`'>
+                                                                                                                                                            <outcome value='true'>
+                                                                                                                                                                <block>
+                                                                                                                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                                                                                  resource="uni"
+                                                                                                                                                                                  key="uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long"
+                                                                                                                                                                                  local-only="false"
+                                                                                                                                                                                  pfx="tmp.aai.secondaryrootuni" >
+                                                                                                                                                                        <outcome value='not-found'>
+                                                                                                                                                                            <return status='failure'>
+                                                                                                                                                                                <parameter name='ack-final' value='Y'/>
+                                                                                                                                                                                <parameter name="error-code" value="500" />
+                                                                                                                                                                                <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
+                                                                                                                                                                            </return>
+                                                                                                                                                                        </outcome>
+                                                                                                                                                                        <outcome value='failure'>
+                                                                                                                                                                            <return status='failure'>
+                                                                                                                                                                                <parameter name='error-code' value='' />
+                                                                                                                                                                                <parameter name='error-message' value='' />
+                                                                                                                                                                            </return>
+                                                                                                                                                                        </outcome>
+                                                                                                                                                                        <outcome value='success'>
+                                                                                                                                                                            <block atomic="true">
+                                                                                                                                                                                <set>
+                                                                                                                                                                                    <parameter name='tmp.newbw' value='`$tmp.aai.secondaryrootuni.data-source + $gfp`' />
+                                                                                                                                                                                </set>
+                                                                                                                                                                                <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni'
+                                                                                                                                                                                        key='uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long'>
+                                                                                                                                                                                    <parameter name='id' value='`$tmp.SECONDARY-ROOT.uni-p-interface-long`' />
+                                                                                                                                                                                    <parameter name='data-source' value='`$tmp.newbw`' />
+                                                                                                                                                                                </update>
+                                                                                                                                                                            </block>
+                                                                                                                                                                        </outcome>
+                                                                                                                                                                    </get-resource>
+                                                                                                                                                                </block>
+                                                                                                                                                            </outcome>
+                                                                                                                                                        </switch>
                                                                                                                                                     </block>
                                                                                                                                                 </outcome>
                                                                                                                                                 <outcome value='true'>
@@ -1050,6 +1469,43 @@
                                                                                                                                                                 </block>
                                                                                                                                                             </outcome>
                                                                                                                                                         </get-resource>
+                                                                                                                                                        <switch test='`$hasSecondary`'>
+                                                                                                                                                            <outcome value='true'>
+                                                                                                                                                                <block>
+                                                                                                                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                                                                                  resource="uni"
+                                                                                                                                                                                  key="uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long"
+                                                                                                                                                                                  local-only="false"
+                                                                                                                                                                                  pfx="tmp.aai.secondaryrootuni" >
+                                                                                                                                                                        <outcome value='not-found'>
+                                                                                                                                                                            <return status='failure'>
+                                                                                                                                                                                <parameter name='ack-final' value='Y'/>
+                                                                                                                                                                                <parameter name="error-code" value="500" />
+                                                                                                                                                                                <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
+                                                                                                                                                                            </return>
+                                                                                                                                                                        </outcome>
+                                                                                                                                                                        <outcome value='failure'>
+                                                                                                                                                                            <return status='failure'>
+                                                                                                                                                                                <parameter name='error-code' value='' />
+                                                                                                                                                                                <parameter name='error-message' value='' />
+                                                                                                                                                                            </return>
+                                                                                                                                                                        </outcome>
+                                                                                                                                                                        <outcome value='success'>
+                                                                                                                                                                            <block atomic="true">
+                                                                                                                                                                                <set>
+                                                                                                                                                                                    <parameter name='tmp.newbw' value='`$tmp.aai.secondaryrootuni.data-source + $gfp`' />
+                                                                                                                                                                                </set>
+                                                                                                                                                                                <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni'
+                                                                                                                                                                                        key='uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long'>
+                                                                                                                                                                                    <parameter name='id' value='`$tmp.SECONDARY-ROOT.uni-p-interface-long`' />
+                                                                                                                                                                                    <parameter name='data-source' value='`$tmp.newbw`' />
+                                                                                                                                                                                </update>
+                                                                                                                                                                            </block>
+                                                                                                                                                                        </outcome>
+                                                                                                                                                                    </get-resource>
+                                                                                                                                                                </block>
+                                                                                                                                                            </outcome>
+                                                                                                                                                        </switch>
                                                                                                                                                     </block>
                                                                                                                                                 </outcome>
                                                                                                                                             </switch>
@@ -1260,6 +1716,43 @@
                                                                                                                                     </block>
                                                                                                                                 </outcome>
                                                                                                                             </get-resource>
+                                                                                                                            <switch test='`$hasSecondary`'>
+                                                                                                                                <outcome value='true'>
+                                                                                                                                    <block>
+                                                                                                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                                                      resource="uni"
+                                                                                                                                                      key="uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long"
+                                                                                                                                                      local-only="false"
+                                                                                                                                                      pfx="tmp.aai.secondaryrootuni" >
+                                                                                                                                            <outcome value='not-found'>
+                                                                                                                                                <return status='failure'>
+                                                                                                                                                    <parameter name='ack-final' value='Y'/>
+                                                                                                                                                    <parameter name="error-code" value="500" />
+                                                                                                                                                    <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
+                                                                                                                                                </return>
+                                                                                                                                            </outcome>
+                                                                                                                                            <outcome value='failure'>
+                                                                                                                                                <return status='failure'>
+                                                                                                                                                    <parameter name='error-code' value='' />
+                                                                                                                                                    <parameter name='error-message' value='' />
+                                                                                                                                                </return>
+                                                                                                                                            </outcome>
+                                                                                                                                            <outcome value='success'>
+                                                                                                                                                <block atomic="true">
+                                                                                                                                                    <set>
+                                                                                                                                                        <parameter name='tmp.newbw' value='`$tmp.aai.secondaryrootuni.data-source + $gfp`' />
+                                                                                                                                                    </set>
+                                                                                                                                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni'
+                                                                                                                                                            key='uni.id = $tmp.SECONDARY-ROOT.uni-p-interface-long'>
+                                                                                                                                                        <parameter name='id' value='`$tmp.SECONDARY-ROOT.uni-p-interface-long`' />
+                                                                                                                                                        <parameter name='data-source' value='`$tmp.newbw`' />
+                                                                                                                                                    </update>
+                                                                                                                                                </block>
+                                                                                                                                            </outcome>
+                                                                                                                                        </get-resource>
+                                                                                                                                    </block>
+                                                                                                                                </outcome>
+                                                                                                                            </switch>
                                                                                                                             <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'
                                                                                                                                   key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id
          AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id
@@ -1450,6 +1943,43 @@
                                                                                                                                                 </return>
                                                                                                                                             </outcome>
                                                                                                                                         </switch>
+                                                                                                                                        <call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn' mode='sync' ></call>
+                                                                                                                                        <switch test="`$found-secondary-root-connectivity`">
+                                                                                                                                            <outcome value='true'>
+                                                                                                                                                <block atomic='true'>
+                                                                                                                                                    <set>
+                                                                                                                                                        <!--<parameter name='prop.connectivity-domainB-uuid' value="`$tmp.ROOT.uni-p-interface-long`" />-->
+                                                                                                                                                        <!--OR-->
+                                                                                                                                                        <parameter name='prop.connectivity-domainC-uuid' value="`$tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`" />
+                                                                                                                                                    </set>
+                                                                                                                                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'
+                                                                                                                                                          key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id
+         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id
+         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'
+                                                                                                                                                          force="true" pfx="tmp.AnAI-data">
+                                                                                                                                                        <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />
+                                                                                                                                                        <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`" />
+                                                                                                                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />
+                                                                                                                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`" />
+                                                                                                                                                        <!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->
+                                                                                                                                                        <!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->
+                                                                                                                                                        <!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->
+                                                                                                                                                        <!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->
+                                                                                                                                                        <!--      force="true" pfx="tmp.AnAI-data">-->
+                                                                                                                                                        <!--<parameter name="relationship-list.relationship[0].related-to" value="connectivity" />-->
+                                                                                                                                                        <!--<parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $prop.sotn.network-id`" />-->
+                                                                                                                                                        <!--<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />-->
+                                                                                                                                                        <!--<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.sotn.network-id`" />-->
+                                                                                                                                                    </save>
+                                                                                                                                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
+                                                                                                                                                            key='connectivity.connectivity-id = $prop.connectivity-domainC-uuid'>
+                                                                                                                                                        <parameter name='connectivity-id' value='`$prop.connectivity-domainC-uuid`' />
+                                                                                                                                                        <parameter name='operational-status' value='Modified' />
+                                                                                                                                                    </update>
+                                                                                                                                                </block>
+                                                                                                                                            </outcome>
+                                                                                                                                            <outcome value='false'></outcome>
+                                                                                                                                        </switch>
                                                                                                                                         <call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-F1' mode='sync' ></call>
                                                                                                                                     </block>
                                                                                                                                 </outcome>
@@ -1533,6 +2063,43 @@
                                                                                                                                                                 </return>
                                                                                                                                                             </outcome>
                                                                                                                                                         </switch>
+                                                                                                                                                        <call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-SECONDARY-ROOT-conn' mode='sync' ></call>
+                                                                                                                                                        <switch test="`$found-secondary-root-connectivity`">
+                                                                                                                                                            <outcome value='true'>
+                                                                                                                                                                <block atomic='true'>
+                                                                                                                                                                    <set>
+                                                                                                                                                                        <!--<parameter name='prop.connectivity-domainB-uuid' value="`$tmp.ROOT.uni-p-interface-long`" />-->
+                                                                                                                                                                        <!--OR-->
+                                                                                                                                                                        <parameter name='prop.connectivity-domainC-uuid' value="`$tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`" />
+                                                                                                                                                                    </set>
+                                                                                                                                                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list'
+                                                                                                                                                                          key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id
+         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id
+         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'
+                                                                                                                                                                          force="true" pfx="tmp.AnAI-data">
+                                                                                                                                                                        <parameter name="relationship-list.relationship[0].related-to" value="connectivity" />
+                                                                                                                                                                        <parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`" />
+                                                                                                                                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />
+                                                                                                                                                                        <parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$tmp.aai.SECONDARY-ROOT.connectivity.connectivity-id`" />
+                                                                                                                                                                        <!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->
+                                                                                                                                                                        <!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->
+                                                                                                                                                                        <!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->
+                                                                                                                                                                        <!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->
+                                                                                                                                                                        <!--      force="true" pfx="tmp.AnAI-data">-->
+                                                                                                                                                                        <!--<parameter name="relationship-list.relationship[0].related-to" value="connectivity" />-->
+                                                                                                                                                                        <!--<parameter name="relationship-list.relationship[0].related-link" value="`'/network/connectivities/connectivity/' + $prop.sotn.network-id`" />-->
+                                                                                                                                                                        <!--<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-key" value="connectivity.connectivity-id" />-->
+                                                                                                                                                                        <!--<parameter name="relationship-list.relationship[0].relationship-data[0].relationship-value" value="`$prop.sotn.network-id`" />-->
+                                                                                                                                                                    </save>
+                                                                                                                                                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
+                                                                                                                                                                            key='connectivity.connectivity-id = $prop.connectivity-domainC-uuid'>
+                                                                                                                                                                        <parameter name='connectivity-id' value='`$prop.connectivity-domainC-uuid`' />
+                                                                                                                                                                        <parameter name='operational-status' value='Modified' />
+                                                                                                                                                                    </update>
+                                                                                                                                                                </block>
+                                                                                                                                                            </outcome>
+                                                                                                                                                            <outcome value='false'></outcome>
+                                                                                                                                                        </switch>
                                                                                                                                                     </block>
                                                                                                                                                     <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list'
                                                                                                                                                           key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id'
@@ -1713,7 +2280,18 @@
                                         </outcome>
                                     </get-resource>
                                 </for>
-                                <call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-F1-activate' mode='sync' ></call>
+                                <switch test='`$hasSecondary`'>
+                                    <outcome value='false'>
+                                        <block>
+                                            <call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-F1-activate' mode='sync' ></call>
+                                        </block>
+                                    </outcome>
+                                    <outcome value='true'>
+                                        <block>
+                                            <call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-F1-activate-w-Protection' mode='sync' ></call>
+                                        </block>
+                                    </outcome>
+                                </switch>
                             </block>
                         </outcome>
                     </switch>
diff --git a/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof.xml b/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof.xml
index 3120201e..35853b85 100644
--- a/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof.xml
@@ -29,9 +29,52 @@
                                 <outcome value='true'>
                                     <switch test='`$allNetworksList.network-resource[$netwidx].te-topo-id != $param-prefix-domainB-pnfName[6]`'>
                                         <outcome value='true'>
-                                            <set>
-                                                <parameter name='otnTopoIdDst' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />
-                                            </set>
+                                            <block>
+                                                <switch test='`$hasSecondary`'>
+                                                    <outcome value='false'>
+                                                        <set>
+                                                            <parameter name='otnTopoIdDst' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />
+                                                        </set>
+                                                    </outcome>
+                                                    <outcome value='true'>
+                                                        <block>
+                                                            <!-- This is to check the provider-id of ROOt and SECONDARY-ROOT-->
+                                                            <switch test='`$param-prefix-domainB[$param-prefix-domainB_length -9] == $param-prefix-domainC[$param-prefix-domainC_length -9]`'>
+                                                                <outcome value='true'>
+                                                                    <block>
+                                                                        <set>
+                                                                            <parameter name='otnTopoIdDst' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />
+                                                                        </set>
+                                                                        <set>
+                                                                            <parameter name='otnTopoIdDstBackup' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />
+                                                                        </set>
+                                                                    </block>
+                                                                </outcome>
+                                                                <outcome value='false'>
+                                                                    <block>
+                                                                        <set>
+                                                                            <parameter name='otnTopoIdDst' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />
+                                                                        </set>
+                                                                    </block>
+                                                                </outcome>
+                                                            </switch>
+                                                        </block>
+                                                    </outcome>
+                                                </switch>
+                                            </block>
+                                        </outcome>
+                                    </switch>
+                                </outcome>
+                                <outcome value='false'>
+                                    <switch test='`$allNetworksList.network-resource[$netwidx].provider-id == $param-prefix-domainC-pnfName[2]`'>
+                                        <outcome value='true'>
+                                            <block>
+                                                <switch test='`$hasSecondary`'>
+                                                    <outcome value='true'>
+                                                        <block></block>
+                                                    </outcome>
+                                                </switch>
+                                            </block>
                                         </outcome>
                                     </switch>
                                 </outcome>
@@ -45,6 +88,9 @@
                 <set>
                     <parameter name='tmp.pce-dst-node.' value='' />
                 </set>
+                <set>
+                    <parameter name='tmp.pce-dst-node-backup.' value='' />
+                </set>
                 <set>
                     <!--<parameter name='`otn-oof`' value='' />-->
                     <parameter name='otn-oof.' value='' />
@@ -92,6 +138,26 @@
                                                    $param-prefix-domainB-pnfName[7] + '-' +
                                                    $param-prefix-domainB-pnfName[8]`" />
                 </set>
+                <set>
+                    <!--<parameter name='$tmp.pce-dst-node' value="`$param-prefix-domainB-pnfName[0] + '-' +-->
+                    <!--                                                   $param-prefix-domainB-pnfName[1] + '-' +-->
+                    <!--                                                   $param-prefix-domainB-pnfName[2] + '-' +-->
+                    <!--                                                   $param-prefix-domainB-pnfName[3] + '-' +-->
+                    <!--                                                   $param-prefix-domainB-pnfName[4] + '-' +-->
+                    <!--                                                   $param-prefix-domainB-pnfName[5] + '-' +-->
+                    <!--                                                   1 + '-' +-->
+                    <!--                                                   $param-prefix-domainB-pnfName[7] + '-' +-->
+                    <!--                                                   $param-prefix-domainB-pnfName[8]`" />-->
+                    <parameter name='tmp.pce-dst-node-backup' value="`$param-prefix-domainC-pnfName[0] + '-' +
+                                                   $param-prefix-domainC-pnfName[1] + '-' +
+                                                   $param-prefix-domainC-pnfName[2] + '-' +
+                                                   $param-prefix-domainC-pnfName[3] + '-' +
+                                                   $param-prefix-domainC-pnfName[4] + '-' +
+                                                   $param-prefix-domainC-pnfName[5] + '-' +
+                                                   $otnTopoIdDstBackup + '-' +
+                                                   $param-prefix-domainC-pnfName[7] + '-' +
+                                                   $param-prefix-domainC-pnfName[8]`" />
+                </set>
                 <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
                     <parameter name="logger" value="message-log" />
                     <parameter name="level" value="info" />
@@ -101,6 +167,7 @@
                     <!--<parameter name="field2" value="`$tmp.dst.domainB.pnf-name`"/>-->
                     <parameter name="field1" value="`$tmp.pce-src-node`"/>
                     <parameter name="field2" value="`$tmp.pce-dst-node`"/>
+                    <parameter name="field3" value="`$tmp.pce-dst-node-backup`"/>
                 </record>
                 <record plugin="org.onap.ccsdk.sli.core.sli.recording.Slf4jRecorder">
                     <parameter name="logger" value="message-log" />
@@ -117,25 +184,49 @@
                     <!--                                                   1 + '-' +-->
                     <!--                                                   $param-prefix-domainA-pnfName[7] + '-' +-->
                     <!--                                                   $param-prefix-domainA-pnfName[8]`" />-->
-                    <parameter name='filenamemm' value="`$tmp.pce-src-node + $tmp.pce-dst-node`" />
+                    <parameter name='filenamemm' value="`$tmp.pce-src-node + $tmp.pce-dst-node + $tmp.pce-dst-node-backup`" />
                 </set>
-                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliTopologyUtils' method='computePath' >
-                    <parameter name="pnfs-pfx" value='ccsdkTopopnfs'/>
-                    <parameter name="links-pfx" value="ccsdkTopologicalLinks"/>
-                    <parameter name="response-pfx" value="otn-oof"/>
-                    <parameter name="output-end-to-end-path" value="false"/>
-                    <!--<parameter name="src-node" value="`$tmp.src.domainA.pnf-name`"/>-->
-                    <!--<parameter name="dst-node" value="`$tmp.dst.domainB.pnf-name`"/>-->
-                    <parameter name="src-node" value="`$tmp.pce-src-node`"/>
-                    <parameter name="dst-node" value="`$tmp.pce-dst-node`"/>
-                    <outcome value='success'></outcome>
-                    <outcome value='Other'></outcome>
-                    <outcome value='not-found'></outcome>
-                </execute>
+                <switch test='`$hasSecondary`'>
+                    <outcome value='false'>
+                        <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliTopologyUtils' method='computePath' >
+                            <parameter name="pnfs-pfx" value='ccsdkTopopnfs'/>
+                            <parameter name="links-pfx" value="ccsdkTopologicalLinks"/>
+                            <parameter name="response-pfx" value="otn-oof"/>
+                            <parameter name="output-end-to-end-path" value="false"/>
+                            <!--<parameter name="src-node" value="`$tmp.src.domainA.pnf-name`"/>-->
+                            <!--<parameter name="dst-node" value="`$tmp.dst.domainB.pnf-name`"/>-->
+                            <parameter name="src-node" value="`$tmp.pce-src-node`"/>
+                            <parameter name="dst-node" value="`$tmp.pce-dst-node`"/>
+                            <outcome value='success'></outcome>
+                            <outcome value='Other'></outcome>
+                            <outcome value='not-found'></outcome>
+                        </execute>
+                    </outcome>
+                    <outcome value='true'>
+                        <block>
+                            <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliTopologyUtils' method='computePaths' >
+                                <parameter name="pnfs-pfx" value='ccsdkTopopnfs'/>
+                                <parameter name="links-pfx" value="ccsdkTopologicalLinks"/>
+                                <parameter name="response-pfx" value="otn-oof"/>
+                                <parameter name="output-end-to-end-path" value="false"/>
+                                <!--<parameter name="src-node" value="`$tmp.src.domainA.pnf-name`"/>-->
+                                <!--<parameter name="dst-node" value="`$tmp.dst.domainB.pnf-name`"/>-->
+                                <parameter name="src-node" value="`$tmp.pce-src-node`"/>
+                                <parameter name="dst-node" value="`$tmp.pce-dst-node`"/>
+                                <parameter name="dst-node-backup" value="`$tmp.pce-dst-node-backup`"/>
+                                <parameter name="require-backuppath" value="`$hasSecondary`"/>
+                                <outcome value='success'></outcome>
+                                <outcome value='Other'></outcome>
+                                <outcome value='not-found'></outcome>
+                            </execute>
+                        </block>
+                    </outcome>
+                </switch>
             </block>
             <set>
                 <parameter name='`tmp.otninfo.`' value='' />
                 <!--<parameter name='`tmp.otninfo_length`' value='0' />-->
+                <parameter name='`tmp.otninfoProtect.`' value='' />
             </set>
             <for index='vidx' start='0' end='`$otn-oof.solutions_length`' >
                 <block atomic="true">
@@ -435,6 +526,327 @@
                     </block>
                 </block>
             </for>
+            <switch test='`$hasSecondary`'>
+                <outcome value='true'>
+                    <block>
+                        <for index='vidx' start='0' end='`$otn-oof.secondarySolutions_length`' >
+                            <block atomic="true">
+                                <set>
+                                    <parameter name='otn-oof.link-name' value='' />
+                                    <!--<parameter name='tmp.aai.cross-link' value='' />-->
+                                    <parameter name='tmp.aai.cross-link.' value='' />
+                                    <!--<parameter name='tmp.aai.cross-link.link-role' value='' />-->
+                                    <parameter name='tmp.src-pnf-name' value='' />
+                                    <parameter name='tmp.cross-link.' value='' />
+                                    <parameter name='tmp.dst-pnf-name' value='' />
+                                    <parameter name='tmp.aai.src-tp.' value='' />
+                                    <parameter name='param-prefix-src-tp.' value='' />
+                                    <parameter name='tmp.aai.src-pnf.' value='' />
+                                    <parameter name='tmp.domain-A.network-id' value='' />
+                                    <parameter name='tmp.aai.src-network-resource.' value='' />
+                                    <parameter name='tmp.domain-A.ttp-id' value='' />
+                                    <parameter name='tmp.aai.src-ttp.' value='' />
+                                    <parameter name='tmp.aai.dst-tp.' value='' />
+                                    <parameter name='param-prefix-dst-tp.' value='' />
+                                    <parameter name='tmp.aai.dst-pnf.' value='' />
+                                    <parameter name='tmp.domain-C.network-id' value='' />
+                                    <parameter name='tmp.aai.dst-network-resource.' value='' />
+                                    <parameter name='tmp.domain-C.ttp-id' value='' />
+                                    <parameter name='tmp.aai.dst-ttp.' value='' />
+                                </set>
+                                <set>
+                                    <parameter name='otn-oof.link-name' value='`$otn-oof.secondarySolutions[$vidx].original_link`' />
+                                    <parameter name='otn-oof.start-node' value='`$otn-oof.secondarySolutions[$vidx].src_node`' />
+                                    <parameter name='otn-oof.end-node' value='`$otn-oof.secondarySolutions[$vidx].dst_node`' />
+                                </set>
+                                <set>
+                                    <parameter name='tmp.cross-link.src-ltpId' value="`$otn-oof.secondarySolutions[$vidx].src_pinterface`" />
+                                    <parameter name='tmp.src-pnf-name' value="`$otn-oof.secondarySolutions[$vidx].src_node`" />
+                                </set>
+                                <set>
+                                    <parameter name='tmp.cross-link.dst-ltpId' value="`$otn-oof.secondarySolutions[$vidx].dst_pinterface`" />
+                                    <parameter name='tmp.dst-pnf-name' value="`$otn-oof.secondarySolutions[$vidx].dst_node`" />
+                                </set>
+                                <block atomic="true">
+                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                  resource="p-interface"
+                                                  key="pnf.pnf-name = $tmp.src-pnf-name
+		    AND p-interface.interface-name = $tmp.cross-link.src-ltpId"
+                                                  pfx='tmp.aai.src-tp' local-only='false' >
+                                        <!--AND depth = '0'"-->
+                                        <outcome value='success'>
+                                            <block>
+                                                <for silentFailure='true' index='pintsidx' start='0' end='`$tmp.aai.src-tp.relationship-list.relationship_length`' >
+                                                    <switch test='`$tmp.aai.src-tp.relationship-list.relationship[$pintsidx].related-to`'>
+                                                        <outcome value='tunnel-termination-point'>
+                                                            <block atomic="true">
+                                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
+                                                                    <!--<parameter name="original_string" value='`$tmp.aai.src-tp`'/>-->
+                                                                    <parameter name="original_string" value='`$tmp.aai.src-tp.interface-name`'/>
+                                                                    <!--<parameter name="regex" value="[^-]+$"/>-->
+                                                                    <parameter name="regex" value="[-]+"/>
+                                                                    <parameter name="ctx_memory_result_key" value="param-prefix-src-tp"/>
+                                                                    <outcome value='success'>
+                                                                        <block atomic="true">
+                                                                            <set>
+                                                                                <parameter name='domain-A.ltpId' value='`$param-prefix-src-tp[$param-prefix-src-tp_length -1]`' />
+                                                                                <parameter name='`tmp.otninfoProtect[$vidx].dstPort.dst-ltp-id`' value="`$param-prefix-src-tp[$param-prefix-src-tp_length -1]`" />
+                                                                                <parameter name='`tmp.otninfoProtect_length`' value='`$vidx + 1`' />
+                                                                            </set>
+                                                                        </block>
+                                                                    </outcome>
+                                                                    <outcome value='failure'>
+                                                                        <return status='failure'>
+                                                                            <parameter name='error-code' value='' />
+                                                                            <parameter name='error-message' value="An error occured while splitting sna1_route" />
+                                                                        </return>
+                                                                    </outcome>
+                                                                </execute>
+                                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                              resource="pnf"
+                                                                              key="pnf.pnf-name = $tmp.src-pnf-name"
+                                                                              pfx='tmp.aai.src-pnf' local-only='false' >
+                                                                    <!--AND depth = '0'"-->
+                                                                    <outcome value='success'>
+                                                                        <block>
+                                                                            <set>
+                                                                                <parameter name='domain-A.node-id' value="`$tmp.aai.src-pnf.pnf-id`" />
+                                                                                <parameter name='domain-A.tpn' value='1' />
+                                                                                <parameter name='`tmp.otninfoProtect[$vidx].dstPort.dst-access-node-id`' value="`$tmp.aai.src-pnf.pnf-id`" />
+                                                                                <parameter name='`tmp.otninfoProtect_length`' value='`$vidx + 1`' />
+                                                                            </set>
+                                                                            <for silentFailure='true' index='pvidx' start='0' end='`$tmp.aai.src-pnf.relationship-list.relationship_length`' >
+                                                                                <switch test='`$tmp.aai.src-pnf.relationship-list.relationship[$pvidx].related-to`'>
+                                                                                    <outcome value='network-resource'>
+                                                                                        <block atomic="true">
+                                                                                            <set>
+                                                                                                <parameter name='tmp.domain-A.network-id' value="`$tmp.aai.src-pnf.relationship-list.relationship[$pvidx].relationship-data[0].relationship-value`" />
+                                                                                            </set>
+                                                                                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                          resource="network-resource"
+                                                                                                          key="network-resource.network-id = $tmp.domain-A.network-id
+		AND depth = '0'"
+                                                                                                          pfx='tmp.aai.src-network-resource' local-only='false' >
+                                                                                                <outcome value='success'>
+                                                                                                    <set>
+                                                                                                        <parameter name='domain-A.network-id' value="`$tmp.aai.src-network-resource.network-id`" />
+                                                                                                        <parameter name='domain-A.provider-id' value="`$tmp.aai.src-network-resource.provider-id`" />
+                                                                                                        <parameter name='domain-A.client-id' value="`$tmp.aai.src-network-resource.client-id`" />
+                                                                                                        <parameter name='domain-A.te-topo-id' value="`$tmp.aai.src-network-resource.te-topo-id`" />
+                                                                                                        <parameter name='domain-A.network-type' value="`$tmp.aai.src-network-resource.network-type`" />
+                                                                                                        <parameter name='`tmp.otninfoProtect[$vidx].dstPort.dst-access-network-id`' value="`$tmp.aai.src-network-resource.network-id`" />
+                                                                                                        <parameter name='`tmp.otninfoProtect[$vidx].dstPort.dst-access-provider-id`' value="`$tmp.aai.src-network-resource.provider-id`" />
+                                                                                                        <parameter name='`tmp.otninfoProtect[$vidx].dstPort.dst-access-client-id`' value="`$tmp.aai.src-network-resource.client-id`" />
+                                                                                                        <parameter name='`tmp.otninfoProtect[$vidx].dstPort.dst-access-topology-id`' value="`$tmp.aai.src-network-resource.te-topo-id`" />
+                                                                                                        <parameter name='`tmp.otninfoProtect[$vidx].dstPort.dst-access-network-type`' value="`$tmp.aai.src-network-resource.network-type`" />
+                                                                                                        <parameter name='`tmp.otninfoProtect`' value='`$vidx + 1`' />
+                                                                                                    </set>
+                                                                                                </outcome>
+                                                                                            </get-resource>
+                                                                                            <break/>
+                                                                                        </block>
+                                                                                    </outcome>
+                                                                                </switch>
+                                                                            </for>
+                                                                        </block>
+                                                                    </outcome>
+                                                                    <outcome value='not-found'>
+                                                                        <return status='failure'>
+                                                                            <parameter name='ack-final' value='Y'/>
+                                                                            <parameter name="error-code" value="500" />
+                                                                            <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                        </return>
+                                                                    </outcome>
+                                                                    <outcome value='Other'>
+                                                                        <return status='failure'>
+                                                                            <parameter name='ack-final' value='Y'/>
+                                                                            <parameter name="error-code" value="500" />
+                                                                            <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                        </return>
+                                                                    </outcome>
+                                                                </get-resource>
+                                                                <set>
+                                                                    <parameter name='tmp.domain-A.ttp-id' value="`$tmp.aai.src-tp.relationship-list.relationship[$pintsidx].relationship-data[0].relationship-value`" />
+                                                                </set>
+                                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                              resource="tunnel-termination-point"
+                                                                              key="tunnel-termination-point.ttp-id = $tmp.domain-A.ttp-id
+		AND depth = '0'"
+                                                                              pfx='tmp.aai.src-ttp' local-only='false' >
+                                                                    <outcome value='success'>
+                                                                        <block atomic="true">
+                                                                            <set>
+                                                                                <parameter name='domain-A.tunnel-tp-id' value="`$tmp.aai.src-ttp.tunnel-tp-id`" />
+                                                                                <parameter name='`tmp.otninfoProtect[$vidx].dstPort.dst-tunnel-tp-id`' value="`$tmp.aai.src-ttp.tunnel-tp-id`" />
+                                                                                <parameter name='`tmp.otninfoProtect_length`' value='`$vidx + 1`' />
+                                                                            </set>
+                                                                        </block>
+                                                                    </outcome>
+                                                                </get-resource>
+                                                                <break/>
+                                                            </block>
+                                                        </outcome>
+                                                    </switch>
+                                                </for>
+                                            </block>
+                                        </outcome>
+                                        <outcome value='not-found'>
+                                            <return status='failure'>
+                                                <parameter name='ack-final' value='Y'/>
+                                                <parameter name="error-code" value="500" />
+                                                <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                            </return>
+                                        </outcome>
+                                        <outcome value='Other'>
+                                            <return status='failure'>
+                                                <parameter name='ack-final' value='Y'/>
+                                                <parameter name="error-code" value="500" />
+                                                <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                            </return>
+                                        </outcome>
+                                    </get-resource>
+                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                  resource="p-interface"
+                                                  key="pnf.pnf-name = $tmp.dst-pnf-name
+		    AND p-interface.interface-name = $tmp.cross-link.dst-ltpId"
+                                                  pfx='tmp.aai.dst-tp' local-only='false' >
+                                        <!--AND depth = '0'"-->
+                                        <outcome value='success'>
+                                            <block>
+                                                <for silentFailure='true' index='pintdidx' start='0' end='`$tmp.aai.dst-tp.relationship-list.relationship_length`' >
+                                                    <switch test='`$tmp.aai.dst-tp.relationship-list.relationship[$pintdidx].related-to`'>
+                                                        <outcome value='tunnel-termination-point'>
+                                                            <block atomic="true">
+                                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
+                                                                    <parameter name="original_string" value='`$tmp.aai.dst-tp`'/>
+                                                                    <!--<parameter name="regex" value="[^-]+$"/>-->
+                                                                    <parameter name="regex" value="[-]+"/>
+                                                                    <parameter name="ctx_memory_result_key" value="param-prefix-dst-tp"/>
+                                                                    <outcome value='success'>
+                                                                        <block atomic="true">
+                                                                            <set>
+                                                                                <parameter name='domain-C.ltpId' value='`$param-prefix-dst-tp[$param-prefix-dst-tp_length -1]`' />
+                                                                                <parameter name='`tmp.otninfoProtect[$vidx + 1].srcPort.src-ltp-id`' value="`$param-prefix-dst-tp[$param-prefix-dst-tp_length -1]`" />
+                                                                                <parameter name='`tmp.otninfoProtect_length`' value='`$vidx + 2`' />
+                                                                            </set>
+                                                                        </block>
+                                                                    </outcome>
+                                                                    <outcome value='failure'>
+                                                                        <return status='failure'>
+                                                                            <parameter name='error-code' value='' />
+                                                                            <parameter name='error-message' value="An error occured while splitting sna1_route" />
+                                                                        </return>
+                                                                    </outcome>
+                                                                </execute>
+                                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                              resource="pnf"
+                                                                              key="pnf.pnf-name = $tmp.dst-pnf-name"
+                                                                              pfx='tmp.aai.dst-pnf' local-only='false' >
+                                                                    <!--AND depth = '0'"-->
+                                                                    <outcome value='success'>
+                                                                        <block>
+                                                                            <set>
+                                                                                <parameter name='domain-C.node-id' value="`$tmp.aai.dst-pnf.pnf-id`" />
+                                                                                <parameter name='domain-C.tpn' value='1' />
+                                                                                <parameter name='`tmp.otninfoProtect[$vidx + 1].srcPort.src-access-node-id`' value="`$tmp.aai.dst-pnf.pnf-id`" />
+                                                                                <parameter name='`tmp.otninfoProtect_length`' value='`$vidx + 2`' />
+                                                                            </set>
+                                                                            <for silentFailure='true' index='mvidx' start='0' end='`$tmp.aai.dst-pnf.relationship-list.relationship_length`' >
+                                                                                <switch test='`$tmp.aai.dst-pnf.relationship-list.relationship[$mvidx].related-to`'>
+                                                                                    <outcome value='network-resource'>
+                                                                                        <block atomic="true">
+                                                                                            <set>
+                                                                                                <parameter name='tmp.domain-C.network-id' value="`$tmp.aai.dst-pnf.relationship-list.relationship[$mvidx].relationship-data[0].relationship-value`" />
+                                                                                            </set>
+                                                                                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                          resource="network-resource"
+                                                                                                          key="network-resource.network-id = $tmp.domain-C.network-id
+		AND depth = '0'"
+                                                                                                          pfx='tmp.aai.dst-network-resource' local-only='false' >
+                                                                                                <outcome value='success'>
+                                                                                                    <set>
+                                                                                                        <parameter name='domain-C.network-id' value="`$tmp.aai.dst-network-resource.network-id`" />
+                                                                                                        <parameter name='domain-C.provider-id' value="`$tmp.aai.dst-network-resource.provider-id`" />
+                                                                                                        <parameter name='domain-C.client-id' value="`$tmp.aai.dst-network-resource.client-id`" />
+                                                                                                        <parameter name='domain-C.te-topo-id' value="`$tmp.aai.dst-network-resource.te-topo-id`" />
+                                                                                                        <parameter name='domain-C.network-type' value="`$tmp.aai.dst-network-resource.network-type`" />
+                                                                                                        <parameter name='`tmp.otninfoProtect[$vidx + 1].srcPort.src-access-network-id`' value="`$tmp.aai.dst-network-resource.network-id`" />
+                                                                                                        <parameter name='`tmp.otninfoProtect[$vidx + 1].srcPort.src-access-provider-id`' value="`$tmp.aai.dst-network-resource.provider-id`" />
+                                                                                                        <parameter name='`tmp.otninfoProtect[$vidx + 1].srcPort.src-access-client-id`' value="`$tmp.aai.dst-network-resource.client-id`" />
+                                                                                                        <parameter name='`tmp.otninfoProtect[$vidx + 1].srcPort.src-access-topology-id`' value="`$tmp.aai.dst-network-resource.te-topo-id`" />
+                                                                                                        <parameter name='`tmp.otninfoProtect[$vidx + 1].srcPort.src-access-network-type`' value="`$tmp.aai.dst-network-resource.network-type`" />
+                                                                                                        <parameter name='`tmp.otninfoProtect`' value='`$vidx + 2`' />
+                                                                                                    </set>
+                                                                                                </outcome>
+                                                                                            </get-resource>
+                                                                                            <break/>
+                                                                                        </block>
+                                                                                    </outcome>
+                                                                                </switch>
+                                                                            </for>
+                                                                        </block>
+                                                                    </outcome>
+                                                                    <outcome value='not-found'>
+                                                                        <return status='failure'>
+                                                                            <parameter name='ack-final' value='Y'/>
+                                                                            <parameter name="error-code" value="500" />
+                                                                            <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                        </return>
+                                                                    </outcome>
+                                                                    <outcome value='Other'>
+                                                                        <return status='failure'>
+                                                                            <parameter name='ack-final' value='Y'/>
+                                                                            <parameter name="error-code" value="500" />
+                                                                            <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                        </return>
+                                                                    </outcome>
+                                                                </get-resource>
+                                                                <set>
+                                                                    <parameter name='tmp.domain-C.ttp-id' value="`$tmp.aai.dst-tp.relationship-list.relationship[$pintdidx].relationship-data[0].relationship-value`" />
+                                                                </set>
+                                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                              resource="tunnel-termination-point"
+                                                                              key="tunnel-termination-point.ttp-id = $tmp.domain-C.ttp-id
+		AND depth = '0'"
+                                                                              pfx='tmp.aai.dst-ttp' local-only='false' >
+                                                                    <outcome value='success'>
+                                                                        <block atomic="true">
+                                                                            <set>
+                                                                                <parameter name='domain-C.tunnel-tp-id' value="`$tmp.aai.dst-ttp.tunnel-tp-id`" />
+                                                                                <parameter name='`tmp.otninfoProtect[$vidx + 1].srcPort.src-tunnel-tp-id`' value="`$tmp.aai.dst-ttp.tunnel-tp-id`" />
+                                                                                <parameter name='`tmp.otninfoProtect_length`' value='`$vidx + 2`' />
+                                                                            </set>
+                                                                        </block>
+                                                                    </outcome>
+                                                                </get-resource>
+                                                                <break/>
+                                                            </block>
+                                                        </outcome>
+                                                    </switch>
+                                                </for>
+                                            </block>
+                                        </outcome>
+                                        <outcome value='not-found'>
+                                            <return status='failure'>
+                                                <parameter name='ack-final' value='Y'/>
+                                                <parameter name="error-code" value="500" />
+                                                <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                            </return>
+                                        </outcome>
+                                        <outcome value='Other'>
+                                            <return status='failure'>
+                                                <parameter name='ack-final' value='Y'/>
+                                                <parameter name="error-code" value="500" />
+                                                <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                            </return>
+                                        </outcome>
+                                    </get-resource>
+                                </block>
+                            </block>
+                        </for>
+                    </block>
+                </outcome>
+            </switch>
         </block>
     </method>
 </service-logic>
\ No newline at end of file
-- 
cgit 1.2.3-korg