From dfd2ca0b01409de98d89b36abdc82bd08cf474ca Mon Sep 17 00:00:00 2001
From: Hesam Rahimi <hesam.rahimi@huawei.com>
Date: Tue, 21 Sep 2021 23:21:08 -0400
Subject: Buf fixing for creation, deletion, and modification of a cloud
 leased-line (CLL) service.

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

Former-commit-id: 0fab18d499c857b08812b099d9e0d88a93102247
---
 ...cll-vnf-topology-operation-cll-F1-Activate.json |  2687 +++--
 ...URCE-API_cll-vnf-topology-operation-cll-F1.json |  1206 --
 ...ll-vnf-topology-operation-cll-create-clean.json | 10889 ++++++++++---------
 ...-API_cll-vnf-topology-operation-cll-delete.json |    36 +-
 ...pology-operation-cll-helper-find-ROOT-conn.json |   257 +-
 ...-API_cll-vnf-topology-operation-cll-modify.json |  9262 +++++++++++++---
 ..._cll-vnf-topology-operation-cll-F1-Activate.xml |  1065 +-
 ...cll-vnf-topology-operation-cll-create-clean.xml |   254 +-
 ...E-API_cll-vnf-topology-operation-cll-delete.xml |   368 +-
 ...opology-operation-cll-helper-find-ROOT-conn.xml |    26 +-
 ...E-API_cll-vnf-topology-operation-cll-modify.xml |  1727 ++-
 11 files changed, 17662 insertions(+), 10115 deletions(-)

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

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 81e0415a..795a7416 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,223 +1,223 @@
 [
     {
-        "id": "ee012476.423b98",
+        "id": "2395bbe0.4b8ec4",
         "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": 339,
-        "y": 363,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 361,
+        "y": 348,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "2b361ed4.488d22",
-                "8a293b14.096a28",
-                "e711b658.aa0458"
+                "7a4b4c32.339f0c",
+                "476b558f.0cf4e4",
+                "c5f863d4.faa76"
             ]
         ]
     },
     {
-        "id": "2b361ed4.488d22",
+        "id": "7a4b4c32.339f0c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 527,
-        "y": 376,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 549,
+        "y": 361,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "d45a4635.eb8678"
+                "477b4d49.40f0ec"
             ]
         ]
     },
     {
-        "id": "8a293b14.096a28",
+        "id": "476b558f.0cf4e4",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 527.490966796875,
-        "y": 421.57403564453125,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 549.490966796875,
+        "y": 406.57403564453125,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "abb54833.f0129"
+                "9391f816.87a258"
             ]
         ]
     },
     {
-        "id": "e711b658.aa0458",
+        "id": "c5f863d4.faa76",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 525,
-        "y": 465,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 547,
+        "y": 450,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "f29b4663.f669b"
+                "7e716c79.c4ee54"
             ]
         ]
     },
     {
-        "id": "d45a4635.eb8678",
+        "id": "477b4d49.40f0ec",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 700,
-        "y": 374,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 722,
+        "y": 359,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "f31c0d53.86d7f8"
+                "de48ad25.e4a568"
             ]
         ]
     },
     {
-        "id": "abb54833.f0129",
+        "id": "9391f816.87a258",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 690.0623779296875,
-        "y": 421.8597717285156,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 712.0623779296875,
+        "y": 406.8597717285156,
+        "z": "ed7c1675.7a56b",
         "wires": []
     },
     {
-        "id": "f29b4663.f669b",
+        "id": "7e716c79.c4ee54",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 692,
-        "y": 464,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 714,
+        "y": 449,
+        "z": "ed7c1675.7a56b",
         "wires": []
     },
     {
-        "id": "f31c0d53.86d7f8",
+        "id": "de48ad25.e4a568",
         "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": 929,
-        "y": 375,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 951,
+        "y": 360,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "b49d17ad.574c7"
+                "1fd8993c.e83297"
             ]
         ]
     },
     {
-        "id": "b49d17ad.574c7",
+        "id": "1fd8993c.e83297",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1144,
-        "y": 376,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 1166,
+        "y": 361,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "59104900.730b5"
+                "33755ee2.127952"
             ]
         ]
     },
     {
-        "id": "59104900.730b5",
+        "id": "edb565df.2fd588",
         "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": 1388,
-        "y": 375,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 1420,
+        "y": 283,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "a081cc3f.ed90c8",
-                "c86127b7.79d09"
+                "d9f77b89.2576a8",
+                "d1a41641.7e8658"
             ]
         ]
     },
     {
-        "id": "a081cc3f.ed90c8",
+        "id": "d9f77b89.2576a8",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1605,
-        "y": 354,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 1637,
+        "y": 262,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "99d2c91.f0beeb8"
+                "33755ee2.127952"
             ]
         ]
     },
     {
-        "id": "c86127b7.79d09",
+        "id": "d1a41641.7e8658",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1605,
-        "y": 403,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 1637,
+        "y": 311,
+        "z": "ed7c1675.7a56b",
         "wires": [
             []
         ]
     },
     {
-        "id": "99d2c91.f0beeb8",
+        "id": "33755ee2.127952",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1799,
-        "y": 363,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 1821,
+        "y": 348,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "1cc75cf0.e01a9b",
-                "171d3657.f2327a",
-                "e9e324cf.d34fa8"
+                "9647ef19.c8c25",
+                "b3842f71.731b38",
+                "ca01ca51.23bb98"
             ]
         ]
     },
     {
-        "id": "63d9b9e3.c39a3",
+        "id": "48081245.456c3c",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 158,
-        "y": 104,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 180,
+        "y": 89,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "13826703.6fe8f9"
+                "226f6982.562f5e"
             ]
         ]
     },
     {
-        "id": "13826703.6fe8f9",
+        "id": "226f6982.562f5e",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -225,3221 +225,3560 @@
         "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": 442.2856903076172,
-        "y": 165.23810863494873,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 464.2856903076172,
+        "y": 150.23810863494873,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "a18ada65.df1b6"
+                "f533e2ec.f849f"
             ]
         ]
     },
     {
-        "id": "a18ada65.df1b6",
+        "id": "f533e2ec.f849f",
         "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": 448.42860412597656,
-        "y": 250.00003051757812,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 470.42860412597656,
+        "y": 235.00003051757812,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "e68623b.1ed71e"
+                "15848be5.af4ba4"
             ]
         ]
     },
     {
-        "id": "e68623b.1ed71e",
+        "id": "15848be5.af4ba4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 758.238037109375,
-        "y": 241.66668701171875,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 780.238037109375,
+        "y": 226.66668701171875,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "ee012476.423b98",
-                "1d423866.3abba8",
-                "63268214.354d14",
-                "2b86835c.8d9024",
-                "5a6a7d0e.a2f89c"
+                "2395bbe0.4b8ec4",
+                "5c62cbf5.952894",
+                "4957906b.cb3908",
+                "25a3d5e5.55ea62",
+                "624a734b.81957c"
             ]
         ]
     },
     {
-        "id": "1cc75cf0.e01a9b",
+        "id": "9647ef19.c8c25",
         "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": 2016,
-        "y": 301,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 2038,
+        "y": 286,
+        "z": "ed7c1675.7a56b",
         "wires": []
     },
     {
-        "id": "acb2a33f.d7ec9",
+        "id": "927e2807.47e1",
         "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": 4185,
-        "y": 187,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 4207,
+        "y": 172,
+        "z": "ed7c1675.7a56b",
         "wires": []
     },
     {
-        "id": "1a2b69e5.bdb2ae",
+        "id": "71f8cbde.7b70ec",
         "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": 4266,
-        "y": 502,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 4288,
+        "y": 487,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "c13bac2.6ce225",
-                "54c65da.56603a4"
+                "dca0592f.f2f0f8",
+                "7abf945b.d3630c"
             ]
         ]
     },
     {
-        "id": "c13bac2.6ce225",
+        "id": "dca0592f.f2f0f8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4575.5,
-        "y": 471,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 4597.5,
+        "y": 456,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "9c791a1e.520a28"
+                "4d6d008.1dd328"
             ]
         ]
     },
     {
-        "id": "54c65da.56603a4",
+        "id": "7abf945b.d3630c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4580.5,
-        "y": 536,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 4602.5,
+        "y": 521,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "b016fce4.beba"
+                "6ddc3bc2.826894"
             ]
         ]
     },
     {
-        "id": "9c791a1e.520a28",
+        "id": "4d6d008.1dd328",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 4751.5,
-        "y": 471,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 4773.5,
+        "y": 456,
+        "z": "ed7c1675.7a56b",
         "wires": []
     },
     {
-        "id": "b016fce4.beba",
+        "id": "6ddc3bc2.826894",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4747,
-        "y": 536,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 4769,
+        "y": 521,
+        "z": "ed7c1675.7a56b",
         "wires": [
             []
         ]
     },
     {
-        "id": "2227e8a2.0665b8",
+        "id": "639d74a6.1d8f04",
         "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": 4130.5,
-        "y": 756,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 4152.5,
+        "y": 741,
+        "z": "ed7c1675.7a56b",
         "wires": []
     },
     {
-        "id": "f70fce2d.7485",
+        "id": "d9456183.6b2d68",
         "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": 4284.5,
-        "y": 804,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 4306.5,
+        "y": 789,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "8ffe5287.d9d0e8",
-                "5f6b3e31.55961"
+                "3efbdf9b.54682",
+                "243cc169.72316e"
             ]
         ]
     },
     {
-        "id": "8ffe5287.d9d0e8",
+        "id": "3efbdf9b.54682",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4630,
-        "y": 785,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 4652,
+        "y": 770,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "8c837eb9.336b9"
+                "ba970949.4ab53"
             ]
         ]
     },
     {
-        "id": "5f6b3e31.55961",
+        "id": "243cc169.72316e",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4634,
-        "y": 825,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 4656,
+        "y": 810,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "575c5f0f.3503d8"
+                "4891a43f.02e58c"
             ]
         ]
     },
     {
-        "id": "8c837eb9.336b9",
+        "id": "ba970949.4ab53",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 4788,
-        "y": 785,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 4810,
+        "y": 770,
+        "z": "ed7c1675.7a56b",
         "wires": []
     },
     {
-        "id": "575c5f0f.3503d8",
+        "id": "4891a43f.02e58c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4791.5,
-        "y": 825,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 4813.5,
+        "y": 810,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "25e6aa4e.9a9cde",
-                "1cebed54.09e3f3"
+                "388beb56.7c7234",
+                "eb334e0f.b54c3"
             ]
         ]
     },
     {
-        "id": "25e6aa4e.9a9cde",
+        "id": "388beb56.7c7234",
         "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": 5122,
-        "y": 790,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 5144,
+        "y": 775,
+        "z": "ed7c1675.7a56b",
         "wires": [
             []
         ]
     },
     {
-        "id": "57cb404e.88a3a8",
+        "id": "d196af8c.f36ae8",
         "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": 4986,
-        "y": 749,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 5008,
+        "y": 734,
+        "z": "ed7c1675.7a56b",
         "wires": []
     },
     {
-        "id": "1cebed54.09e3f3",
+        "id": "eb334e0f.b54c3",
         "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": 5049,
-        "y": 836,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 5071,
+        "y": 821,
+        "z": "ed7c1675.7a56b",
         "wires": [
             []
         ]
     },
     {
-        "id": "adcc0fc7.59b628",
+        "id": "51361643.15e97",
         "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": 4123,
-        "y": 235,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 4145,
+        "y": 220,
+        "z": "ed7c1675.7a56b",
         "wires": []
     },
     {
-        "id": "36f9f62e.004372",
+        "id": "7074e291.428a74",
         "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": 4149,
-        "y": 352,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 4171,
+        "y": 337,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "37680b24.ccfd7c",
-                "da1cdd66.16c98",
-                "923405db.542c"
+                "fd9f25cd.b6ab9",
+                "13f82e43.b47822",
+                "a1ba843c.92fa78"
             ]
         ]
     },
     {
-        "id": "37680b24.ccfd7c",
+        "id": "fd9f25cd.b6ab9",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4344.5001220703125,
-        "y": 304,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 4366.5001220703125,
+        "y": 289,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "3021ee1b.904b12"
+                "10d11922.59185f"
             ]
         ]
     },
     {
-        "id": "da1cdd66.16c98",
+        "id": "13f82e43.b47822",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4336.5001220703125,
-        "y": 359,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 4358.5001220703125,
+        "y": 344,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "12605fae.863058"
+                "19650434.8dad4c"
             ]
         ]
     },
     {
-        "id": "3021ee1b.904b12",
+        "id": "10d11922.59185f",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4488.8824462890625,
-        "y": 303.6556701660156,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 4510.8824462890625,
+        "y": 288.6556701660156,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "dd5c14b5.d1837"
+                "777ae9c7.6a278"
             ]
         ]
     },
     {
-        "id": "67c4003.ef8f28",
+        "id": "391ce87d.ba3df8",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5071,
-        "y": 306,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 5093,
+        "y": 291,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "108d04fa.bf4053"
+                "65b820ac.17e0d"
             ]
         ]
     },
     {
-        "id": "dd5c14b5.d1837",
+        "id": "777ae9c7.6a278",
         "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": 4673,
-        "y": 302,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 4695,
+        "y": 287,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "d5f86c5d.16c4"
+                "f4f1a808.b22bc"
             ]
         ]
     },
     {
-        "id": "d5f86c5d.16c4",
+        "id": "f4f1a808.b22bc",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4868,
-        "y": 302,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 4890,
+        "y": 287,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "67c4003.ef8f28"
+                "391ce87d.ba3df8"
             ]
         ]
     },
     {
-        "id": "923405db.542c",
+        "id": "a1ba843c.92fa78",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4341.5001220703125,
-        "y": 416,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 4363.5001220703125,
+        "y": 401,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "b180d8b0.c43f88"
+                "a6d9e4b5.ea0fd8"
             ]
         ]
     },
     {
-        "id": "b180d8b0.c43f88",
+        "id": "a6d9e4b5.ea0fd8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 4493.5001220703125,
-        "y": 417,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 4515.5001220703125,
+        "y": 402,
+        "z": "ed7c1675.7a56b",
         "wires": []
     },
     {
-        "id": "12605fae.863058",
+        "id": "19650434.8dad4c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 4504.5001220703125,
-        "y": 360,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 4526.5001220703125,
+        "y": 345,
+        "z": "ed7c1675.7a56b",
         "wires": []
     },
     {
-        "id": "f9899c24.7b705",
+        "id": "5d042a1f.c8fb44",
         "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": 5456,
-        "y": 319,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 5478,
+        "y": 304,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "d378bd87.63a5c8",
-                "5261c81e.fbb5b8",
-                "634ff531.a525f4"
+                "8c0f87c1.0cfa88",
+                "96b96977.b4fed8",
+                "6ce026da.737ea"
             ]
         ]
     },
     {
-        "id": "108d04fa.bf4053",
+        "id": "65b820ac.17e0d",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5250,
-        "y": 306,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 5272,
+        "y": 291,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "20f95b42.b2257c",
-                "f9899c24.7b705"
+                "1918c44c.117ae4",
+                "5d042a1f.c8fb44"
             ]
         ]
     },
     {
-        "id": "20f95b42.b2257c",
+        "id": "1918c44c.117ae4",
         "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": 5486,
-        "y": 267,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 5508,
+        "y": 252,
+        "z": "ed7c1675.7a56b",
         "wires": []
     },
     {
-        "id": "d378bd87.63a5c8",
+        "id": "8c0f87c1.0cfa88",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5666,
-        "y": 310,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 5688,
+        "y": 295,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "1cbdaba0.674dd4"
+                "e1aae278.d9aab"
             ]
         ]
     },
     {
-        "id": "5261c81e.fbb5b8",
+        "id": "96b96977.b4fed8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5658,
-        "y": 365,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 5680,
+        "y": 350,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "66b4dbad.a4949c"
+                "a74826f7.daef6"
             ]
         ]
     },
     {
-        "id": "634ff531.a525f4",
+        "id": "6ce026da.737ea",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5663,
-        "y": 422,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 5685,
+        "y": 407,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "21f2fdd8.0e601a"
+                "80c7718d.f0881"
             ]
         ]
     },
     {
-        "id": "21f2fdd8.0e601a",
+        "id": "80c7718d.f0881",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 5815,
-        "y": 423,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 5837,
+        "y": 408,
+        "z": "ed7c1675.7a56b",
         "wires": []
     },
     {
-        "id": "66b4dbad.a4949c",
+        "id": "a74826f7.daef6",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 5826,
-        "y": 368,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 5848,
+        "y": 353,
+        "z": "ed7c1675.7a56b",
         "wires": []
     },
     {
-        "id": "1cbdaba0.674dd4",
+        "id": "e1aae278.d9aab",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5810.38232421875,
-        "y": 307.6556701660156,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 5832.38232421875,
+        "y": 292.6556701660156,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "ebf10644.3cf328"
+                "b6fb5857.56d2c"
             ]
         ]
     },
     {
-        "id": "ebf10644.3cf328",
+        "id": "b6fb5857.56d2c",
         "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": 6025,
-        "y": 304,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 6047,
+        "y": 289,
+        "z": "ed7c1675.7a56b",
         "wires": []
     },
     {
-        "id": "204badf8.a5ba12",
+        "id": "881ac3d.2b73cc",
         "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": 3592,
-        "y": 1644,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 3614,
+        "y": 1629,
+        "z": "ed7c1675.7a56b",
         "wires": []
     },
     {
-        "id": "4d3bca29.9af50c",
+        "id": "f942fe34.857118",
         "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": 3655,
-        "y": 1973,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 3677,
+        "y": 1958,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "30186c33.4929f4",
-                "868e39af.adebc8"
+                "d6aba815.0c0b98",
+                "fb15fc4f.27732"
             ]
         ]
     },
     {
-        "id": "30186c33.4929f4",
+        "id": "d6aba815.0c0b98",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3950.5,
-        "y": 1940,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 3972.5,
+        "y": 1925,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "2aae4501.2c69e2"
+                "f7e9b7f6.cb6cf8"
             ]
         ]
     },
     {
-        "id": "868e39af.adebc8",
+        "id": "fb15fc4f.27732",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3955.5,
-        "y": 2005,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 3977.5,
+        "y": 1990,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "7501d4e8.c8d944"
+                "e7e93f9f.05e6f8"
             ]
         ]
     },
     {
-        "id": "2aae4501.2c69e2",
+        "id": "f7e9b7f6.cb6cf8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 4118.5,
-        "y": 1940,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 4140.5,
+        "y": 1925,
+        "z": "ed7c1675.7a56b",
         "wires": []
     },
     {
-        "id": "7501d4e8.c8d944",
+        "id": "e7e93f9f.05e6f8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4129,
-        "y": 2005,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 4151,
+        "y": 1990,
+        "z": "ed7c1675.7a56b",
         "wires": [
             []
         ]
     },
     {
-        "id": "cc294dbc.f351c",
+        "id": "c6f7c9bc.a78ea8",
         "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": 3531,
-        "y": 1701,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 3553,
+        "y": 1686,
+        "z": "ed7c1675.7a56b",
         "wires": []
     },
     {
-        "id": "c8227bea.321b5",
+        "id": "8f243ad6.97dd38",
         "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": 3551,
-        "y": 1798,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 3573,
+        "y": 1783,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "9f19ba3f.539ea8",
-                "e4125ed0.f068f8",
-                "de95537a.826588"
+                "a8e6c84d.0f237",
+                "3ee8ddc2.b7378a",
+                "311698c.6883b68"
             ]
         ]
     },
     {
-        "id": "9f19ba3f.539ea8",
+        "id": "a8e6c84d.0f237",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3753.5001220703125,
-        "y": 1751,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 3775.5001220703125,
+        "y": 1736,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "e35cf2ca.728ed8"
+                "6ef9124f.c91bc4"
             ]
         ]
     },
     {
-        "id": "e4125ed0.f068f8",
+        "id": "3ee8ddc2.b7378a",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3745.5001220703125,
-        "y": 1806,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 3767.5001220703125,
+        "y": 1791,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "c80b6676.b0f198"
+                "9b01e4a.2bf7598"
             ]
         ]
     },
     {
-        "id": "e35cf2ca.728ed8",
+        "id": "6ef9124f.c91bc4",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3897.8824462890625,
-        "y": 1748.6556701660156,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 3919.8824462890625,
+        "y": 1733.6556701660156,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "57d9c9b8.81d7a8"
+                "8bd570a1.9b5908"
             ]
         ]
     },
     {
-        "id": "57d9c9b8.81d7a8",
+        "id": "8bd570a1.9b5908",
         "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": 4082,
-        "y": 1763,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 4104,
+        "y": 1748,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "2837eada.0816e6"
+                "5951fb7a.778dbc"
             ]
         ]
     },
     {
-        "id": "de95537a.826588",
+        "id": "311698c.6883b68",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3750.5001220703125,
-        "y": 1863,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 3772.5001220703125,
+        "y": 1848,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "6ac21b2f.35237c"
+                "25fe1469.5e13bc"
             ]
         ]
     },
     {
-        "id": "6ac21b2f.35237c",
+        "id": "25fe1469.5e13bc",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 3902.5001220703125,
-        "y": 1864,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 3924.5001220703125,
+        "y": 1849,
+        "z": "ed7c1675.7a56b",
         "wires": []
     },
     {
-        "id": "c80b6676.b0f198",
+        "id": "9b01e4a.2bf7598",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 3913.5001220703125,
-        "y": 1809,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 3935.5001220703125,
+        "y": 1794,
+        "z": "ed7c1675.7a56b",
         "wires": []
     },
     {
-        "id": "b2f2b82b.20ac9",
+        "id": "a9a3100d.7e9a38",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4480,
-        "y": 1767,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 4502,
+        "y": 1752,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "e8c4648e.2f16b8"
+                "15a6f6cf.b80121"
             ]
         ]
     },
     {
-        "id": "2837eada.0816e6",
+        "id": "5951fb7a.778dbc",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4277,
-        "y": 1763,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 4299,
+        "y": 1748,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "b2f2b82b.20ac9"
+                "a9a3100d.7e9a38"
             ]
         ]
     },
     {
-        "id": "7fa6120f.8bbc34",
+        "id": "b462757e.f97cf",
         "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": 4865,
-        "y": 1766,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 4887,
+        "y": 1751,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "2004b12.ed9d54e",
-                "ffd8f42d.6ff66",
-                "7412d147.be04a8"
+                "f548cd5f.cf97e8",
+                "7bf2c309.936484",
+                "37200156.6e45ae"
             ]
         ]
     },
     {
-        "id": "e8c4648e.2f16b8",
+        "id": "15a6f6cf.b80121",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4657,
-        "y": 1759,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 4679,
+        "y": 1744,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "619505d8.279204",
-                "7fa6120f.8bbc34"
+                "24625031.3ccbb",
+                "b462757e.f97cf"
             ]
         ]
     },
     {
-        "id": "619505d8.279204",
+        "id": "24625031.3ccbb",
         "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": 4895,
-        "y": 1714,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 4917,
+        "y": 1699,
+        "z": "ed7c1675.7a56b",
         "wires": []
     },
     {
-        "id": "407265d3.d9387c",
+        "id": "3717e4c0.7e91fc",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 5224,
-        "y": 1870,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 5246,
+        "y": 1855,
+        "z": "ed7c1675.7a56b",
         "wires": []
     },
     {
-        "id": "70bb8ce1.2b5a7c",
+        "id": "ebaf4cad.7f7ac",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 5235,
-        "y": 1815,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 5257,
+        "y": 1800,
+        "z": "ed7c1675.7a56b",
         "wires": []
     },
     {
-        "id": "474b0f12.6a5378",
+        "id": "95133e26.a5c4",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5219.38232421875,
-        "y": 1754.6556701660156,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 5241.38232421875,
+        "y": 1739.6556701660156,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "4664ee87.d9fd18"
+                "74fa69d9.12322"
             ]
         ]
     },
     {
-        "id": "4664ee87.d9fd18",
+        "id": "74fa69d9.12322",
         "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": 5434,
-        "y": 1751,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 5456,
+        "y": 1736,
+        "z": "ed7c1675.7a56b",
         "wires": []
     },
     {
-        "id": "2004b12.ed9d54e",
+        "id": "f548cd5f.cf97e8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5075,
-        "y": 1757,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 5097,
+        "y": 1742,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "474b0f12.6a5378"
+                "95133e26.a5c4"
             ]
         ]
     },
     {
-        "id": "ffd8f42d.6ff66",
+        "id": "7bf2c309.936484",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5067,
-        "y": 1812,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 5089,
+        "y": 1797,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "70bb8ce1.2b5a7c"
+                "ebaf4cad.7f7ac"
             ]
         ]
     },
     {
-        "id": "7412d147.be04a8",
+        "id": "37200156.6e45ae",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5072,
-        "y": 1869,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 5094,
+        "y": 1854,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "407265d3.d9387c"
+                "3717e4c0.7e91fc"
             ]
         ]
     },
     {
-        "id": "79f7771a.baa2f",
+        "id": "4573661e.19551",
         "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": 3106,
-        "y": 715,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 3128,
+        "y": 700,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "6b315a67.2be854",
-                "7ca64a28.96fff4"
+                "e3a931ba.d41978",
+                "cce98769.66d2f"
             ]
         ]
     },
     {
-        "id": "6b315a67.2be854",
+        "id": "e3a931ba.d41978",
         "type": "outcome",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3320,
-        "y": 752,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 3342,
+        "y": 737,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "e26333e1.9f2a38"
+                "83f7a2a0.47e4a"
             ]
         ]
     },
     {
-        "id": "7ca64a28.96fff4",
+        "id": "cce98769.66d2f",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3322,
-        "y": 690,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 3344,
+        "y": 675,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "89cb81b5.af1468"
+                "a3a1c771.fa4dc8"
             ]
         ]
     },
     {
-        "id": "e26333e1.9f2a38",
+        "id": "83f7a2a0.47e4a",
         "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": 2900,
-        "y": 1995,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 2922,
+        "y": 1980,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "5c3b586f.467af",
-                "6b4dbd17.81909c"
+                "b17cf12.c5b4e9",
+                "375f750c.523c3a"
             ]
         ]
     },
     {
-        "id": "5c3b586f.467af",
+        "id": "b17cf12.c5b4e9",
         "type": "outcome",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3153,
-        "y": 2029,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 3175,
+        "y": 2014,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "a3ab9951.4bdf08"
+                "b574ded7.ea26d"
             ]
         ]
     },
     {
-        "id": "6b4dbd17.81909c",
+        "id": "375f750c.523c3a",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3153,
-        "y": 1973,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 3175,
+        "y": 1958,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "29d8f363.c99594"
+                "3eeb971b.8e101"
             ]
         ]
     },
     {
-        "id": "a3ab9951.4bdf08",
+        "id": "b574ded7.ea26d",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3304,
-        "y": 2029,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 3326,
+        "y": 2014,
+        "z": "ed7c1675.7a56b",
         "wires": []
     },
     {
-        "id": "c7f2aefb.cead08",
+        "id": "27c7cf1.51adcb",
         "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": 4180,
-        "y": 127,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 4202,
+        "y": 112,
+        "z": "ed7c1675.7a56b",
         "wires": []
     },
     {
-        "id": "8d65460e.504db8",
+        "id": "e24e0a9e.a7db8",
         "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": 3588,
-        "y": 1586,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 3610,
+        "y": 1571,
+        "z": "ed7c1675.7a56b",
         "wires": []
     },
     {
-        "id": "3e2a76dd.233f7a",
+        "id": "6b14e6ca.05c05",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 3871,
-        "y": 384,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 3893,
+        "y": 369,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "c7f2aefb.cead08",
-                "acb2a33f.d7ec9",
-                "adcc0fc7.59b628",
-                "36f9f62e.004372",
-                "1a2b69e5.bdb2ae",
-                "7d01ae3.e59e8d",
-                "91a8f363.33b6d",
-                "8c296a00.ae82e8"
+                "27c7cf1.51adcb",
+                "927e2807.47e1",
+                "51361643.15e97",
+                "7074e291.428a74",
+                "71f8cbde.7b70ec",
+                "41c50446.37f104",
+                "e5881b35.2a2bf8",
+                "ceaa1f2c.697ad"
             ]
         ]
     },
     {
-        "id": "29d8f363.c99594",
+        "id": "3eeb971b.8e101",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3304,
-        "y": 1972,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 3326,
+        "y": 1957,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "8d65460e.504db8",
-                "204badf8.a5ba12",
-                "cc294dbc.f351c",
-                "c8227bea.321b5",
-                "4d3bca29.9af50c",
-                "605c7758.9853c8",
-                "d3fdc974.92df9",
-                "52902dc6.5c041c"
+                "e24e0a9e.a7db8",
+                "881ac3d.2b73cc",
+                "c6f7c9bc.a78ea8",
+                "8f243ad6.97dd38",
+                "f942fe34.857118",
+                "51d22e16.357968",
+                "8caebf31.dc028",
+                "6ccc1a6d.d89cd4"
             ]
         ]
     },
     {
-        "id": "59dac694.235a08",
+        "id": "f87bcfd0.50c8c",
         "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": 3542,
-        "y": 2271,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 3564,
+        "y": 2256,
+        "z": "ed7c1675.7a56b",
         "wires": []
     },
     {
-        "id": "704c6.41b9333ac",
+        "id": "ab6e58b.3c55528",
         "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": 3696,
-        "y": 2319,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 3718,
+        "y": 2304,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "5cc2fc76.782a54",
-                "be48f3e2.0fbf"
+                "eff9a19.776a7e",
+                "ddb717fb.d9a6d8"
             ]
         ]
     },
     {
-        "id": "5cc2fc76.782a54",
+        "id": "eff9a19.776a7e",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4041.5,
-        "y": 2300,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 4063.5,
+        "y": 2285,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "a76d95f1.d45e1"
+                "59a2ea1f.0d3f14"
             ]
         ]
     },
     {
-        "id": "be48f3e2.0fbf",
+        "id": "ddb717fb.d9a6d8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4045.5,
-        "y": 2340,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 4067.5,
+        "y": 2325,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "1991eff2.b8a15"
+                "81b55fda.fb8e98"
             ]
         ]
     },
     {
-        "id": "a76d95f1.d45e1",
+        "id": "59a2ea1f.0d3f14",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 4199.5,
-        "y": 2300,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 4221.5,
+        "y": 2285,
+        "z": "ed7c1675.7a56b",
         "wires": []
     },
     {
-        "id": "1991eff2.b8a15",
+        "id": "81b55fda.fb8e98",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4203,
-        "y": 2340,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 4225,
+        "y": 2325,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "69ca6e83.833b58",
-                "1ce7897f.5077ef"
+                "1bcc30a0.546397",
+                "1eaaa262.028326"
             ]
         ]
     },
     {
-        "id": "69ca6e83.833b58",
+        "id": "1bcc30a0.546397",
         "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": 4543,
-        "y": 2339,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 4565,
+        "y": 2324,
+        "z": "ed7c1675.7a56b",
         "wires": [
             []
         ]
     },
     {
-        "id": "47268bd4.d29394",
+        "id": "68a7db89.5a89fc",
         "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": 4401,
-        "y": 2297,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 4423,
+        "y": 2282,
+        "z": "ed7c1675.7a56b",
         "wires": []
     },
     {
-        "id": "1ce7897f.5077ef",
+        "id": "1eaaa262.028326",
         "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": 4472,
-        "y": 2388,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 4494,
+        "y": 2373,
+        "z": "ed7c1675.7a56b",
         "wires": [
             []
         ]
     },
     {
-        "id": "adf25f68.f6874",
+        "id": "71f36947.989c9",
         "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": 3097,
-        "y": 655,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 3119,
+        "y": 640,
+        "z": "ed7c1675.7a56b",
         "wires": []
     },
     {
-        "id": "5011571a.f2ffc8",
+        "id": "24508e5.8723172",
         "type": "comment",
         "name": "only dst ttp exists. No src",
         "info": "",
         "comments": "",
-        "x": 3692,
-        "y": 341,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 3714,
+        "y": 326,
+        "z": "ed7c1675.7a56b",
         "wires": []
     },
     {
-        "id": "69454f54.a632a",
+        "id": "f3eaab4d.9a827",
         "type": "comment",
         "name": "only src ttp exists. No dst",
         "info": "",
         "comments": "",
-        "x": 3249,
-        "y": 1919,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 3271,
+        "y": 1904,
+        "z": "ed7c1675.7a56b",
         "wires": []
     },
     {
-        "id": "89cb81b5.af1468",
+        "id": "a3a1c771.fa4dc8",
         "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": 3428,
-        "y": 503,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 3450,
+        "y": 488,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "89a2367.f810e48",
-                "76abc6c6.50ef4"
+                "6921df6d.0bad7",
+                "5859006e.3869c8"
             ]
         ]
     },
     {
-        "id": "76abc6c6.50ef4",
+        "id": "5859006e.3869c8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3670,
-        "y": 1092,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 3692,
+        "y": 1077,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "fdc63597.3712e"
+                "6a1db5bd.d7e224"
             ]
         ]
     },
     {
-        "id": "89a2367.f810e48",
+        "id": "6921df6d.0bad7",
         "type": "outcome",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3664,
-        "y": 383,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 3686,
+        "y": 368,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "3e2a76dd.233f7a"
+                "6b14e6ca.05c05"
             ]
         ]
     },
     {
-        "id": "fdc63597.3712e",
+        "id": "6a1db5bd.d7e224",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3828,
-        "y": 1091,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 3850,
+        "y": 1076,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "1793312b.927ef7",
-                "41401fda.2be158",
-                "9005ec38.4e5e88",
-                "dd0899e7.f82f08",
-                "ecd7f356.de7408",
-                "b3054d0f.9c60c"
+                "e8ac2c73.115cc",
+                "de077050.d3ab3",
+                "d36a1b80.8692c8",
+                "73f78d36.ab931c",
+                "8ec0e69e.0bdfb8",
+                "4004366.ff0b5c8"
             ]
         ]
     },
     {
-        "id": "41401fda.2be158",
+        "id": "de077050.d3ab3",
         "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": 4092,
-        "y": 974,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 4114,
+        "y": 959,
+        "z": "ed7c1675.7a56b",
         "wires": []
     },
     {
-        "id": "ecd7f356.de7408",
+        "id": "8ec0e69e.0bdfb8",
         "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": 4173,
-        "y": 1289,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 4195,
+        "y": 1274,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "e0518882.6fa588",
-                "87218147.0fa418"
+                "a8d20b89.8deb88",
+                "ebe8f709.819288"
             ]
         ]
     },
     {
-        "id": "e0518882.6fa588",
+        "id": "a8d20b89.8deb88",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4482.5,
-        "y": 1258,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 4504.5,
+        "y": 1243,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "57c63933.072c5"
+                "f56a0e73.901ac"
             ]
         ]
     },
     {
-        "id": "87218147.0fa418",
+        "id": "ebe8f709.819288",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4487.5,
-        "y": 1323,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 4509.5,
+        "y": 1308,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "7dd1782c.b2154"
+                "8bcbb353.d66038"
             ]
         ]
     },
     {
-        "id": "57c63933.072c5",
+        "id": "f56a0e73.901ac",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 4658.5,
-        "y": 1258,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 4680.5,
+        "y": 1243,
+        "z": "ed7c1675.7a56b",
         "wires": []
     },
     {
-        "id": "7dd1782c.b2154",
+        "id": "8bcbb353.d66038",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4654,
-        "y": 1323,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 4676,
+        "y": 1308,
+        "z": "ed7c1675.7a56b",
         "wires": [
             []
         ]
     },
     {
-        "id": "9005ec38.4e5e88",
+        "id": "d36a1b80.8692c8",
         "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": 4030,
-        "y": 1022,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 4052,
+        "y": 1007,
+        "z": "ed7c1675.7a56b",
         "wires": []
     },
     {
-        "id": "dd0899e7.f82f08",
+        "id": "73f78d36.ab931c",
         "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": 4056,
-        "y": 1139,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 4078,
+        "y": 1124,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "7a284ffa.3cc17",
-                "aa72c818.28213",
-                "f0ca75e3.4407d"
+                "e0243648.484bc",
+                "e14aa09.d5d416",
+                "5447b1d0.03a8b"
             ]
         ]
     },
     {
-        "id": "7a284ffa.3cc17",
+        "id": "e0243648.484bc",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4251.5001220703125,
-        "y": 1091,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 4273.5001220703125,
+        "y": 1076,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "25701aeb.93625e"
+                "94135ed.07ea02"
             ]
         ]
     },
     {
-        "id": "aa72c818.28213",
+        "id": "e14aa09.d5d416",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4243.5001220703125,
-        "y": 1146,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 4265.5001220703125,
+        "y": 1131,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "f502d128.6eafe8"
+                "1628394b.83cd8f"
             ]
         ]
     },
     {
-        "id": "25701aeb.93625e",
+        "id": "94135ed.07ea02",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4395.8824462890625,
-        "y": 1090.6556701660156,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 4417.8824462890625,
+        "y": 1075.6556701660156,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "86d32773.3465f8"
+                "fdedf72e.2dd36"
             ]
         ]
     },
     {
-        "id": "86d32773.3465f8",
+        "id": "fdedf72e.2dd36",
         "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": 4580,
-        "y": 1089,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 4602,
+        "y": 1074,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "e526c1c.efff3c"
+                "f99d2e19.85b668"
             ]
         ]
     },
     {
-        "id": "e526c1c.efff3c",
+        "id": "f99d2e19.85b668",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.domainG-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4775,
-        "y": 1089,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 4797,
+        "y": 1074,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "b3ad7614.48799"
+                "ff4cc7a8.15eb18"
             ]
         ]
     },
     {
-        "id": "f0ca75e3.4407d",
+        "id": "5447b1d0.03a8b",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4248.5001220703125,
-        "y": 1203,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 4270.5001220703125,
+        "y": 1188,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "f3b0b426.0ebd8"
+                "74603a77.be9d34"
             ]
         ]
     },
     {
-        "id": "f3b0b426.0ebd8",
+        "id": "74603a77.be9d34",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 4400.5001220703125,
-        "y": 1204,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 4422.5001220703125,
+        "y": 1189,
+        "z": "ed7c1675.7a56b",
         "wires": []
     },
     {
-        "id": "f502d128.6eafe8",
+        "id": "1628394b.83cd8f",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 4411.5001220703125,
-        "y": 1147,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 4433.5001220703125,
+        "y": 1132,
+        "z": "ed7c1675.7a56b",
         "wires": []
     },
     {
-        "id": "1793312b.927ef7",
+        "id": "e8ac2c73.115cc",
         "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": 4087,
-        "y": 914,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 4109,
+        "y": 899,
+        "z": "ed7c1675.7a56b",
         "wires": []
     },
     {
-        "id": "b3ad7614.48799",
+        "id": "ff4cc7a8.15eb18",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4978,
-        "y": 1093,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 5000,
+        "y": 1078,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "96db10e5.ea83"
+                "8469558b.e4d748"
             ]
         ]
     },
     {
-        "id": "306d874d.b412d8",
+        "id": "cf8a4c78.37fe58",
         "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": 5363,
-        "y": 1106,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 5385,
+        "y": 1091,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "c6eb6256.83f998",
-                "45038891.4f4538",
-                "daa4d789.597db8"
+                "44cef850.3e64a",
+                "9337c3a8.6f7408",
+                "6a44b1b.7cb45d"
             ]
         ]
     },
     {
-        "id": "96db10e5.ea83",
+        "id": "8469558b.e4d748",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5157,
-        "y": 1093,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 5179,
+        "y": 1078,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "d230885e.9519f8",
-                "306d874d.b412d8"
+                "82428162.54c128",
+                "cf8a4c78.37fe58"
             ]
         ]
     },
     {
-        "id": "d230885e.9519f8",
+        "id": "82428162.54c128",
         "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": 5393,
-        "y": 1054,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 5415,
+        "y": 1039,
+        "z": "ed7c1675.7a56b",
         "wires": []
     },
     {
-        "id": "c6eb6256.83f998",
+        "id": "44cef850.3e64a",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5573,
-        "y": 1097,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 5595,
+        "y": 1082,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "a3266db3.e5e668"
+                "ffb7eeb1.dda348"
             ]
         ]
     },
     {
-        "id": "45038891.4f4538",
+        "id": "9337c3a8.6f7408",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5565,
-        "y": 1152,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 5587,
+        "y": 1137,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "c1656fec.754d9"
+                "28235dd8.9620aa"
             ]
         ]
     },
     {
-        "id": "daa4d789.597db8",
+        "id": "6a44b1b.7cb45d",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5570,
-        "y": 1209,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 5592,
+        "y": 1194,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "e2730778.5b349"
+                "a95b4d04.8ebfb"
             ]
         ]
     },
     {
-        "id": "e2730778.5b349",
+        "id": "a95b4d04.8ebfb",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 5722,
-        "y": 1210,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 5744,
+        "y": 1195,
+        "z": "ed7c1675.7a56b",
         "wires": []
     },
     {
-        "id": "c1656fec.754d9",
+        "id": "28235dd8.9620aa",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 5733,
-        "y": 1155,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 5755,
+        "y": 1140,
+        "z": "ed7c1675.7a56b",
         "wires": []
     },
     {
-        "id": "a3266db3.e5e668",
+        "id": "ffb7eeb1.dda348",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5717.38232421875,
-        "y": 1094.6556701660156,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 5739.38232421875,
+        "y": 1079.6556701660156,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "eeffd7c6.a525f"
+                "eb1ea22e.dc12c"
             ]
         ]
     },
     {
-        "id": "eeffd7c6.a525f",
+        "id": "eb1ea22e.dc12c",
         "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": 5932,
-        "y": 1091,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 5954,
+        "y": 1076,
+        "z": "ed7c1675.7a56b",
         "wires": []
     },
     {
-        "id": "24ea3ba5.00c9cc",
+        "id": "47e1e7c7.6cadf",
         "type": "comment",
         "name": "both src and dst exist",
         "info": "",
         "comments": "",
-        "x": 3706,
-        "y": 1032,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 3728,
+        "y": 1017,
+        "z": "ed7c1675.7a56b",
         "wires": []
     },
     {
-        "id": "171d3657.f2327a",
+        "id": "b3842f71.731b38",
         "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": 2268,
-        "y": 759,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 2290,
+        "y": 744,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "76b248ab.29f1f8",
-                "a2a1c5ad.da7c28"
+                "fe4cd4cf.21da1",
+                "8d3265c3.ddab38"
             ]
         ]
     },
     {
-        "id": "a2a1c5ad.da7c28",
+        "id": "8d3265c3.ddab38",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2675,
-        "y": 777,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 2697,
+        "y": 762,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "4b53f5cd.6e4a64"
+                "418df61.fe2be08"
             ]
         ]
     },
     {
-        "id": "76b248ab.29f1f8",
+        "id": "fe4cd4cf.21da1",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2675,
-        "y": 722,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 2697,
+        "y": 707,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "ed700187.4c0438"
+                "8b0dea0b.e78e98"
             ]
         ]
     },
     {
-        "id": "ed700187.4c0438",
+        "id": "8b0dea0b.e78e98",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2831,
-        "y": 720,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 2853,
+        "y": 705,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "adf25f68.f6874",
-                "79f7771a.baa2f"
+                "71f36947.989c9",
+                "4573661e.19551"
             ]
         ]
     },
     {
-        "id": "4b53f5cd.6e4a64",
+        "id": "418df61.fe2be08",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2808,
-        "y": 778,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 2830,
+        "y": 763,
+        "z": "ed7c1675.7a56b",
         "wires": [
             []
         ]
     },
     {
-        "id": "1d423866.3abba8",
+        "id": "5c62cbf5.952894",
         "type": "set",
         "name": "unset tmp.aai.all-vpn-bindings",
         "xml": "<set>\n<parameter name='tmp.aai.all-vpn-bindings.' value=\"\" />\n",
         "comments": "",
-        "x": 985,
-        "y": 194,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 1007,
+        "y": 179,
+        "z": "ed7c1675.7a56b",
         "wires": []
     },
     {
-        "id": "b7ea63f5.b58c8",
+        "id": "a7fd19a0.011a5",
         "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": 4102,
-        "y": 612,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 4124,
+        "y": 597,
+        "z": "ed7c1675.7a56b",
         "wires": []
     },
     {
-        "id": "7d01ae3.e59e8d",
+        "id": "41c50446.37f104",
         "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": 4162,
-        "y": 651,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 4184,
+        "y": 636,
+        "z": "ed7c1675.7a56b",
         "wires": []
     },
     {
-        "id": "63268214.354d14",
+        "id": "4957906b.cb3908",
         "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": 978,
-        "y": 102,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 1000,
+        "y": 87,
+        "z": "ed7c1675.7a56b",
         "wires": []
     },
     {
-        "id": "ad2fff57.f164d",
+        "id": "5277b309.13aef4",
         "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": 3514,
-        "y": 2128,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 3536,
+        "y": 2113,
+        "z": "ed7c1675.7a56b",
         "wires": []
     },
     {
-        "id": "605c7758.9853c8",
+        "id": "51d22e16.357968",
         "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": 3570,
-        "y": 2177,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 3592,
+        "y": 2162,
+        "z": "ed7c1675.7a56b",
         "wires": []
     },
     {
-        "id": "45ce7d67.6029dc",
+        "id": "8191f581.e3e888",
         "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": 978,
-        "y": 141,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 1000,
+        "y": 126,
+        "z": "ed7c1675.7a56b",
         "wires": []
     },
     {
-        "id": "2b86835c.8d9024",
+        "id": "25a3d5e5.55ea62",
         "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": 1009,
-        "y": 242,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 1031,
+        "y": 227,
+        "z": "ed7c1675.7a56b",
         "wires": [
             []
         ]
     },
     {
-        "id": "5a6a7d0e.a2f89c",
+        "id": "624a734b.81957c",
         "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": 219,
-        "y": 717,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 241,
+        "y": 702,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "bd2f8dbe.e61408",
-                "cacc237e.394a4",
-                "f05100c1.a77fd8"
+                "2ff4bd45.763852",
+                "237ce68a.9b5a2a",
+                "86bae4d8.c51f3"
             ]
         ]
     },
     {
-        "id": "bd2f8dbe.e61408",
+        "id": "2ff4bd45.763852",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 438,
-        "y": 655,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 460,
+        "y": 640,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "64d16331.36ee54"
+                "2f347c57.a92144"
             ]
         ]
     },
     {
-        "id": "cacc237e.394a4",
+        "id": "237ce68a.9b5a2a",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 447.490966796875,
-        "y": 697.5740356445312,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 469.490966796875,
+        "y": 682.5740356445312,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "537fe800.387e68"
+                "196b18f9.87f4a7"
             ]
         ]
     },
     {
-        "id": "f05100c1.a77fd8",
+        "id": "86bae4d8.c51f3",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 436,
-        "y": 744,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 458,
+        "y": 729,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "4626cafb.2ab55c"
+                "d6f02bd7.9f988"
             ]
         ]
     },
     {
-        "id": "64d16331.36ee54",
+        "id": "2f347c57.a92144",
         "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": 635,
-        "y": 651,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 657,
+        "y": 636,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "f0f139f4.8e2a48"
+                "408bfafb.b2f244"
             ]
         ]
     },
     {
-        "id": "537fe800.387e68",
+        "id": "196b18f9.87f4a7",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 601.0623779296875,
-        "y": 700.8597717285156,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 623.0623779296875,
+        "y": 685.8597717285156,
+        "z": "ed7c1675.7a56b",
         "wires": []
     },
     {
-        "id": "4626cafb.2ab55c",
+        "id": "d6f02bd7.9f988",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 605,
-        "y": 745,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 627,
+        "y": 730,
+        "z": "ed7c1675.7a56b",
         "wires": []
     },
     {
-        "id": "f0f139f4.8e2a48",
+        "id": "408bfafb.b2f244",
         "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": 858.33349609375,
-        "y": 650.9999389648438,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 880.33349609375,
+        "y": 635.9999389648438,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "2762e6c2.94358a"
+                "7d8f8b2e.4aa30c"
             ]
         ]
     },
     {
-        "id": "2762e6c2.94358a",
+        "id": "7d8f8b2e.4aa30c",
         "type": "outcome",
         "name": "connectivity",
         "xml": "<outcome value='connectivity'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1059.0001335144043,
-        "y": 652.000020980835,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 1081.0001335144043,
+        "y": 637.000020980835,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "37a60584.767442"
+                "bd2be559.7e491"
             ]
         ]
     },
     {
-        "id": "37a60584.767442",
+        "id": "bd2be559.7e491",
         "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": 189,
-        "y": 914,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 211,
+        "y": 899,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "99239678.d76be8",
-                "87a24056.0cfc9",
-                "b29ec635.8a7db"
+                "97323d62.80248",
+                "afdba634.5389a8",
+                "c784d901.2500c8"
             ]
         ]
     },
     {
-        "id": "99239678.d76be8",
+        "id": "97323d62.80248",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 397,
-        "y": 878,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 419,
+        "y": 863,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "bb3094ff.e3cd78"
+                "dc950dad.bba8c8"
             ]
         ]
     },
     {
-        "id": "87a24056.0cfc9",
+        "id": "afdba634.5389a8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 397.490966796875,
-        "y": 923.5740356445312,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 419.490966796875,
+        "y": 908.5740356445312,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "816ef02e.772828"
+                "f09199a5.a037f"
             ]
         ]
     },
     {
-        "id": "b29ec635.8a7db",
+        "id": "c784d901.2500c8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 395,
-        "y": 967,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 417,
+        "y": 952,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "b9990c7b.83fc7"
+                "a903bba8.c7f45"
             ]
         ]
     },
     {
-        "id": "816ef02e.772828",
+        "id": "f09199a5.a037f",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 560.0623779296875,
-        "y": 923.8597717285156,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 582.0623779296875,
+        "y": 908.8597717285156,
+        "z": "ed7c1675.7a56b",
         "wires": []
     },
     {
-        "id": "b9990c7b.83fc7",
+        "id": "a903bba8.c7f45",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 564,
-        "y": 968,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 586,
+        "y": 953,
+        "z": "ed7c1675.7a56b",
         "wires": []
     },
     {
-        "id": "30524cd6.9ca834",
+        "id": "c4e5acdc.5eea4",
         "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": 534,
-        "y": 1474,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 558,
+        "y": 1447,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "b7324e21.fe4538"
+                "f2e2cc22.a529f"
             ]
         ]
     },
     {
-        "id": "b7324e21.fe4538",
+        "id": "f2e2cc22.a529f",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 739,
-        "y": 1474,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 761,
+        "y": 1459,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "fd6dca36.4f2ef"
+                "c09b72f6.aeae98"
             ]
         ]
     },
     {
-        "id": "fd6dca36.4f2ef",
+        "id": "c09b72f6.aeae98",
         "type": "outcome",
         "name": "UNI",
         "xml": "<outcome value='uni'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 905,
-        "y": 1471,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 927,
+        "y": 1456,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "14e5640a.2c60e4"
+                "bfe2cfaf.5416a"
             ]
         ]
     },
     {
-        "id": "14e5640a.2c60e4",
+        "id": "bfe2cfaf.5416a",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1066,
-        "y": 1468,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 1088,
+        "y": 1453,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "a961c0c2.954588",
-                "bfc93479.bb02c8",
-                "ea108501.b7cec8",
-                "9c9a6caf.c302e",
-                "520b6d65.f95b0c"
+                "ed44bd0b.bb6278",
+                "85af841c.633c5",
+                "785dd3f1.f249ac",
+                "b8d52cff.f0dcb",
+                "4915b2e4.5fd2dc"
             ]
         ]
     },
     {
-        "id": "bfc93479.bb02c8",
+        "id": "85af841c.633c5",
         "type": "set",
         "name": "unset tmp.aai.uni",
         "xml": "<set>\n<parameter name='tmp.aai.uni.' value='' />\n",
         "comments": "",
-        "x": 1270,
-        "y": 1426,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 1292,
+        "y": 1411,
+        "z": "ed7c1675.7a56b",
         "wires": []
     },
     {
-        "id": "a961c0c2.954588",
+        "id": "ed44bd0b.bb6278",
         "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": 1267,
-        "y": 1471,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 1289,
+        "y": 1456,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "ae34427.3665d4",
-                "2e0f53f9.af66fc",
-                "e67056c5.33255"
+                "6b32d7eb.72211",
+                "7343128c.f923b4",
+                "b9b05d3.e5ae12"
             ]
         ]
     },
     {
-        "id": "2e0f53f9.af66fc",
+        "id": "7343128c.f923b4",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1462.490966796875,
-        "y": 1444.573974609375,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 1484.490966796875,
+        "y": 1429.573974609375,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "c471a2c5.a52548"
+                "5dcee0f6.9162a8"
             ]
         ]
     },
     {
-        "id": "e67056c5.33255",
+        "id": "b9b05d3.e5ae12",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1458,
-        "y": 1488.9999389648438,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 1480,
+        "y": 1473.9999389648438,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "ff2d9a38.ef94a"
+                "b7ed6a74.25237"
             ]
         ]
     },
     {
-        "id": "c471a2c5.a52548",
+        "id": "5dcee0f6.9162a8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 1625.0625,
-        "y": 1443.8596801757812,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 1647.0625,
+        "y": 1428.8596801757812,
+        "z": "ed7c1675.7a56b",
         "wires": []
     },
     {
-        "id": "ff2d9a38.ef94a",
+        "id": "b7ed6a74.25237",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 1626,
-        "y": 1488.9999389648438,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 1648,
+        "y": 1473.9999389648438,
+        "z": "ed7c1675.7a56b",
         "wires": []
     },
     {
-        "id": "de28fbd6.aeb6d8",
+        "id": "dfdfa822.c47e1",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1628,
-        "y": 1535.9999389648438,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 1650,
+        "y": 1520.9999389648438,
+        "z": "ed7c1675.7a56b",
         "wires": [
             []
         ]
     },
     {
-        "id": "ae34427.3665d4",
+        "id": "6b32d7eb.72211",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1459,
-        "y": 1535.9999389648438,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 1481,
+        "y": 1520.9999389648438,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "de28fbd6.aeb6d8"
+                "dfdfa822.c47e1"
             ]
         ]
     },
     {
-        "id": "30e36623.144df2",
+        "id": "9ed7a6be.5472c",
         "type": "switchNode",
         "name": "switch conn type",
         "xml": "<switch test=\"`$tmp.aai.connectivity.vpn-type`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 148.5,
-        "y": 1133,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 170.5,
+        "y": 1118,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "f6f4ecca.51b1b8",
-                "c489f9fc.e5ffb8",
-                "a9b0c19e.2c84b8"
+                "3e9a846b.aac024",
+                "fd2eac9f.aa3be8",
+                "81d85b97.ec18c"
             ]
         ]
     },
     {
-        "id": "3438a7d7.53b84",
+        "id": "3d4d11fc.e19976",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 278.5,
-        "y": 1491,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 281.5,
+        "y": 1474,
+        "z": "ed7c1675.7a56b",
         "wires": [
             []
         ]
     },
     {
-        "id": "f6f4ecca.51b1b8",
+        "id": "3e9a846b.aac024",
         "type": "outcome",
         "name": "leaf",
         "xml": "<outcome value='leaf'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 134.5,
-        "y": 1379,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 156.5,
+        "y": 1364,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "96322198.44279"
+                "186f4361.0093b5"
             ]
         ]
     },
     {
-        "id": "c489f9fc.e5ffb8",
+        "id": "fd2eac9f.aa3be8",
         "type": "outcome",
         "name": "root",
         "xml": "<outcome value='root'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 135.5,
-        "y": 1437,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 157.5,
+        "y": 1422,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "398da5.544e025c"
+                "a8f57470.dafb1"
             ]
         ]
     },
     {
-        "id": "a9b0c19e.2c84b8",
+        "id": "81d85b97.ec18c",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 137.5,
-        "y": 1491,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 159.5,
+        "y": 1476,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "3438a7d7.53b84"
+                "3d4d11fc.e19976"
             ]
         ]
     },
     {
-        "id": "e5287808.34bdc8",
+        "id": "17f45567.72d3f3",
         "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": 1243,
-        "y": 1699,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 1265,
+        "y": 1684,
+        "z": "ed7c1675.7a56b",
         "wires": []
     },
     {
-        "id": "ea108501.b7cec8",
+        "id": "785dd3f1.f249ac",
         "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].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.connectivity.cir`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].EIR`' value='`$tmp.aai.connectivity.eir`' />\n\n<parameter name='`ethernet-srv-end-points-list_length`' value='`$epidx + 1`' />\n",
+        "xml": "<set>\n<!--<parameter name='`ethernet-srv-end-points-list[$epidx].ethernet-end-point-name`' value='`$tmp.aai.connectivity.connectivity-id`' />-->\n<parameter name='`ethernet-srv-end-points-list[$epidx].ethernet-end-point-name`' value='`$tmp.aai.uni.id`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].index-number`' value='0' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].eth-node-id`' value='`$tmp.uni-node-id-short`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].eth-node-tp-id`' value='`$tmp.aai.uni.tp-id`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].leafOrRootAccess`' value='`$leafOrRootAccess`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].cvlan`' value='`$tmp.aai.connectivity.cvlan`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].CIR`' value='`$tmp.aai.uni.data-source * 1000000`' />\n<parameter name='`ethernet-srv-end-points-list[$epidx].EIR`' value='`$tmp.aai.uni.data-source * 1000000`' />\n\n<parameter name='`ethernet-srv-end-points-list_length`' value='`$epidx + 1`' />\n",
         "comments": "",
-        "x": 1334,
-        "y": 1753,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 1356,
+        "y": 1738,
+        "z": "ed7c1675.7a56b",
         "wires": []
     },
     {
-        "id": "398da5.544e025c",
+        "id": "a8f57470.dafb1",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 277.5,
-        "y": 1437,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 273.5,
+        "y": 1418,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "f5ac679b.0c3448",
-                "30524cd6.9ca834",
-                "4bb59d5e.d5f6bc",
-                "c1ca24e2.0ded08",
-                "f1761a56.ef5438",
-                "6a3c09b5.9a3f5",
-                "62e9a9e6.6ea9a8",
-                "94499eb7.5f7bf8",
-                "24306e49.ece4e2",
-                "527621da.e42f6",
-                "f1193850.b7d1f"
+                "6d0b5941.55c8f8",
+                "c4e5acdc.5eea4",
+                "3e47dbd3.f7afc4",
+                "c378a6a3.2e4c8",
+                "901c32b.8d67fd",
+                "d142c0f2.700e98",
+                "b2e88ff.3380b7",
+                "3026fc23.0fd5f4",
+                "f24a5646.1c02c8",
+                "db09832f.86c758",
+                "3c14b8ea.b96268",
+                "c7cb304b.f39168"
             ]
         ]
     },
     {
-        "id": "96322198.44279",
+        "id": "186f4361.0093b5",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 276.5,
-        "y": 1379,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 286.5,
+        "y": 1360,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "30524cd6.9ca834",
-                "4806b9e7.4221c",
-                "4f3ecf27.4c11b",
-                "c1ca24e2.0ded08",
-                "f1761a56.ef5438",
-                "6a3c09b5.9a3f5",
-                "62e9a9e6.6ea9a8",
-                "94499eb7.5f7bf8",
-                "24306e49.ece4e2",
-                "527621da.e42f6",
-                "f1193850.b7d1f"
+                "c4e5acdc.5eea4",
+                "b5d90017.45ce98",
+                "913d2a70.ccfd3",
+                "c378a6a3.2e4c8",
+                "901c32b.8d67fd",
+                "d142c0f2.700e98",
+                "b2e88ff.3380b7",
+                "3026fc23.0fd5f4",
+                "f24a5646.1c02c8",
+                "db09832f.86c758",
+                "3c14b8ea.b96268",
+                "c7cb304b.f39168"
             ]
         ]
     },
     {
-        "id": "4806b9e7.4221c",
+        "id": "b5d90017.45ce98",
         "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": 555.5,
-        "y": 1255,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 577.5,
+        "y": 1240,
+        "z": "ed7c1675.7a56b",
         "wires": []
     },
     {
-        "id": "f5ac679b.0c3448",
+        "id": "6d0b5941.55c8f8",
         "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": 572.5,
-        "y": 1349,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 594.5,
+        "y": 1334,
+        "z": "ed7c1675.7a56b",
         "wires": []
     },
     {
-        "id": "c1ca24e2.0ded08",
+        "id": "c378a6a3.2e4c8",
         "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": 479,
-        "y": 1714,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 521,
+        "y": 1703,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "835a7483.88e81"
+                "3613e1a4.3cd206"
             ]
         ]
     },
     {
-        "id": "835a7483.88e81",
+        "id": "3613e1a4.3cd206",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 731,
-        "y": 1717,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 753,
+        "y": 1702,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "51c29716.e56f9"
+                "c46d21fc.7c5088"
             ]
         ]
     },
     {
-        "id": "51c29716.e56f9",
+        "id": "c46d21fc.7c5088",
         "type": "outcome",
         "name": "vpn-binding",
         "xml": "<outcome value='vpn-binding'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 943,
-        "y": 1718,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 965,
+        "y": 1703,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "ed212632.132b88"
+                "41d3d62e.c810a8"
             ]
         ]
     },
     {
-        "id": "ed212632.132b88",
+        "id": "41d3d62e.c810a8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 199,
-        "y": 1874,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 221,
+        "y": 1859,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "56f85a0e.adc1bc",
-                "4a52a34d.b3a154"
+                "24bb38a6.cf0a88",
+                "80203aa0.6c8a6"
             ]
         ]
     },
     {
-        "id": "4a52a34d.b3a154",
+        "id": "80203aa0.6c8a6",
         "type": "set",
         "name": "unset tmp.aai.vpn-binding",
         "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value='' />\n",
         "comments": "",
-        "x": 434,
-        "y": 1861,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 456,
+        "y": 1846,
+        "z": "ed7c1675.7a56b",
         "wires": []
     },
     {
-        "id": "56f85a0e.adc1bc",
+        "id": "24bb38a6.cf0a88",
         "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": 424,
-        "y": 1922,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 446,
+        "y": 1907,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "29bd05cb.6887aa",
-                "769c56b6.046928",
-                "2ae22544.9de39a"
+                "e7df9a86.a02dd8",
+                "d754cb82.42f37",
+                "80509f91.59bce8"
             ]
         ]
     },
     {
-        "id": "769c56b6.046928",
+        "id": "d754cb82.42f37",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 637.490966796875,
-        "y": 1906.5740356445312,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 659.490966796875,
+        "y": 1891.5740356445312,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "9a05194a.a2cf9"
+                "31b91fbf.39fff8"
             ]
         ]
     },
     {
-        "id": "2ae22544.9de39a",
+        "id": "80509f91.59bce8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 633,
-        "y": 1951,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 655,
+        "y": 1936,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "55ecc37f.47d76c"
+                "312541a.87b29be"
             ]
         ]
     },
     {
-        "id": "29bd05cb.6887aa",
+        "id": "e7df9a86.a02dd8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 635,
-        "y": 2011,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 657,
+        "y": 1996,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "d6336d05.5f3c98"
+                "f19203b2.563a88"
             ]
         ]
     },
     {
-        "id": "9a05194a.a2cf9",
+        "id": "31b91fbf.39fff8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 800.0625,
-        "y": 1905.8597412109375,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 822.0625,
+        "y": 1890.8597412109375,
+        "z": "ed7c1675.7a56b",
         "wires": []
     },
     {
-        "id": "55ecc37f.47d76c",
+        "id": "312541a.87b29be",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 801,
-        "y": 1951,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 823,
+        "y": 1936,
+        "z": "ed7c1675.7a56b",
         "wires": []
     },
     {
-        "id": "d6336d05.5f3c98",
+        "id": "f19203b2.563a88",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 804,
-        "y": 2010,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 826,
+        "y": 1995,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "84a52064.39d0f",
-                "fd245192.c0f68"
+                "70164d90.2f08c4",
+                "27824a25.86f05e"
             ]
         ]
     },
     {
-        "id": "62e9a9e6.6ea9a8",
+        "id": "b2e88ff.3380b7",
         "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": 213,
-        "y": 2153,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 225,
+        "y": 2494,
+        "z": "ed7c1675.7a56b",
         "wires": []
     },
     {
-        "id": "94499eb7.5f7bf8",
+        "id": "3026fc23.0fd5f4",
         "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.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",
+        "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": 369,
-        "y": 2201,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 368,
+        "y": 2554,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "a73a5a95.120de",
-                "bca2a5aa.f6cc3"
+                "a9d1707f.7a88c8",
+                "8ab460b7.633638"
             ]
         ]
     },
     {
-        "id": "a73a5a95.120de",
+        "id": "a9d1707f.7a88c8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 681.5,
-        "y": 2178,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 680.5,
+        "y": 2531,
+        "z": "ed7c1675.7a56b",
         "wires": [
             []
         ]
     },
     {
-        "id": "bca2a5aa.f6cc3",
+        "id": "8ab460b7.633638",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 685.5,
-        "y": 2218,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 684.5,
+        "y": 2571,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "10f6c019.f86f7"
+                "7ddc0654.bb96f8"
             ]
         ]
     },
     {
-        "id": "60ee3bcb.03ac64",
+        "id": "a1d8045c.1b61e8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 861.5,
-        "y": 2182,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 860.5,
+        "y": 2535,
+        "z": "ed7c1675.7a56b",
         "wires": []
     },
     {
-        "id": "10f6c019.f86f7",
+        "id": "7ddc0654.bb96f8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 877,
-        "y": 2236,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 876,
+        "y": 2589,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "67f0aa7d.43690c"
+                "1eddd66c.da478a"
             ]
         ]
     },
     {
-        "id": "ca5ee847.cad2",
+        "id": "cee3e55d.189dc",
         "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": 1172.5,
-        "y": 2205,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 1171.5,
+        "y": 2558,
+        "z": "ed7c1675.7a56b",
         "wires": [
             []
         ]
     },
     {
-        "id": "c6e95b64.3418d8",
+        "id": "bb915427.f0582",
         "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": 2616.5,
-        "y": 1924,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 2638.5,
+        "y": 1909,
+        "z": "ed7c1675.7a56b",
         "wires": []
     },
     {
-        "id": "67f0aa7d.43690c",
+        "id": "1eddd66c.da478a",
         "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": 1134.5,
-        "y": 2247,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 1133.5,
+        "y": 2600,
+        "z": "ed7c1675.7a56b",
         "wires": [
             []
         ]
     },
     {
-        "id": "4f3ecf27.4c11b",
+        "id": "913d2a70.ccfd3",
         "type": "set",
         "name": "set leafOrRootAccess",
         "xml": "<set>\n<parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:leaf-access' />\n",
         "comments": "",
-        "x": 521.5,
-        "y": 1293,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 543.5,
+        "y": 1278,
+        "z": "ed7c1675.7a56b",
         "wires": []
     },
     {
-        "id": "4bb59d5e.d5f6bc",
+        "id": "3e47dbd3.f7afc4",
         "type": "set",
         "name": "set leafOrRootAccess",
         "xml": "<set>\n<parameter name='`leafOrRootAccess`' value='ietf-eth-tran-types:root-primary' />\n",
         "comments": "",
-        "x": 534.5,
-        "y": 1389,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 556.5,
+        "y": 1374,
+        "z": "ed7c1675.7a56b",
         "wires": []
     },
     {
-        "id": "91a8f363.33b6d",
+        "id": "e5881b35.2a2bf8",
         "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": 4271,
-        "y": 565,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 4293,
+        "y": 550,
+        "z": "ed7c1675.7a56b",
         "wires": [
             []
         ]
     },
     {
-        "id": "b3054d0f.9c60c",
+        "id": "4004366.ff0b5c8",
         "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": 4174,
-        "y": 1384,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 4196,
+        "y": 1369,
+        "z": "ed7c1675.7a56b",
         "wires": [
             []
         ]
     },
     {
-        "id": "d3fdc974.92df9",
+        "id": "8caebf31.dc028",
         "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": 3668,
-        "y": 2056,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 3690,
+        "y": 2041,
+        "z": "ed7c1675.7a56b",
         "wires": [
             []
         ]
     },
     {
-        "id": "bb3094ff.e3cd78",
+        "id": "dc950dad.bba8c8",
         "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": 769,
-        "y": 864,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 791,
+        "y": 849,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "282392e2.d6f746",
-                "f0518341.6afb1"
+                "28d7875f.122df",
+                "47ffeb93.7b808c"
             ]
         ]
     },
     {
-        "id": "282392e2.d6f746",
+        "id": "28d7875f.122df",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1132,
-        "y": 887,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 1154,
+        "y": 872,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "77c0bd36.331cac"
+                "f3fb6a94.133bb"
             ]
         ]
     },
     {
-        "id": "f0518341.6afb1",
+        "id": "47ffeb93.7b808c",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1132,
-        "y": 836,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 1154,
+        "y": 821,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "e54c87c8.43eeb8"
+                "3da0dc2.736e6a4"
             ]
         ]
     },
     {
-        "id": "77c0bd36.331cac",
+        "id": "f3fb6a94.133bb",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1288,
-        "y": 885,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 1310,
+        "y": 870,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "30e36623.144df2"
+                "9ed7a6be.5472c"
             ]
         ]
     },
     {
-        "id": "e54c87c8.43eeb8",
+        "id": "3da0dc2.736e6a4",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1265,
-        "y": 837,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 1287,
+        "y": 822,
+        "z": "ed7c1675.7a56b",
         "wires": [
             []
         ]
     },
     {
-        "id": "e9e324cf.d34fa8",
+        "id": "ca01ca51.23bb98",
         "type": "set",
         "name": "unset tmp.aai.vpn-binding",
         "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value=\"\" />\n",
         "comments": "",
-        "x": 2025,
-        "y": 235,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 2047,
+        "y": 220,
+        "z": "ed7c1675.7a56b",
         "wires": []
     },
     {
-        "id": "52902dc6.5c041c",
+        "id": "6ccc1a6d.d89cd4",
         "type": "set",
         "name": "set root-otn-tunnels-list array",
         "xml": "<set>\n<parameter name='`roottunsidx`' value='`$roottunsidx + 1`' />\n",
         "comments": "",
-        "x": 3567,
-        "y": 2216,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 3589,
+        "y": 2201,
+        "z": "ed7c1675.7a56b",
         "wires": []
     },
     {
-        "id": "8c296a00.ae82e8",
+        "id": "ceaa1f2c.697ad",
         "type": "set",
         "name": "set leaf-otn-tunnels-list array",
         "xml": "<set>\n<parameter name='`leaftunsidx`' value='`$leaftunsidx + 1`' />\n",
         "comments": "",
-        "x": 4157,
-        "y": 689,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 4179,
+        "y": 674,
+        "z": "ed7c1675.7a56b",
         "wires": []
     },
     {
-        "id": "9c9a6caf.c302e",
+        "id": "b8d52cff.f0dcb",
         "type": "set",
         "name": "set ethernet-srv-end-points-list array",
         "xml": "<set>\n<parameter name='`epidx`' value='`$epidx + 1`' />\n",
         "comments": "",
-        "x": 1331,
-        "y": 1795,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 1353,
+        "y": 1780,
+        "z": "ed7c1675.7a56b",
         "wires": []
     },
     {
-        "id": "f1761a56.ef5438",
+        "id": "901c32b.8d67fd",
         "type": "set",
         "name": "set filename",
         "xml": "<set>\n<parameter name='filenameclleths' value=\"`$leafOrRootAccess + $tmp.aai.connectivity.access-node-id`\" />",
         "comments": "",
-        "x": 510,
-        "y": 1529,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 532,
+        "y": 1514,
+        "z": "ed7c1675.7a56b",
         "wires": []
     },
     {
-        "id": "6a3c09b5.9a3f5",
+        "id": "d142c0f2.700e98",
         "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": 541,
-        "y": 1569,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 563,
+        "y": 1554,
+        "z": "ed7c1675.7a56b",
         "wires": [
             []
         ]
     },
     {
-        "id": "84a52064.39d0f",
+        "id": "70164d90.2f08c4",
         "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": 1089,
-        "y": 1977,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 1111,
+        "y": 1962,
+        "z": "ed7c1675.7a56b",
         "wires": []
     },
     {
-        "id": "fd245192.c0f68",
+        "id": "27824a25.86f05e",
         "type": "set",
         "name": "set otn-tunnels-name-list array",
         "xml": "<set>\n<parameter name='`otntunsidx`' value='`$otntunsidx + 1`' />\n",
         "comments": "",
-        "x": 1092,
-        "y": 2019,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 1114,
+        "y": 2004,
+        "z": "ed7c1675.7a56b",
         "wires": []
     },
     {
-        "id": "24306e49.ece4e2",
+        "id": "f24a5646.1c02c8",
         "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": 516,
-        "y": 1663,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 557,
+        "y": 1644,
+        "z": "ed7c1675.7a56b",
         "wires": []
     },
     {
-        "id": "527621da.e42f6",
+        "id": "db09832f.86c758",
         "type": "set",
         "name": "set filename",
         "xml": "<set>\n<parameter name='filenamecllotns' value=\"`leafrootOTNtunnelnames`\" />",
         "comments": "",
-        "x": 290,
-        "y": 2038,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 312,
+        "y": 2023,
+        "z": "ed7c1675.7a56b",
         "wires": []
     },
     {
-        "id": "f1193850.b7d1f",
+        "id": "3c14b8ea.b96268",
         "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": 298,
-        "y": 2095,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 320,
+        "y": 2080,
+        "z": "ed7c1675.7a56b",
         "wires": [
             []
         ]
     },
     {
-        "id": "520b6d65.f95b0c",
+        "id": "4915b2e4.5fd2dc",
         "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": 1309,
-        "y": 1644,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 1331,
+        "y": 1629,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "19e13e29.006812",
-                "9d0e6726.e149c8"
+                "bfcf3bba.b5daa",
+                "9b18409e.c203c8"
             ]
         ]
     },
     {
-        "id": "9d0e6726.e149c8",
+        "id": "9b18409e.c203c8",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1532,
-        "y": 1599,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 1554,
+        "y": 1584,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "2d20dd4b.751b72"
+                "5afaf397.e20c3c"
             ]
         ]
     },
     {
-        "id": "19e13e29.006812",
+        "id": "bfcf3bba.b5daa",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1534,
-        "y": 1663,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 1556,
+        "y": 1648,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "1dc48abe.a6b4ad"
+                "f7de9867.a0fd38"
             ]
         ]
     },
     {
-        "id": "2d20dd4b.751b72",
+        "id": "5afaf397.e20c3c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1697,
-        "y": 1596,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 1719,
+        "y": 1581,
+        "z": "ed7c1675.7a56b",
         "wires": [
             [
-                "c6b49f04.8bee18"
+                "cdcfe3c8.962368"
             ]
         ]
     },
     {
-        "id": "1dc48abe.a6b4ad",
+        "id": "f7de9867.a0fd38",
         "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": 1696,
-        "y": 1659,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 1718,
+        "y": 1644,
+        "z": "ed7c1675.7a56b",
         "wires": []
     },
     {
-        "id": "c6b49f04.8bee18",
+        "id": "cdcfe3c8.962368",
         "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 -3]`' />\n",
         "comments": "",
-        "x": 1917,
-        "y": 1610,
-        "z": "bbeb6c6b.9e8ac8",
+        "x": 1939,
+        "y": 1595,
+        "z": "ed7c1675.7a56b",
+        "wires": []
+    },
+    {
+        "id": "6d07bcb7.ffff34",
+        "type": "outcome",
+        "name": "esr-thirdparty-sdnc",
+        "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1484,
+        "y": 2320,
+        "z": "ed7c1675.7a56b",
+        "wires": [
+            [
+                "9547fb43.8165f"
+            ]
+        ]
+    },
+    {
+        "id": "261f721d.19cda6",
+        "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": 1869,
+        "y": 2333,
+        "z": "ed7c1675.7a56b",
+        "wires": [
+            [
+                "a4fad359.d63e7",
+                "d7202a06.97a2a8",
+                "d2a1d22e.b2ed6"
+            ]
+        ]
+    },
+    {
+        "id": "9547fb43.8165f",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 1663,
+        "y": 2320,
+        "z": "ed7c1675.7a56b",
+        "wires": [
+            [
+                "9b0cdae9.5834e8",
+                "261f721d.19cda6"
+            ]
+        ]
+    },
+    {
+        "id": "9b0cdae9.5834e8",
+        "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": 1899,
+        "y": 2281,
+        "z": "ed7c1675.7a56b",
+        "wires": []
+    },
+    {
+        "id": "a4fad359.d63e7",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2079,
+        "y": 2324,
+        "z": "ed7c1675.7a56b",
+        "wires": [
+            [
+                "ce2ed097.248ac"
+            ]
+        ]
+    },
+    {
+        "id": "d7202a06.97a2a8",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2071,
+        "y": 2379,
+        "z": "ed7c1675.7a56b",
+        "wires": [
+            [
+                "15f2754c.6e5b2b"
+            ]
+        ]
+    },
+    {
+        "id": "d2a1d22e.b2ed6",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2076,
+        "y": 2436,
+        "z": "ed7c1675.7a56b",
+        "wires": [
+            [
+                "fe7bb44f.f58b7"
+            ]
+        ]
+    },
+    {
+        "id": "fe7bb44f.f58b7",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return 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": 2228,
+        "y": 2437,
+        "z": "ed7c1675.7a56b",
+        "wires": []
+    },
+    {
+        "id": "15f2754c.6e5b2b",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 2239,
+        "y": 2382,
+        "z": "ed7c1675.7a56b",
+        "wires": []
+    },
+    {
+        "id": "ce2ed097.248ac",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 2223.38232421875,
+        "y": 2321.6556701660156,
+        "z": "ed7c1675.7a56b",
+        "wires": [
+            [
+                "1c2a2a5a.6d8256"
+            ]
+        ]
+    },
+    {
+        "id": "1c2a2a5a.6d8256",
+        "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": 2438,
+        "y": 2318,
+        "z": "ed7c1675.7a56b",
+        "wires": []
+    },
+    {
+        "id": "9710382e.112c58",
+        "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": 562,
+        "y": 2366,
+        "z": "ed7c1675.7a56b",
+        "wires": [
+            [
+                "afc311a9.64a498",
+                "1b364ee.7270531",
+                "aa64b78b.7ab17"
+            ]
+        ]
+    },
+    {
+        "id": "afc311a9.64a498",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 757.5001220703125,
+        "y": 2318,
+        "z": "ed7c1675.7a56b",
+        "wires": [
+            [
+                "7cd619d5.a4e8c"
+            ]
+        ]
+    },
+    {
+        "id": "1b364ee.7270531",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 749.5001220703125,
+        "y": 2373,
+        "z": "ed7c1675.7a56b",
+        "wires": [
+            [
+                "7127ee10.2a0b4"
+            ]
+        ]
+    },
+    {
+        "id": "7cd619d5.a4e8c",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 901.8824462890625,
+        "y": 2317.6556701660156,
+        "z": "ed7c1675.7a56b",
+        "wires": [
+            [
+                "fd5a5a0.ad9b128"
+            ]
+        ]
+    },
+    {
+        "id": "fd5a5a0.ad9b128",
+        "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": 1086,
+        "y": 2316,
+        "z": "ed7c1675.7a56b",
+        "wires": [
+            [
+                "8c513405.b809e8"
+            ]
+        ]
+    },
+    {
+        "id": "8c513405.b809e8",
+        "type": "switchNode",
+        "name": "switch related-to",
+        "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1281,
+        "y": 2316,
+        "z": "ed7c1675.7a56b",
+        "wires": [
+            [
+                "6d07bcb7.ffff34"
+            ]
+        ]
+    },
+    {
+        "id": "aa64b78b.7ab17",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 754.5001220703125,
+        "y": 2430,
+        "z": "ed7c1675.7a56b",
+        "wires": [
+            [
+                "22a641d1.a7babe"
+            ]
+        ]
+    },
+    {
+        "id": "22a641d1.a7babe",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return 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": 906.5001220703125,
+        "y": 2431,
+        "z": "ed7c1675.7a56b",
+        "wires": []
+    },
+    {
+        "id": "7127ee10.2a0b4",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 917.5001220703125,
+        "y": 2374,
+        "z": "ed7c1675.7a56b",
+        "wires": []
+    },
+    {
+        "id": "41c682cf.a83f2c",
+        "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": 552,
+        "y": 2278,
+        "z": "ed7c1675.7a56b",
+        "wires": []
+    },
+    {
+        "id": "c7cb304b.f39168",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 297,
+        "y": 2409,
+        "z": "ed7c1675.7a56b",
+        "wires": [
+            [
+                "41c682cf.a83f2c",
+                "9710382e.112c58"
+            ]
+        ]
+    },
+    {
+        "id": "d390d070.3dc4c",
+        "type": "comment",
+        "name": "Temporary skipping this check - to support multiple instances in one slice",
+        "info": "",
+        "comments": "",
+        "x": 1511.9666748046875,
+        "y": 226.88333129882812,
+        "z": "ed7c1675.7a56b",
         "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 7eb64480..891b0ab1 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
@@ -557,225 +557,6 @@
         "z": "4fb14ce0.40eb24",
         "wires": []
     },
-    {
-        "id": "d75cf545.437ae8",
-        "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='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": 1574,
-        "y": 2868,
-        "z": "4fb14ce0.40eb24",
-        "wires": [
-            [
-                "871b9e34.870768"
-            ]
-        ]
-    },
-    {
-        "id": "fd805b4d.1b0548",
-        "type": "save",
-        "name": "save connectivity-A relationship to vpn-binding-A, 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-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": 2146.5,
-        "y": 2972,
-        "z": "4fb14ce0.40eb24",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "871b9e34.870768",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1880,
-        "y": 2867,
-        "z": "4fb14ce0.40eb24",
-        "wires": [
-            [
-                "ee92c990.60c9f"
-            ]
-        ]
-    },
-    {
-        "id": "ee92c990.60c9f",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 2089.5,
-        "y": 2867.25390625,
-        "z": "4fb14ce0.40eb24",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "702e0066.542168",
-        "type": "switchNode",
-        "name": "switch otnidx == 0",
-        "xml": "<switch test='`$otnidx == 0`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1483,
-        "y": 2985,
-        "z": "4fb14ce0.40eb24",
-        "wires": [
-            [
-                "bb13d1a8.37e5",
-                "a19ebb79.79b868"
-            ]
-        ]
-    },
-    {
-        "id": "bb13d1a8.37e5",
-        "type": "outcomeTrue",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1666,
-        "y": 2985,
-        "z": "4fb14ce0.40eb24",
-        "wires": [
-            [
-                "62ae9cfb.3879bc"
-            ]
-        ]
-    },
-    {
-        "id": "a19ebb79.79b868",
-        "type": "outcomeFalse",
-        "name": "false",
-        "xml": "<outcome value='false'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1491,
-        "y": 3132,
-        "z": "4fb14ce0.40eb24",
-        "wires": [
-            [
-                "db504ec2.be40a8"
-            ]
-        ]
-    },
-    {
-        "id": "d2ac9909.c7d83",
-        "type": "switchNode",
-        "name": "switch otnidx == last",
-        "xml": "<switch test='`$otnidx == $tmp.otninfo_length - 1`'>\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1832,
-        "y": 3213,
-        "z": "4fb14ce0.40eb24",
-        "wires": [
-            [
-                "f6ac8945.06d298",
-                "d0d3740b.46215"
-            ]
-        ]
-    },
-    {
-        "id": "f6ac8945.06d298",
-        "type": "outcomeTrue",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2008,
-        "y": 3214,
-        "z": "4fb14ce0.40eb24",
-        "wires": [
-            [
-                "84c92d78.7984b8"
-            ]
-        ]
-    },
-    {
-        "id": "b93d4ed1.4609d8",
-        "type": "set",
-        "name": "set attachment_param domain A",
-        "xml": "<set>\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n\n\n",
-        "comments": "",
-        "x": 2071,
-        "y": 3029,
-        "z": "4fb14ce0.40eb24",
-        "wires": []
-    },
-    {
-        "id": "62ae9cfb.3879bc",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 1807,
-        "y": 2975,
-        "z": "4fb14ce0.40eb24",
-        "wires": [
-            [
-                "fd805b4d.1b0548",
-                "b93d4ed1.4609d8",
-                "ea374103.b6422"
-            ]
-        ]
-    },
-    {
-        "id": "11cd0588.41272a",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 2713,
-        "y": 3164,
-        "z": "4fb14ce0.40eb24",
-        "wires": [
-            [
-                "5ba25870.61d0e"
-            ]
-        ]
-    },
-    {
-        "id": "302e8991.9483b6",
-        "type": "set",
-        "name": "set",
-        "xml": "<set>\n<parameter name='testingvalue' value='$tmp.otninfo_length -1' />\n",
-        "comments": "",
-        "x": 1780,
-        "y": 3164,
-        "z": "4fb14ce0.40eb24",
-        "wires": []
-    },
-    {
-        "id": "db504ec2.be40a8",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 1615,
-        "y": 3139,
-        "z": "4fb14ce0.40eb24",
-        "wires": [
-            [
-                "302e8991.9483b6",
-                "d2ac9909.c7d83"
-            ]
-        ]
-    },
     {
         "id": "715b7a53.d039d4",
         "type": "switchNode",
@@ -963,122 +744,6 @@
         "z": "4fb14ce0.40eb24",
         "wires": []
     },
-    {
-        "id": "d0d3740b.46215",
-        "type": "outcomeFalse",
-        "name": "false",
-        "xml": "<outcome value='false'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2036,
-        "y": 3480,
-        "z": "4fb14ce0.40eb24",
-        "wires": [
-            [
-                "822b4a87.c6d91"
-            ]
-        ]
-    },
-    {
-        "id": "df45bcf4.ab6068",
-        "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": 2511,
-        "y": 3465,
-        "z": "4fb14ce0.40eb24",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "92ea7ec.b1b38",
-        "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='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<!--<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": 2449,
-        "y": 3515,
-        "z": "4fb14ce0.40eb24",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "ab274de2.98aaf8",
-        "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": 2586,
-        "y": 3614,
-        "z": "4fb14ce0.40eb24",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "ba000585.cff088",
-        "type": "comment",
-        "name": "connectivity has not been created for middle domains, so we have to create one",
-        "info": "",
-        "comments": "",
-        "x": 2589,
-        "y": 3406,
-        "z": "4fb14ce0.40eb24",
-        "wires": []
-    },
-    {
-        "id": "fe394c67.6a4738",
-        "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": 2554,
-        "y": 3673,
-        "z": "4fb14ce0.40eb24",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "822b4a87.c6d91",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 2193,
-        "y": 3481,
-        "z": "4fb14ce0.40eb24",
-        "wires": [
-            [
-                "df45bcf4.ab6068",
-                "92ea7ec.b1b38",
-                "ab274de2.98aaf8",
-                "fe394c67.6a4738",
-                "b6a44371.9af948",
-                "c51d1d37.88a2f8"
-            ]
-        ]
-    },
-    {
-        "id": "b6a44371.9af948",
-        "type": "set",
-        "name": "set attachment_param domain otnidx",
-        "xml": "<set>\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n",
-        "comments": "",
-        "x": 2468,
-        "y": 3733,
-        "z": "4fb14ce0.40eb24",
-        "wires": []
-    },
     {
         "id": "6f21b0a4.c1ba8",
         "type": "set",
@@ -1101,877 +766,6 @@
         "z": "4fb14ce0.40eb24",
         "wires": []
     },
-    {
-        "id": "5ba25870.61d0e",
-        "type": "save",
-        "name": "save middle-man-conn relationship to connectivity-B, 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": 3037,
-        "y": 3164,
-        "z": "4fb14ce0.40eb24",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "ea374103.b6422",
-        "type": "save",
-        "name": "save middle-man-conn relationship to connectivity-A, 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-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=\"`$prop.connectivity-domainA-uuid`\" />",
-        "comments": "",
-        "outputs": 1,
-        "x": 2151,
-        "y": 2920,
-        "z": "4fb14ce0.40eb24",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "c51d1d37.88a2f8",
-        "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": 2550,
-        "y": 3560,
-        "z": "4fb14ce0.40eb24",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "6512efb1.123b28",
-        "type": "switchNode",
-        "name": "switch found-middle-man?",
-        "xml": "<switch test='`$found-middle-man`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2369,
-        "y": 3164,
-        "z": "4fb14ce0.40eb24",
-        "wires": [
-            [
-                "4373daa0.a1c174"
-            ]
-        ]
-    },
-    {
-        "id": "4373daa0.a1c174",
-        "type": "outcomeFalse",
-        "name": "false",
-        "xml": "<outcome value='false'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2556,
-        "y": 3164,
-        "z": "4fb14ce0.40eb24",
-        "wires": [
-            [
-                "11cd0588.41272a"
-            ]
-        ]
-    },
-    {
-        "id": "84c92d78.7984b8",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 2151,
-        "y": 3214,
-        "z": "4fb14ce0.40eb24",
-        "wires": [
-            [
-                "ef7c2251.5fe8a8",
-                "b19fce04.44ae8",
-                "6512efb1.123b28"
-            ]
-        ]
-    },
-    {
-        "id": "ef7c2251.5fe8a8",
-        "type": "save",
-        "name": "save connectivity-B relationship to vpn-binding-B, 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/' + $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": 2467,
-        "y": 3262,
-        "z": "4fb14ce0.40eb24",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "b19fce04.44ae8",
-        "type": "set",
-        "name": "set attachment_param domain B",
-        "xml": "<set>\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n\n",
-        "comments": "",
-        "x": 2394,
-        "y": 3322,
-        "z": "4fb14ce0.40eb24",
-        "wires": []
-    },
-    {
-        "id": "d80a0f45.0378e",
-        "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/v21/network/vpn-bindings\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.all-vpn-bindings\" >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 455,
-        "y": 3922,
-        "z": "4fb14ce0.40eb24",
-        "wires": [
-            [
-                "24e9e35d.66377c",
-                "ba022563.b1ca78",
-                "e3577813.56f32"
-            ]
-        ]
-    },
-    {
-        "id": "24e9e35d.66377c",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 643,
-        "y": 3935,
-        "z": "4fb14ce0.40eb24",
-        "wires": [
-            [
-                "b86628e9.5b571"
-            ]
-        ]
-    },
-    {
-        "id": "ba022563.b1ca78",
-        "type": "not-found",
-        "name": "not-found",
-        "xml": "<outcome value='not-found'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 643.490966796875,
-        "y": 3980.5740356445312,
-        "z": "4fb14ce0.40eb24",
-        "wires": [
-            [
-                "dd8f81c4.9e7f98"
-            ]
-        ]
-    },
-    {
-        "id": "e3577813.56f32",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 641,
-        "y": 4024,
-        "z": "4fb14ce0.40eb24",
-        "wires": [
-            [
-                "7aca1801.7911a"
-            ]
-        ]
-    },
-    {
-        "id": "b86628e9.5b571",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 816,
-        "y": 3933,
-        "z": "4fb14ce0.40eb24",
-        "wires": [
-            [
-                "247b0f83.24d55"
-            ]
-        ]
-    },
-    {
-        "id": "dd8f81c4.9e7f98",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 806.0623779296875,
-        "y": 3980.8597717285156,
-        "z": "4fb14ce0.40eb24",
-        "wires": []
-    },
-    {
-        "id": "7aca1801.7911a",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
-        "comments": "",
-        "x": 808,
-        "y": 4023,
-        "z": "4fb14ce0.40eb24",
-        "wires": []
-    },
-    {
-        "id": "be1c598f.c95108",
-        "type": "for",
-        "name": "for vidx..tmp.otninfo_length[]",
-        "xml": "<for index='dmnsidx' start='0' end='`$otn-tunnel-slice_length`' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 444,
-        "y": 4113,
-        "z": "4fb14ce0.40eb24",
-        "wires": [
-            [
-                "5abd279e.a9bea8"
-            ]
-        ]
-    },
-    {
-        "id": "42fde1a9.9a4a98",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 1254,
-        "y": 4113,
-        "z": "4fb14ce0.40eb24",
-        "wires": [
-            [
-                "bf9e1c4b.a2ce9"
-            ]
-        ]
-    },
-    {
-        "id": "3cd4b283.9423f6",
-        "type": "for",
-        "name": "for vidx..tmp.otninfo_length[]",
-        "xml": "<for index='stunidx' start='0' end='`$otn-tunnel-slice[$dmnsidx].list_length`' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1026,
-        "y": 4113,
-        "z": "4fb14ce0.40eb24",
-        "wires": [
-            [
-                "42fde1a9.9a4a98"
-            ]
-        ]
-    },
-    {
-        "id": "247b0f83.24d55",
-        "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": 1045,
-        "y": 3934,
-        "z": "4fb14ce0.40eb24",
-        "wires": [
-            [
-                "a4896672.ff36c8"
-            ]
-        ]
-    },
-    {
-        "id": "a4896672.ff36c8",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 1260,
-        "y": 3935,
-        "z": "4fb14ce0.40eb24",
-        "wires": [
-            [
-                "f571db46.1bfcb"
-            ]
-        ]
-    },
-    {
-        "id": "bf9e1c4b.a2ce9",
-        "type": "set",
-        "name": "set attachment_param sliceG",
-        "xml": "<set>\n<parameter name='`otn-tunnel-sliceG-list[$stunidx].request-id`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].request-id`' />\n<parameter name='`otn-tunnel-sliceG-list[$stunidx].otn-source-node`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].otn-source-node`' />\n<parameter name='`otn-tunnel-sliceG-list[$stunidx].otn-dest-node`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].otn-dest-node`' />\n<parameter name='`otn-tunnel-sliceG-list[$stunidx].bw-odu`' value=\"`$otn-tunnel-slice[$dmnsidx].list[$stunidx].bw-odu`\" />\n<parameter name='`otn-tunnel-sliceG-list[$stunidx].src-ttp-id`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].src-ttp-id`' />\n<parameter name='`otn-tunnel-sliceG-list[$stunidx].dst-ttp-id`' value='`$otn-tunnel-slice[$dmnsidx].list[$stunidx].dst-ttp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n<parameter name='otn-tunnel-sliceG-list_length' value='`$stunidx + 1`' />\n\n\n<parameter name=\"tmp.domainG.restapiUrl\" value=\"`$otn-tunnel-slice[$dmnsidx].list[$stunidx].domainurl`\" />\n<parameter name=\"tmp.domainG.restapiUser\" value=\"`$otn-tunnel-slice[$dmnsidx].list[$stunidx].domainuser`\" />\n<parameter name=\"tmp.domainG.restapiPassword\" value=\"`$otn-tunnel-slice[$dmnsidx].list[$stunidx].domainpassword`\" />",
-        "comments": "",
-        "x": 1507,
-        "y": 4111,
-        "z": "4fb14ce0.40eb24",
-        "wires": []
-    },
-    {
-        "id": "5df62aff.b0027c",
-        "type": "execute",
-        "name": "execute RestApiCallNode sliceG creation domainG",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.transport-sliceG-list-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$tmp.domainG.restapiUrl + '/restconf/operations/ietf-optical-slice:create-optical-slice'`\" />\n<parameter name=\"restapiUser\" value=\"`$tmp.domainG.restapiUser`\" />\n<parameter name=\"restapiPassword\" value=\"`tmp.domainG.restapiPassword`\" />\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`\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1092,
-        "y": 4219,
-        "z": "4fb14ce0.40eb24",
-        "wires": [
-            [
-                "e89a613f.801198",
-                "c394a514.3653"
-            ]
-        ]
-    },
-    {
-        "id": "c394a514.3653",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1375,
-        "y": 4199,
-        "z": "4fb14ce0.40eb24",
-        "wires": [
-            [
-                "ba5b687c.dd6a6"
-            ]
-        ]
-    },
-    {
-        "id": "e89a613f.801198",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1376.0002136230469,
-        "y": 4249.99990940094,
-        "z": "4fb14ce0.40eb24",
-        "wires": [
-            [
-                "b0106af6.430b1"
-            ]
-        ]
-    },
-    {
-        "id": "ba5b687c.dd6a6",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return 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 slice creation api for domain A\" />\n",
-        "comments": "",
-        "x": 1515.0002479553223,
-        "y": 4199.000000953674,
-        "z": "4fb14ce0.40eb24",
-        "wires": []
-    },
-    {
-        "id": "b0106af6.430b1",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 1521.0272598266602,
-        "y": 4247.745394706726,
-        "z": "4fb14ce0.40eb24",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "5abd279e.a9bea8",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 676,
-        "y": 4111,
-        "z": "4fb14ce0.40eb24",
-        "wires": [
-            [
-                "3cd4b283.9423f6",
-                "5df62aff.b0027c"
-            ]
-        ]
-    },
-    {
-        "id": "f571db46.1bfcb",
-        "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": 1504,
-        "y": 3934,
-        "z": "4fb14ce0.40eb24",
-        "wires": [
-            [
-                "10584e74.11a9e2",
-                "3270eb36.2e6c2c"
-            ]
-        ]
-    },
-    {
-        "id": "cbeb21d2.528fb",
-        "type": "set",
-        "name": "set providerValue",
-        "xml": "<set>\n<parameter name='providerValue' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].access-provider-id`' />\n<parameter name='found' value='false' />\n\n\n",
-        "comments": "",
-        "x": 2146,
-        "y": 3880,
-        "z": "4fb14ce0.40eb24",
-        "wires": []
-    },
-    {
-        "id": "7855d996.5f07",
-        "type": "switchNode",
-        "name": "switch $tmp.arr_length != 0",
-        "xml": "<switch test='`$tmp.arr_length != 0`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2179,
-        "y": 3935,
-        "z": "4fb14ce0.40eb24",
-        "wires": [
-            [
-                "be28c030.0047c",
-                "f9d12f18.1e0e1"
-            ]
-        ]
-    },
-    {
-        "id": "be28c030.0047c",
-        "type": "outcomeTrue",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2375,
-        "y": 3905,
-        "z": "4fb14ce0.40eb24",
-        "wires": [
-            [
-                "cca5c1e0.c9e418"
-            ]
-        ]
-    },
-    {
-        "id": "f9d12f18.1e0e1",
-        "type": "outcomeFalse",
-        "name": "false",
-        "xml": "<outcome value='false'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2376,
-        "y": 3976,
-        "z": "4fb14ce0.40eb24",
-        "wires": [
-            [
-                "1c2a1c2d.eddd2c"
-            ]
-        ]
-    },
-    {
-        "id": "10584e74.11a9e2",
-        "type": "outcomeTrue",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1721,
-        "y": 3913,
-        "z": "4fb14ce0.40eb24",
-        "wires": [
-            [
-                "66fe7551.116524"
-            ]
-        ]
-    },
-    {
-        "id": "3270eb36.2e6c2c",
-        "type": "outcomeFalse",
-        "name": "false",
-        "xml": "<outcome value='false'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1721,
-        "y": 3962,
-        "z": "4fb14ce0.40eb24",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "66fe7551.116524",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 1889,
-        "y": 3913,
-        "z": "4fb14ce0.40eb24",
-        "wires": [
-            [
-                "cbeb21d2.528fb",
-                "7855d996.5f07"
-            ]
-        ]
-    },
-    {
-        "id": "cca5c1e0.c9e418",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 2526,
-        "y": 3903,
-        "z": "4fb14ce0.40eb24",
-        "wires": [
-            [
-                "6021fe00.cf5b38",
-                "3ee35cda.cacc94"
-            ]
-        ]
-    },
-    {
-        "id": "1c2a1c2d.eddd2c",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 2528,
-        "y": 3976,
-        "z": "4fb14ce0.40eb24",
-        "wires": [
-            [
-                "b88403d3.b550c",
-                "df79ce65.0d4e"
-            ]
-        ]
-    },
-    {
-        "id": "6021fe00.cf5b38",
-        "type": "for",
-        "name": "for arridx in tmp.arr",
-        "xml": "<for index='arridx' start='0' end='`$tmp.arr_length`' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2713,
-        "y": 3855,
-        "z": "4fb14ce0.40eb24",
-        "wires": [
-            [
-                "70402202.48ed14"
-            ]
-        ]
-    },
-    {
-        "id": "70402202.48ed14",
-        "type": "switchNode",
-        "name": "switch tmp.arr[$arridx] == $providerValue",
-        "xml": "<switch test='`$tmp.arr[$arridx] == $providerValue`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3004,
-        "y": 3855,
-        "z": "4fb14ce0.40eb24",
-        "wires": [
-            [
-                "f629fdf.6a8538",
-                "a317d92b.3b0b18"
-            ]
-        ]
-    },
-    {
-        "id": "f629fdf.6a8538",
-        "type": "outcomeTrue",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3279,
-        "y": 3824,
-        "z": "4fb14ce0.40eb24",
-        "wires": [
-            [
-                "a51325a8.b7388"
-            ]
-        ]
-    },
-    {
-        "id": "a317d92b.3b0b18",
-        "type": "outcomeFalse",
-        "name": "false",
-        "xml": "<outcome value='false'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3280,
-        "y": 3895,
-        "z": "4fb14ce0.40eb24",
-        "wires": [
-            [
-                "9d65717e.a373d"
-            ]
-        ]
-    },
-    {
-        "id": "a51325a8.b7388",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 3430,
-        "y": 3822,
-        "z": "4fb14ce0.40eb24",
-        "wires": [
-            [
-                "3791e48.3b8af9c",
-                "a673fd66.c40df",
-                "86199d64.75edc8",
-                "51a35674.c610f8",
-                "445052f3.f38194"
-            ]
-        ]
-    },
-    {
-        "id": "b88403d3.b550c",
-        "type": "save",
-        "name": "store $arridx somewhere in vpn-binding",
-        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\n<parameter name='vpn-type' value='0' />\n\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2783,
-        "y": 3969,
-        "z": "4fb14ce0.40eb24",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "df79ce65.0d4e",
-        "type": "set",
-        "name": "set twoD array",
-        "xml": "<set>\n<parameter name='tmp.arr[0]' value='`$providerValue`' />\n<parameter name='tmp.arr_length' value='1' />\n\n<parameter name='`otn-tunnel-slice[0].list[0].request-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\n<parameter name='`otn-tunnel-slice[0].list[0].otn-source-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-node-id`' />\n<parameter name='`otn-tunnel-slice[0].list[0].otn-dest-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-node-id`' />\n<parameter name='`otn-tunnel-slice[0].list[0].bw-odu`' value=\"`'0,' + $gfp`\" />\n<parameter name='`otn-tunnel-slice[0].list[0].src-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-ltp-id`' />\n<parameter name='`otn-tunnel-slice[0].list[0].dst-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n<parameter name='`otn-tunnel-slice[0].list[0].domainurl`' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-region`\" />\n<parameter name='`otn-tunnel-slice[0].list[0].domainuser`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-description`' />\n<parameter name='`otn-tunnel-slice[0].list[0].domainpassword`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-platform`' />\n\n<parameter name='otn-tunnel-slice_length' value='1' />\n<parameter name='otn-tunnel-slice[0].list_length' value='1' />\n\n",
-        "comments": "",
-        "x": 2711,
-        "y": 4016,
-        "z": "4fb14ce0.40eb24",
-        "wires": []
-    },
-    {
-        "id": "3ee35cda.cacc94",
-        "type": "switchNode",
-        "name": "switch found?",
-        "xml": "<switch test='`$found`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2704,
-        "y": 3900,
-        "z": "4fb14ce0.40eb24",
-        "wires": [
-            [
-                "b2a6fca5.77cd68",
-                "c6caa4c6.b68ae"
-            ]
-        ]
-    },
-    {
-        "id": "b2a6fca5.77cd68",
-        "type": "outcomeTrue",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2864,
-        "y": 3892,
-        "z": "4fb14ce0.40eb24",
-        "wires": [
-            [
-                "697e3e96.9c5648"
-            ]
-        ]
-    },
-    {
-        "id": "c6caa4c6.b68ae",
-        "type": "outcomeFalse",
-        "name": "false",
-        "xml": "<outcome value='false'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2862,
-        "y": 3929,
-        "z": "4fb14ce0.40eb24",
-        "wires": [
-            [
-                "c8a03883.695728"
-            ]
-        ]
-    },
-    {
-        "id": "697e3e96.9c5648",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 2989,
-        "y": 3892,
-        "z": "4fb14ce0.40eb24",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "7ed231c3.f2fd1",
-        "type": "save",
-        "name": "store $arridx+1 somewhere in vpn-binding",
-        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\n<parameter name='vpn-type' value='`$arridx + 1`' />\n\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3296,
-        "y": 3950,
-        "z": "4fb14ce0.40eb24",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "c8a03883.695728",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 3022,
-        "y": 3937,
-        "z": "4fb14ce0.40eb24",
-        "wires": [
-            [
-                "7ed231c3.f2fd1",
-                "2d908152.4ff6a6"
-            ]
-        ]
-    },
-    {
-        "id": "2d908152.4ff6a6",
-        "type": "set",
-        "name": "set twoD array",
-        "xml": "<set>\n<parameter name='`tmp.arr[$arridx + 1]`' value='`$providerValue`' />\n<parameter name='tmp.arr_length' value='`$tmp.arr_length + 1`' />\n\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].request-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].otn-source-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-node-id`' />\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].otn-dest-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-node-id`' />\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].bw-odu`' value=\"`'0,' + $gfp`\" />\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].src-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-ltp-id`' />\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].dst-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].domainurl`' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-region`\" />\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].domainuser`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-description`' />\n<parameter name='`otn-tunnel-slice[$arridx + 1].list[0].domainpassword`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-platform`' />\n\n<parameter name='otn-tunnel-slice_length' value='`$arridx + 2`' />\n<parameter name='`otn-tunnel-slice[$arridx + 1].list_length`' value='1' />\n\n",
-        "comments": "",
-        "x": 3213,
-        "y": 3996,
-        "z": "4fb14ce0.40eb24",
-        "wires": []
-    },
-    {
-        "id": "9d65717e.a373d",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 3413,
-        "y": 3894,
-        "z": "4fb14ce0.40eb24",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "3791e48.3b8af9c",
-        "type": "set",
-        "name": "set found to true",
-        "xml": "<set>\n<parameter name='found' value='true' />\n\n\n",
-        "comments": "",
-        "x": 3618,
-        "y": 3782,
-        "z": "4fb14ce0.40eb24",
-        "wires": []
-    },
-    {
-        "id": "a673fd66.c40df",
-        "type": "save",
-        "name": "store $arridx somewhere in vpn-binding",
-        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\n<parameter name='vpn-type' value='`$arridx`' />\n\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3690,
-        "y": 3827,
-        "z": "4fb14ce0.40eb24",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "445052f3.f38194",
-        "type": "set",
-        "name": "set twoD arr",
-        "xml": "<set>\n\n<!--<parameter name='`tmp.arr[$arridx + 1]`' value='`$providerValue`' />-->\n<!--<parameter name='tmp.arr_length' value='`$tmp.arr_length + 1`' />-->\n\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].request-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id`' />\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].otn-source-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-node-id`' />\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].otn-dest-node`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-node-id`' />\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].bw-odu`' value=\"`'0,' + $gfp`\" />\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].src-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].src-access-ltp-id`' />\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].dst-ttp-id`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].dst-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].domainurl`' value=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-region`\" />\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].domainuser`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-description`' />\n<parameter name='`otn-tunnel-slice[$arridx].list[$sizeOfSliceList].domainpassword`' value='`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-platform`' />\n\n<!--<parameter name='otn-tunnel-slice_length' value='`$arridx + 2`' />-->\n<parameter name='`otn-tunnel-slice[$arridx].list_length`' value='`$sizeOfSliceList + 1`' />\n\n",
-        "comments": "",
-        "x": 3605,
-        "y": 3954,
-        "z": "4fb14ce0.40eb24",
-        "wires": []
-    },
-    {
-        "id": "51a35674.c610f8",
-        "type": "set",
-        "name": "set sizeOfSliceList",
-        "xml": "<set>\n<parameter name='sizeOfSliceList' value='`$otn-tunnel-slice[$arridx].list_length`' />\n\n\n",
-        "comments": "",
-        "x": 3626,
-        "y": 3890,
-        "z": "4fb14ce0.40eb24",
-        "wires": []
-    },
-    {
-        "id": "86199d64.75edc8",
-        "type": "break",
-        "name": "break",
-        "xml": "<break>\n",
-        "comments": "",
-        "x": 3584,
-        "y": 4021,
-        "z": "4fb14ce0.40eb24",
-        "wires": []
-    },
-    {
-        "id": "6a22d3fb.3389bc",
-        "type": "comment",
-        "name": "Important Comment",
-        "info": "When we are in F1, it means that, either:\nno-middle-man found\nor\nmiddle-man was found but PCE is needed.\n\nNo matter which scenario brings us to F1, vpn-binding-B is a \nnew vpn-binding so it needs to be attached to the:\nmiddle-man && connectivityB",
-        "comments": "",
-        "x": 2364,
-        "y": 3211,
-        "z": "4fb14ce0.40eb24",
-        "wires": []
-    },
     {
         "id": "13d7f319.f10ffd",
         "type": "set",
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 5f709bf0..d0f35f91 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,5239 +1,5654 @@
 [
-    {
-        "id": "4a2a1676.3e3ca",
-        "type": "dgstart",
-        "name": "DGSTART",
-        "outputs": 1,
-        "x": 107,
-        "y": 137,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "4dd41696.2f452"
-            ]
-        ]
-    },
-    {
-        "id": "4dd41696.2f452",
-        "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": 391.2856903076172,
-        "y": 198.23810863494873,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "44e593d9.2efad4"
-            ]
-        ]
-    },
-    {
-        "id": "44e593d9.2efad4",
-        "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": 397.42860412597656,
-        "y": 283.0000305175781,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "49513b93.fc23ac"
-            ]
-        ]
-    },
-    {
-        "id": "49513b93.fc23ac",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 747,
-        "y": 342,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "b2135089.199e6",
-                "23db3db6.da8e02",
-                "2b8995d5.8b0c7a"
-            ]
-        ]
-    },
-    {
-        "id": "b2135089.199e6",
-        "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": 1048.33349609375,
-        "y": 612.9302978515625,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "23db3db6.da8e02",
-        "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": 1069.761962890625,
-        "y": 315.33331298828125,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "b4c73c35.f93038",
-                "3d5524fd.e8ecb4",
-                "65a2b99e.db6b"
-            ]
-        ]
-    },
-    {
-        "id": "b4c73c35.f93038",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1294.761962890625,
-        "y": 173.33331298828125,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "8dbada70.49fdc8"
-            ]
-        ]
-    },
-    {
-        "id": "3d5524fd.e8ecb4",
-        "type": "not-found",
-        "name": "not-found",
-        "xml": "<outcome value='not-found'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1290.2529296875,
-        "y": 242.9073486328125,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "57a109f4.ebf0e8"
-            ]
-        ]
-    },
-    {
-        "id": "65a2b99e.db6b",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1278.761962890625,
-        "y": 289.33331298828125,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "60bf0db6.5a7ed4"
-            ]
-        ]
-    },
-    {
-        "id": "b4e2ba33.09b93",
-        "type": "comment",
-        "name": "new for TransportSlicing",
-        "info": "",
-        "comments": "",
-        "x": 1048.761962890625,
-        "y": 203.33331298828125,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "2b8995d5.8b0c7a",
-        "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": 1036.761962890625,
-        "y": 255.33331298828125,
-        "z": "2902829f.18c74e",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "8dbada70.49fdc8",
-        "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": 1535,
-        "y": 170,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "d1591597.ec80d8",
-                "57531373.e3de34"
-            ]
-        ]
-    },
-    {
-        "id": "57a109f4.ebf0e8",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 1445.0623779296875,
-        "y": 245.85977172851562,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "60bf0db6.5a7ed4",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
-        "comments": "",
-        "x": 1449,
-        "y": 290,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "d1591597.ec80d8",
-        "type": "outcomeTrue",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1740,
-        "y": 207,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "4fdc9fba.45ecc"
-            ]
-        ]
-    },
-    {
-        "id": "57531373.e3de34",
-        "type": "outcomeFalse",
-        "name": "false",
-        "xml": "<outcome value='false'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1750,
-        "y": 134,
-        "z": "2902829f.18c74e",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "4fdc9fba.45ecc",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 1733,
-        "y": 282,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "a7b4edd.d51559",
-                "2c272659.3a51ba",
-                "5c772a63.5a0db4",
-                "289d87b9.bd6eb8",
-                "58aa906f.8d52e"
-            ]
-        ]
-    },
-    {
-        "id": "23486bfb.15b8c4",
-        "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": 2219,
-        "y": 333,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "7220fecb.3a8288",
-                "32198bbf.43a4fc",
-                "5d55cc38.78e3ec"
-            ]
-        ]
-    },
-    {
-        "id": "7220fecb.3a8288",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2435,
-        "y": 400,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "fa7f120f.655768"
-            ]
-        ]
-    },
-    {
-        "id": "32198bbf.43a4fc",
-        "type": "not-found",
-        "name": "not-found",
-        "xml": "<outcome value='not-found'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2435.490966796875,
-        "y": 299.573974609375,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "b28e6d20.f339e8"
-            ]
-        ]
-    },
-    {
-        "id": "5d55cc38.78e3ec",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2431,
-        "y": 349,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "3d8a7dac.ce2c6a"
-            ]
-        ]
-    },
-    {
-        "id": "a7b4edd.d51559",
-        "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": 1936,
-        "y": 314,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "88b22f1d.3626",
-                "23486bfb.15b8c4",
-                "8ffbf90a.9a2a4",
-                "9ccad127.ffcf6"
-            ]
-        ]
-    },
-    {
-        "id": "88b22f1d.3626",
-        "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": 2216,
-        "y": 252,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "289d87b9.bd6eb8",
-        "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": 1910,
-        "y": 264,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "2c272659.3a51ba",
-        "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": 1953,
-        "y": 123,
-        "z": "2902829f.18c74e",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "5c772a63.5a0db4",
-        "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": 1965,
-        "y": 164,
-        "z": "2902829f.18c74e",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "7c71ad84.2ad9d4",
-        "type": "comment",
-        "name": "The following two nodes are for PCE",
-        "info": "",
-        "comments": "",
-        "x": 1990,
-        "y": 76,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "f16230fe.988a5",
-        "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": 1910,
-        "y": 210,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "b28e6d20.f339e8",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 2614,
-        "y": 302,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "3d8a7dac.ce2c6a",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
-        "comments": "",
-        "x": 2613.9375,
-        "y": 351.1402587890625,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "fa7f120f.655768",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 2615.9375,
-        "y": 402.1402587890625,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "e41c6870.5c2ef8"
-            ]
-        ]
-    },
-    {
-        "id": "e41c6870.5c2ef8",
-        "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": 2908.9375,
-        "y": 349.1402587890625,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "54a2b596.71e144",
-                "d130d716.0cf7a",
-                "2cc5b868.058328"
-            ]
-        ]
-    },
-    {
-        "id": "d130d716.0cf7a",
-        "type": "not-found",
-        "name": "not-found",
-        "xml": "<outcome value='not-found'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3182.428466796875,
-        "y": 241.7142333984375,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "b3a5f124.2cf16"
-            ]
-        ]
-    },
-    {
-        "id": "b3a5f124.2cf16",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 3360,
-        "y": 242,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "2cc5b868.058328",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3177.9375,
-        "y": 291.1402587890625,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "c7a34562.68f14"
-            ]
-        ]
-    },
-    {
-        "id": "c7a34562.68f14",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
-        "comments": "",
-        "x": 3359.9375,
-        "y": 291.1402587890625,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "54a2b596.71e144",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3181.9375,
-        "y": 342.1402587890625,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "bd0a4532.c3f628"
-            ]
-        ]
-    },
-    {
-        "id": "bd0a4532.c3f628",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 3361.9375,
-        "y": 342.1402587890625,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "f545f705.e2438"
-            ]
-        ]
-    },
-    {
-        "id": "f545f705.e2438",
-        "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": 2928,
-        "y": 477,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "333578f7.b029b",
-                "a1ea266d.8059"
-            ]
-        ]
-    },
-    {
-        "id": "a1ea266d.8059",
-        "type": "outcomeFalse",
-        "name": "false",
-        "xml": "<outcome value='false'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3238,
-        "y": 484,
-        "z": "2902829f.18c74e",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "333578f7.b029b",
-        "type": "outcomeTrue",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3237,
-        "y": 538,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "76551384.dcd284"
-            ]
-        ]
-    },
-    {
-        "id": "b7449756.393128",
-        "type": "outcome",
-        "name": "network-policy",
-        "xml": "<outcome value='network-policy'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3982,
-        "y": 492,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "497604b.3da63fc"
-            ]
-        ]
-    },
-    {
-        "id": "497604b.3da63fc",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 4158.9998779296875,
-        "y": 484.9998779296875,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "5622eb31.c6aaa4",
-                "f42a71d2.4e018"
-            ]
-        ]
-    },
-    {
-        "id": "76551384.dcd284",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 3401,
-        "y": 464,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "4cba462a.39c2",
-                "cfce2e8c.cb8c08"
-            ]
-        ]
-    },
-    {
-        "id": "4cba462a.39c2",
-        "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": 3682,
-        "y": 420,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "96ce5ffe.418c6"
-            ]
-        ]
-    },
-    {
-        "id": "96ce5ffe.418c6",
-        "type": "switchNode",
-        "name": "switch related-to",
-        "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3944,
-        "y": 420,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "b7449756.393128"
-            ]
-        ]
-    },
-    {
-        "id": "5622eb31.c6aaa4",
-        "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": 4401.9998779296875,
-        "y": 441.9998779296875,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "f42a71d2.4e018",
-        "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": 4390.9998779296875,
-        "y": 496.9998779296875,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "d27d0859.022f28",
-                "109e108a.071aff",
-                "335266e0.15cee2"
-            ]
-        ]
-    },
-    {
-        "id": "335266e0.15cee2",
-        "type": "not-found",
-        "name": "not-found",
-        "xml": "<outcome value='not-found'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 4644,
-        "y": 383,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "a7539c87.81698"
-            ]
-        ]
-    },
-    {
-        "id": "a7539c87.81698",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 4792.571533203125,
-        "y": 383.2857666015625,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "3deb078.64eee78",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
-        "comments": "",
-        "x": 4791.509033203125,
-        "y": 427.426025390625,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "109e108a.071aff",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 4632.509033203125,
-        "y": 427.426025390625,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "3deb078.64eee78"
-            ]
-        ]
-    },
-    {
-        "id": "d27d0859.022f28",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 4639.509033203125,
-        "y": 506.426025390625,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "fa515a9e.7b382"
-            ]
-        ]
-    },
-    {
-        "id": "fa515a9e.7b382",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 4778.509033203125,
-        "y": 506.426025390625,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "f8e42c4e.db7c",
-                "af21638c.1e4978"
-            ]
-        ]
-    },
-    {
-        "id": "f8e42c4e.db7c",
-        "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": 4984,
-        "y": 504,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "af21638c.1e4978",
-        "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": 4983,
-        "y": 550,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "cfce2e8c.cb8c08",
-        "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": 3499,
-        "y": 536,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "d81e40de.4db928"
-            ]
-        ]
-    },
-    {
-        "id": "d81e40de.4db928",
-        "type": "switchNode",
-        "name": "switch related-to",
-        "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3779,
-        "y": 536,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "5031094a.3c0128"
-            ]
-        ]
-    },
-    {
-        "id": "5031094a.3c0128",
-        "type": "outcome",
-        "name": "logical-link",
-        "xml": "<outcome value='logical-link'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2192.0001220703125,
-        "y": 789.0001220703125,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "e73c28db.21f4e"
-            ]
-        ]
-    },
-    {
-        "id": "e73c28db.21f4e",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 2369,
-        "y": 782,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "315e52b1.1cc22e",
-                "35f8f7f9.459f"
-            ]
-        ]
-    },
-    {
-        "id": "315e52b1.1cc22e",
-        "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": 2612,
-        "y": 739,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "35f8f7f9.459f",
-        "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": 2601,
-        "y": 794,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "d939ca6a.3080e8",
-                "9cfbb845.158be",
-                "6d8b4fc3.7b3018"
-            ]
-        ]
-    },
-    {
-        "id": "d939ca6a.3080e8",
-        "type": "not-found",
-        "name": "not-found",
-        "xml": "<outcome value='not-found'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2892.490966796875,
-        "y": 772.573974609375,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "107f7ba4.2d7e2c"
-            ]
-        ]
-    },
-    {
-        "id": "9cfbb845.158be",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2881,
-        "y": 817,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "acf32404.78571"
-            ]
-        ]
-    },
-    {
-        "id": "107f7ba4.2d7e2c",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 3041.0625,
-        "y": 772.8597412109375,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "acf32404.78571",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
-        "comments": "",
-        "x": 3040,
-        "y": 817,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "6d8b4fc3.7b3018",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2888,
-        "y": 896,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "5fee2f71.e558f"
-            ]
-        ]
-    },
-    {
-        "id": "5fee2f71.e558f",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 3027,
-        "y": 896,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "eaccb004.7e72b",
-                "eb22e702.6eba4",
-                "86c2cb32.4be2a",
-                "1855e375.e26f95",
-                "a98465a.ebb3518",
-                "c39134de.e7bb78",
-                "2345afcc.0ac648",
-                "a5a8afe4.995398",
-                "2419d5d3.394c4a",
-                "7c523485.24203c",
-                "6836f0a.48b871",
-                "b794c846.a3a7a8",
-                "2e62e80b.5f4db"
-            ]
-        ]
-    },
-    {
-        "id": "ecf79c2.e9d746",
-        "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": 3341,
-        "y": 702,
-        "z": "2902829f.18c74e",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "eaccb004.7e72b",
-        "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": 3322,
-        "y": 752,
-        "z": "2902829f.18c74e",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "c7da7bbe.4fbda",
-        "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": 3279,
-        "y": 797,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "eb22e702.6eba4",
-        "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": 3254,
-        "y": 860,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "86c2cb32.4be2a",
-        "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": 3255,
-        "y": 915,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "1855e375.e26f95",
-        "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": 3271,
-        "y": 963,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "a1f10f8e.c2622",
-                "ab6386aa.ce2908",
-                "465cfd34.a22f5c"
-            ]
-        ]
-    },
-    {
-        "id": "a98465a.ebb3518",
-        "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": 3260,
-        "y": 1049.9998779296875,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "1727bd6.343d1c3",
-                "193b021d.8148b6",
-                "fa057cc5.1269c"
-            ]
-        ]
-    },
-    {
-        "id": "a1f10f8e.c2622",
-        "type": "not-found",
-        "name": "not-found",
-        "xml": "<outcome value='not-found'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3472,
-        "y": 847,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "ef53d37a.78768"
-            ]
-        ]
-    },
-    {
-        "id": "ab6386aa.ce2908",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3467.509033203125,
-        "y": 896.426025390625,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "2e203f6c.c03ed"
-            ]
-        ]
-    },
-    {
-        "id": "465cfd34.a22f5c",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3471.509033203125,
-        "y": 949.426025390625,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "187fdc98.499a83"
-            ]
-        ]
-    },
-    {
-        "id": "ef53d37a.78768",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 3620.571533203125,
-        "y": 846.2857666015625,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "2e203f6c.c03ed",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
-        "comments": "",
-        "x": 3610.509033203125,
-        "y": 896.426025390625,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "1727bd6.343d1c3",
-        "type": "not-found",
-        "name": "not-found",
-        "xml": "<outcome value='not-found'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3483,
-        "y": 1019.9998779296875,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "d09d8aa1.f9ab4"
-            ]
-        ]
-    },
-    {
-        "id": "193b021d.8148b6",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3478.509033203125,
-        "y": 1069.4259033203125,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "b9e292a1.c9c0e8"
-            ]
-        ]
-    },
-    {
-        "id": "fa057cc5.1269c",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3479.509033203125,
-        "y": 1122.4259033203125,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "eb27f87a.b5a63"
-            ]
-        ]
-    },
-    {
-        "id": "d09d8aa1.f9ab4",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 3631.571533203125,
-        "y": 1019.28564453125,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "b9e292a1.c9c0e8",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
-        "comments": "",
-        "x": 3621.509033203125,
-        "y": 1069.4259033203125,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "187fdc98.499a83",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 3633,
-        "y": 949,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "c01f8fee.f337d8"
-            ]
-        ]
-    },
-    {
-        "id": "eb27f87a.b5a63",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 3633,
-        "y": 1121.9998779296875,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "1b75ad85.419ffa"
-            ]
-        ]
-    },
-    {
-        "id": "c01f8fee.f337d8",
-        "type": "switchNode",
-        "name": "switch nr type",
-        "xml": "<switch test='`$tmp.aai.network-route-one.type`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3805,
-        "y": 949,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "363c4a34.666d16",
-                "db7701b7.1114a8"
-            ]
-        ]
-    },
-    {
-        "id": "1b75ad85.419ffa",
-        "type": "switchNode",
-        "name": "switch nr type",
-        "xml": "<switch test='`$tmp.aai.network-route-two.type`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3806,
-        "y": 1122,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "be2b6c76.ff3af8",
-                "8a677a0d.0b4e4"
-            ]
-        ]
-    },
-    {
-        "id": "363c4a34.666d16",
-        "type": "outcome",
-        "name": "ROOT",
-        "xml": "<outcome value='ROOT'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3981,
-        "y": 928,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "91c5280b.7efb48"
-            ]
-        ]
-    },
-    {
-        "id": "db7701b7.1114a8",
-        "type": "outcome",
-        "name": "LEAF",
-        "xml": "<outcome value='LEAF'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3983,
-        "y": 982,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "feb127dc.b0fca"
-            ]
-        ]
-    },
-    {
-        "id": "be2b6c76.ff3af8",
-        "type": "outcome",
-        "name": "ROOT",
-        "xml": "<outcome value='ROOT'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3982,
-        "y": 1092,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "66434378.88cb14"
-            ]
-        ]
-    },
-    {
-        "id": "8a677a0d.0b4e4",
-        "type": "outcome",
-        "name": "LEAF",
-        "xml": "<outcome value='LEAF'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3984,
-        "y": 1146,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "7a8a47a9.7cb0d8"
-            ]
-        ]
-    },
-    {
-        "id": "9215f524.47a16",
-        "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": 4291,
-        "y": 880,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "c685113.a58967",
-        "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": 4284,
-        "y": 978,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "9ce6893.2318f78",
-        "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": 4284,
-        "y": 1065,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "82c37441.0afd98",
-        "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": 4288,
-        "y": 1158,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "33d383f1.734384",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3515,
-        "y": 1567,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "538c6639.6c6368"
-            ]
-        ]
-    },
-    {
-        "id": "1103f778.e68a59",
-        "type": "not-found",
-        "name": "not-found",
-        "xml": "<outcome value='not-found'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3524.490966796875,
-        "y": 1609.5740356445312,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "a7a47c61.df546"
-            ]
-        ]
-    },
-    {
-        "id": "e542ccd0.a278f8",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3513,
-        "y": 1656,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "754b02d5.434a64"
-            ]
-        ]
-    },
-    {
-        "id": "9291fa20.ad2b7",
-        "type": "comment",
-        "name": "Question?",
-        "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
-        "comments": "",
-        "x": 3215,
-        "y": 1529,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "2345afcc.0ac648",
-        "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": 3258,
-        "y": 1594,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "33d383f1.734384",
-                "1103f778.e68a59",
-                "e542ccd0.a278f8"
-            ]
-        ]
-    },
-    {
-        "id": "c39134de.e7bb78",
-        "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": 3259,
-        "y": 1264,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "846097ad.2e1c3",
-                "39e06a12.c523ae"
-            ]
-        ]
-    },
-    {
-        "id": "39e06a12.c523ae",
-        "type": "failure",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3482,
-        "y": 1250,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "f0966fa1.0b829"
-            ]
-        ]
-    },
-    {
-        "id": "846097ad.2e1c3",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3484,
-        "y": 1283,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "36674d51.b9eb9a"
-            ]
-        ]
-    },
-    {
-        "id": "538c6639.6c6368",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 3687.66650390625,
-        "y": 1566,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "6fff18a2.92ea08",
-                "f3044461.d6a5a8"
-            ]
-        ]
-    },
-    {
-        "id": "a7a47c61.df546",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 3678.0623779296875,
-        "y": 1612.8597717285156,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "754b02d5.434a64",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
-        "comments": "",
-        "x": 3682,
-        "y": 1657,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "6fff18a2.92ea08",
-        "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": 3952,
-        "y": 1550,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "d1ee9b94.2f27a",
-                "6eb5b0d3.7baf78"
-            ]
-        ]
-    },
-    {
-        "id": "6eb5b0d3.7baf78",
-        "type": "failure",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 4175,
-        "y": 1505,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "f1c76342.65c028"
-            ]
-        ]
-    },
-    {
-        "id": "d1ee9b94.2f27a",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 4177,
-        "y": 1569,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "7b8cb4e4.928c34"
-            ]
-        ]
-    },
-    {
-        "id": "7b8cb4e4.928c34",
-        "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": 4339,
-        "y": 1565,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "f1c76342.65c028",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 4340,
-        "y": 1502,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "2b4fe89a.1b97b",
-                "666bc5e4.57107c"
-            ]
-        ]
-    },
-    {
-        "id": "272ec148.b5240e",
-        "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": 3954,
-        "y": 1709,
-        "z": "2902829f.18c74e",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "5865c90a.cd5358",
-        "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": 3999,
-        "y": 1619,
-        "z": "2902829f.18c74e",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "cab25a0.579bfa8",
-        "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": 4082,
-        "y": 1757,
-        "z": "2902829f.18c74e",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "36674d51.b9eb9a",
-        "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": 3627,
-        "y": 1280,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "f0966fa1.0b829",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 3630,
-        "y": 1243,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "1289ab88.c47cfc",
-                "43b7d27f.a3c314"
-            ]
-        ]
-    },
-    {
-        "id": "1289ab88.c47cfc",
-        "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": 3804,
-        "y": 1199,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "f3044461.d6a5a8",
-        "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": 3906,
-        "y": 1834,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "1efd3cc0.01265b"
-            ]
-        ]
-    },
-    {
-        "id": "1efd3cc0.01265b",
-        "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": 4112,
-        "y": 1834,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "42b8e904.3e26e8"
-            ]
-        ]
-    },
-    {
-        "id": "42b8e904.3e26e8",
-        "type": "outcome",
-        "name": "tunnel-termination-point",
-        "xml": "<outcome value='tunnel-termination-point'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 4327.28564453125,
-        "y": 1833.82177734375,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "c27d35dc.5f20a"
-            ]
-        ]
-    },
-    {
-        "id": "43b7d27f.a3c314",
-        "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": 3819,
-        "y": 1310,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "818754d0.62847",
-                "ffd47564.1fe1e",
-                "154b0ca5.d55e4b"
-            ]
-        ]
-    },
-    {
-        "id": "818754d0.62847",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 4014.5001220703125,
-        "y": 1262,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "c3499a0a.3a08a"
-            ]
-        ]
-    },
-    {
-        "id": "ffd47564.1fe1e",
-        "type": "not-found",
-        "name": "not-found",
-        "xml": "<outcome value='not-found'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 4006.5001220703125,
-        "y": 1317,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "deee5298.4209e"
-            ]
-        ]
-    },
-    {
-        "id": "154b0ca5.d55e4b",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 4011.5001220703125,
-        "y": 1374,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "a4184f75.2f4fc8"
-            ]
-        ]
-    },
-    {
-        "id": "a4184f75.2f4fc8",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return 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": 4163.5001220703125,
-        "y": 1375,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "deee5298.4209e",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 4174.5001220703125,
-        "y": 1320,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "c3499a0a.3a08a",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 4158.8824462890625,
-        "y": 1259.6556701660156,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "ece91d8.33480e"
-            ]
-        ]
-    },
-    {
-        "id": "ece91d8.33480e",
-        "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": 4343,
-        "y": 1274,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "3d2e74e0.b28254"
-            ]
-        ]
-    },
-    {
-        "id": "666bc5e4.57107c",
-        "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": 4510,
-        "y": 1460,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "2b4fe89a.1b97b",
-        "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": 4511,
-        "y": 1568,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "990e20c9.dc548",
-        "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": 4512,
-        "y": 1517,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "c27d35dc.5f20a",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 4534.1171875,
-        "y": 1834.34033203125,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "4705b8ac.369ff8",
-                "140bf681.97f4d1",
-                "169362ec.4e0805"
-            ]
-        ]
-    },
-    {
-        "id": "4705b8ac.369ff8",
-        "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": 4749.1171875,
-        "y": 1796.34033203125,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "140bf681.97f4d1",
-        "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": 4746.1171875,
-        "y": 1835.34033203125,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "44788f51.dcb608"
-            ]
-        ]
-    },
-    {
-        "id": "169362ec.4e0805",
-        "type": "break",
-        "name": "break",
-        "xml": "<break>\n",
-        "comments": "",
-        "x": 4701.6171875,
-        "y": 1877.34033203125,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "44788f51.dcb608",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 4926.6171875,
-        "y": 1834.34033203125,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "96d5e3b9.3b004"
-            ]
-        ]
-    },
-    {
-        "id": "a25be771.e58d08",
-        "type": "outcome",
-        "name": "esr-thirdparty-sdnc",
-        "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 4741,
-        "y": 1278,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "766cd179.71ceb"
-            ]
-        ]
-    },
-    {
-        "id": "766cd179.71ceb",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 4918,
-        "y": 1270,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "4a39420e.bbc88c",
-                "db93fd8f.b0686"
-            ]
-        ]
-    },
-    {
-        "id": "3d2e74e0.b28254",
-        "type": "switchNode",
-        "name": "switch related-to",
-        "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 4538,
-        "y": 1274,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "a25be771.e58d08",
-                "a5fe54fc.22f278"
-            ]
-        ]
-    },
-    {
-        "id": "a5fe54fc.22f278",
-        "type": "outcome",
-        "name": "network-resource",
-        "xml": "<outcome value='network-resource'>",
-        "comments": "",
-        "outputs": 1,
-        "x": 4744,
-        "y": 1352,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "b8ffc162.40264"
-            ]
-        ]
-    },
-    {
-        "id": "b8ffc162.40264",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 4921,
-        "y": 1344,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "401010e9.39d95"
-            ]
-        ]
-    },
-    {
-        "id": "96d5e3b9.3b004",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 5084.6171875,
-        "y": 1834.34033203125,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "8dcf461b.b0a6b8"
-            ]
-        ]
-    },
-    {
-        "id": "8dcf461b.b0a6b8",
-        "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": 5291.6171875,
-        "y": 1834.34033203125,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "db93fd8f.b0686",
-        "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": 5126,
-        "y": 1277,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "1554906a.f71e68",
-                "e44344a3.bb67b8",
-                "e5d285d7.a1a42"
-            ]
-        ]
-    },
-    {
-        "id": "4a39420e.bbc88c",
-        "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": 5156,
-        "y": 1225,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "1554906a.f71e68",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 5336,
-        "y": 1268,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "169a2bda.d46874"
-            ]
-        ]
-    },
-    {
-        "id": "e44344a3.bb67b8",
-        "type": "not-found",
-        "name": "not-found",
-        "xml": "<outcome value='not-found'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 5328,
-        "y": 1323,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "81a51254.f91678"
-            ]
-        ]
-    },
-    {
-        "id": "e5d285d7.a1a42",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 5333,
-        "y": 1380,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "318f7e74.4a0292"
-            ]
-        ]
-    },
-    {
-        "id": "318f7e74.4a0292",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return 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": 5485,
-        "y": 1381,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "81a51254.f91678",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 5496,
-        "y": 1326,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "169a2bda.d46874",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 5480.38232421875,
-        "y": 1265.6556701660156,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "40d562bc.5b73a4"
-            ]
-        ]
-    },
-    {
-        "id": "401010e9.39d95",
-        "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": 5156,
-        "y": 1468,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "40d562bc.5b73a4",
-        "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": 5695,
-        "y": 1262,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "8e9cd61c.43d1a",
-        "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": 4279,
-        "y": 916,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "ecfdf50c.08026",
-        "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": 4270,
-        "y": 1014,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "91c5280b.7efb48",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 4104,
-        "y": 922,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "9215f524.47a16",
-                "8e9cd61c.43d1a"
-            ]
-        ]
-    },
-    {
-        "id": "feb127dc.b0fca",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 4110,
-        "y": 986,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "c685113.a58967",
-                "ecfdf50c.08026"
-            ]
-        ]
-    },
-    {
-        "id": "66434378.88cb14",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 4110,
-        "y": 1092,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "9ce6893.2318f78",
-                "caa465e0.6dcff"
-            ]
-        ]
-    },
-    {
-        "id": "7a8a47a9.7cb0d8",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 4113,
-        "y": 1145,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "82c37441.0afd98",
-                "7e59d376.e30294"
-            ]
-        ]
-    },
-    {
-        "id": "caa465e0.6dcff",
-        "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": 4270,
-        "y": 1105,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "7e59d376.e30294",
-        "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": 4273,
-        "y": 1196,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "c59f074a.c0fcd",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 3645,
-        "y": 2406,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "e6449278.7ffcc8",
-                "87feacf7.c38bf8"
-            ]
-        ]
-    },
-    {
-        "id": "504f1aa.eb8e864",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3472.33349609375,
-        "y": 2407,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "c59f074a.c0fcd"
-            ]
-        ]
-    },
-    {
-        "id": "a37a9324.8cee68",
-        "type": "not-found",
-        "name": "not-found",
-        "xml": "<outcome value='not-found'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3481.824462890625,
-        "y": 2449.5740356445312,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "2466115d.057356"
-            ]
-        ]
-    },
-    {
-        "id": "73c3286f.8eb8c8",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3470.33349609375,
-        "y": 2496,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "e7809543.d60ec"
-            ]
-        ]
-    },
-    {
-        "id": "2466115d.057356",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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.3958740234375,
-        "y": 2452.8597717285156,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "e7809543.d60ec",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
-        "comments": "",
-        "x": 3639.33349609375,
-        "y": 2497,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "e6449278.7ffcc8",
-        "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": 3931.33349609375,
-        "y": 2410.0001220703125,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "b831939d.d94",
-                "5cb920bb.aff4d"
-            ]
-        ]
-    },
-    {
-        "id": "5cb920bb.aff4d",
-        "type": "failure",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 4154.33349609375,
-        "y": 2365.0001220703125,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "cf6e6c99.56f7a"
-            ]
-        ]
-    },
-    {
-        "id": "b831939d.d94",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 4156.33349609375,
-        "y": 2429.0001220703125,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "3583978e.f629a8"
-            ]
-        ]
-    },
-    {
-        "id": "3583978e.f629a8",
-        "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": 4315.33349609375,
-        "y": 2448.0001220703125,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "cf6e6c99.56f7a",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 4319.33349609375,
-        "y": 2362.0001220703125,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "528dc079.e1b708",
-                "ef41d4a6.237198"
-            ]
-        ]
-    },
-    {
-        "id": "70e4a574.f2fbdc",
-        "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": 3933.33349609375,
-        "y": 2569.0001220703125,
-        "z": "2902829f.18c74e",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "6fa4c461.e1732c",
-        "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": 3978.33349609375,
-        "y": 2479.0001220703125,
-        "z": "2902829f.18c74e",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "418cf3ce.c7d714",
-        "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": 4060.33349609375,
-        "y": 2634.0001220703125,
-        "z": "2902829f.18c74e",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "2419d5d3.394c4a",
-        "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": 3244.33349609375,
-        "y": 2442,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "504f1aa.eb8e864",
-                "a37a9324.8cee68",
-                "73c3286f.8eb8c8"
-            ]
-        ]
-    },
-    {
-        "id": "b8dec384.717cf",
-        "type": "comment",
-        "name": "Question?",
-        "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
-        "comments": "",
-        "x": 3205.33349609375,
-        "y": 2386,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "a5a8afe4.995398",
-        "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": 3262.33349609375,
-        "y": 2104.9998779296875,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "9c54fa6.d2aa308",
-                "ba5d54d9.fee348"
-            ]
-        ]
-    },
-    {
-        "id": "ba5d54d9.fee348",
-        "type": "failure",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3485.33349609375,
-        "y": 2090.9998779296875,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "64c87509.eed4dc"
-            ]
-        ]
-    },
-    {
-        "id": "9c54fa6.d2aa308",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3487.33349609375,
-        "y": 2123.9998779296875,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "bff9d45d.398f6"
-            ]
-        ]
-    },
-    {
-        "id": "bff9d45d.398f6",
-        "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": 3630.33349609375,
-        "y": 2120.9998779296875,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "64c87509.eed4dc",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 3633.33349609375,
-        "y": 2083.9998779296875,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "68ddabff.26f77c",
-                "3932be0c.eefdc2"
-            ]
-        ]
-    },
-    {
-        "id": "68ddabff.26f77c",
-        "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": 3827.33349609375,
-        "y": 2087,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "87feacf7.c38bf8",
-        "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": 3890.33349609375,
-        "y": 2719,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "1be50176.34f787"
-            ]
-        ]
-    },
-    {
-        "id": "1be50176.34f787",
-        "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": 4096.33349609375,
-        "y": 2719,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "e1f7ff3.daa43"
-            ]
-        ]
-    },
-    {
-        "id": "e1f7ff3.daa43",
-        "type": "outcome",
-        "name": "tunnel-termination-point",
-        "xml": "<outcome value='tunnel-termination-point'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 4313.619140625,
-        "y": 2717.82177734375,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "2a02e2d9.dc0d9e"
-            ]
-        ]
-    },
-    {
-        "id": "3932be0c.eefdc2",
-        "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": 3849.33349609375,
-        "y": 2155,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "2d0f7089.d1dde8",
-                "fd005c4a.d8bf",
-                "939e8fdc.7e7718"
-            ]
-        ]
-    },
-    {
-        "id": "2d0f7089.d1dde8",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 4044.8336181640625,
-        "y": 2107,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "30cca3a0.b1e984"
-            ]
-        ]
-    },
-    {
-        "id": "fd005c4a.d8bf",
-        "type": "not-found",
-        "name": "not-found",
-        "xml": "<outcome value='not-found'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 4036.8336181640625,
-        "y": 2162,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "13a9ea53.f74e26"
-            ]
-        ]
-    },
-    {
-        "id": "939e8fdc.7e7718",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 4041.8336181640625,
-        "y": 2219,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "7b021b51.27b804"
-            ]
-        ]
-    },
-    {
-        "id": "7b021b51.27b804",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return 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": 4193.8336181640625,
-        "y": 2220,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "13a9ea53.f74e26",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 4204.8336181640625,
-        "y": 2165,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "30cca3a0.b1e984",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 4189.2159423828125,
-        "y": 2104.6556701660156,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "b6ffbea1.954de"
-            ]
-        ]
-    },
-    {
-        "id": "528dc079.e1b708",
-        "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": 4489.33349609375,
-        "y": 2323.0001220703125,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "ef41d4a6.237198",
-        "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": 4490.33349609375,
-        "y": 2428.0001220703125,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "442d43d7.782e7c",
-        "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": 4485.33349609375,
-        "y": 2377.0001220703125,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "2a02e2d9.dc0d9e",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 4520.45068359375,
-        "y": 2707.3404541015625,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "c9847dda.408b8",
-                "34fbe7b.83d4898",
-                "25621ae5.b8be26"
-            ]
-        ]
-    },
-    {
-        "id": "c9847dda.408b8",
-        "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": 4735.45068359375,
-        "y": 2669.3404541015625,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "34fbe7b.83d4898",
-        "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": 4732.45068359375,
-        "y": 2708.3404541015625,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "57e83a4e.a0aa6c"
-            ]
-        ]
-    },
-    {
-        "id": "25621ae5.b8be26",
-        "type": "break",
-        "name": "break",
-        "xml": "<break>\n",
-        "comments": "",
-        "x": 4687.95068359375,
-        "y": 2750.3404541015625,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "57e83a4e.a0aa6c",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 4912.95068359375,
-        "y": 2707.3404541015625,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "1bf054a.fc9602b"
-            ]
-        ]
-    },
-    {
-        "id": "1bf054a.fc9602b",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 5070.95068359375,
-        "y": 2707.3404541015625,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "84673a73.b83338"
-            ]
-        ]
-    },
-    {
-        "id": "84673a73.b83338",
-        "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": 5277.95068359375,
-        "y": 2707.3404541015625,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "d76262ee.41fc78",
-        "type": "outcome",
-        "name": "esr-thirdparty-sdnc",
-        "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 4771.33349609375,
-        "y": 2123,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "16ae4cb2.9049f3"
-            ]
-        ]
-    },
-    {
-        "id": "16ae4cb2.9049f3",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 4948.33349609375,
-        "y": 2115,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "e86ea938.d56ff",
-                "3118b07d.f07b4"
-            ]
-        ]
-    },
-    {
-        "id": "b6ffbea1.954de",
-        "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": 4373.33349609375,
-        "y": 2119,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "b9078c68.40a298"
-            ]
-        ]
-    },
-    {
-        "id": "b9078c68.40a298",
-        "type": "switchNode",
-        "name": "switch related-to",
-        "xml": "<switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 4568.33349609375,
-        "y": 2119,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "d76262ee.41fc78",
-                "b2b1c906.01de2"
-            ]
-        ]
-    },
-    {
-        "id": "3118b07d.f07b4",
-        "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": 5156.33349609375,
-        "y": 2122,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "6c958b0a.19f5a4",
-                "118baae.84358d5",
-                "1250b3fe.a83aa4"
-            ]
-        ]
-    },
-    {
-        "id": "a44d9faa.fe0e4",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 4950.33349609375,
-        "y": 2188,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "b2c88a89.6bb6d"
-            ]
-        ]
-    },
-    {
-        "id": "b2b1c906.01de2",
-        "type": "outcome",
-        "name": "network-resource",
-        "xml": "<outcome value='network-resource'>",
-        "comments": "",
-        "outputs": 1,
-        "x": 4773.33349609375,
-        "y": 2196,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "a44d9faa.fe0e4"
-            ]
-        ]
-    },
-    {
-        "id": "e86ea938.d56ff",
-        "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": 5186.33349609375,
-        "y": 2070,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "b2c88a89.6bb6d",
-        "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": 5185.33349609375,
-        "y": 2312,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "6c958b0a.19f5a4",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 5366.33349609375,
-        "y": 2113,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "2e246f5a.b4103"
-            ]
-        ]
-    },
-    {
-        "id": "118baae.84358d5",
-        "type": "not-found",
-        "name": "not-found",
-        "xml": "<outcome value='not-found'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 5358.33349609375,
-        "y": 2168,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "66d6dc00.1bed6c"
-            ]
-        ]
-    },
-    {
-        "id": "1250b3fe.a83aa4",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 5363.33349609375,
-        "y": 2225,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "795bee7e.95831"
-            ]
-        ]
-    },
-    {
-        "id": "795bee7e.95831",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return 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": 5515.33349609375,
-        "y": 2226,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "66d6dc00.1bed6c",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 5526.33349609375,
-        "y": 2171,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "2e246f5a.b4103",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 5510.7158203125,
-        "y": 2110.6556701660156,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "c7de596d.cf628"
-            ]
-        ]
-    },
-    {
-        "id": "c7de596d.cf628",
-        "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": 5725.33349609375,
-        "y": 2107,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "7c523485.24203c",
-        "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`\" />\n<parameter name='tmp.LEAF.uni-tp-id' value=\"`$tmp.src.ltpId`\" />\n",
-        "comments": "",
-        "x": 3224,
-        "y": 1717,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "fded3756.dad178",
-        "type": "comment",
-        "name": "This is it (should be)",
-        "info": "",
-        "comments": "",
-        "x": 4446,
-        "y": 1000,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "3766add2.8d805a",
-        "type": "comment",
-        "name": "This is it (should be)",
-        "info": "",
-        "comments": "",
-        "x": 4438,
-        "y": 1090,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "6836f0a.48b871",
-        "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`\" />\n<parameter name='tmp.ROOT.uni-tp-id' value=\"`$tmp.dst.ltpId`\" />\n",
-        "comments": "",
-        "x": 3205,
-        "y": 2573,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "b794c846.a3a7a8",
-        "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": 3356,
-        "y": 2821,
-        "z": "2902829f.18c74e",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "2e62e80b.5f4db",
-        "type": "switchNode",
-        "name": "switch found-middle-man?",
-        "xml": "<switch test='`$found-middle-man`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3233,
-        "y": 2931,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "91c4e5f7.8ea498",
-                "651d0ecc.91f9"
-            ]
-        ]
-    },
-    {
-        "id": "91c4e5f7.8ea498",
-        "type": "outcomeFalse",
-        "name": "false",
-        "xml": "<outcome value='false'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3417,
-        "y": 2910,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "e83ca4b2.702b38"
-            ]
-        ]
-    },
-    {
-        "id": "651d0ecc.91f9",
-        "type": "outcomeTrue",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3348,
-        "y": 4835,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "e7980e09.0eb63"
-            ]
-        ]
-    },
-    {
-        "id": "e7980e09.0eb63",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 3503,
-        "y": 4828,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "1aa8a9f7.34b03e",
-                "b0ed6ff1.30772",
-                "727be5c.c27771c"
-            ]
-        ]
-    },
-    {
-        "id": "e83ca4b2.702b38",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 3560,
-        "y": 2910,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "d8bbc948.15f3d",
-                "4c5911e7.00bf",
-                "12a3e526.881a1b",
-                "832127bd.deb14",
-                "310c39f.91bd146",
-                "10ac9372.85589d",
-                "eff2b9f.ec05748",
-                "e161ec1a.4abce",
-                "9f446fe.9ec171",
-                "53557e78.f7c168",
-                "a884ac0.a40fdd8",
-                "7b528859.fb04",
-                "4b76c053.d564f8",
-                "90ff1f35.eee16",
-                "1b3c7e18.ddb16a",
-                "3e78a7bc.55ca98",
-                "8cf629c6.d63328"
-            ]
-        ]
-    },
-    {
-        "id": "9f446fe.9ec171",
-        "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": 3871,
-        "y": 3265,
-        "z": "2902829f.18c74e",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "d8bbc948.15f3d",
-        "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": 3825,
-        "y": 3363,
-        "z": "2902829f.18c74e",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "4c5911e7.00bf",
-        "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": 3961,
-        "y": 3410,
-        "z": "2902829f.18c74e",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "ec410c1b.c077a8",
-        "type": "comment",
-        "name": "Create ROOT connectivity",
-        "info": "",
-        "comments": "",
-        "x": 3792,
-        "y": 3214,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "d6af901.13a67f",
-        "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": 4318,
-        "y": 3705,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "12a3e526.881a1b",
-        "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": 3882,
-        "y": 3744,
-        "z": "2902829f.18c74e",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "832127bd.deb14",
-        "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": 3830,
-        "y": 3795,
-        "z": "2902829f.18c74e",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "310c39f.91bd146",
-        "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": 3966,
-        "y": 3842,
-        "z": "2902829f.18c74e",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "dff7d863.27131",
-        "type": "comment",
-        "name": "Create MIDDLE-MAN connectivity",
-        "info": "",
-        "comments": "",
-        "x": 3823,
-        "y": 3704,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "7b814ee5.031238",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 4253,
-        "y": 3901,
-        "z": "2902829f.18c74e",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "10ac9372.85589d",
-        "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": 3844,
-        "y": 3948,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "7001b67.e717f48",
-                "2d31ff61.2f04d",
-                "ccc557b3.890908"
-            ]
-        ]
-    },
-    {
-        "id": "7001b67.e717f48",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 4091,
-        "y": 3902,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "7b814ee5.031238"
-            ]
-        ]
-    },
-    {
-        "id": "2d31ff61.2f04d",
-        "type": "not-found",
-        "name": "not-found",
-        "xml": "<outcome value='not-found'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 4091.490966796875,
-        "y": 3947.5740356445312,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "cf949a05.c89aa8"
-            ]
-        ]
-    },
-    {
-        "id": "ccc557b3.890908",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 4089,
-        "y": 3991,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "e98195a6.6d12"
-            ]
-        ]
-    },
-    {
-        "id": "cf949a05.c89aa8",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 4254.0623779296875,
-        "y": 3947.8597717285156,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "e98195a6.6d12",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
-        "comments": "",
-        "x": 4258,
-        "y": 3992,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "1b3c7e18.ddb16a",
-        "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": 3901,
-        "y": 4227,
-        "z": "2902829f.18c74e",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "3e78a7bc.55ca98",
-        "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": 3904,
-        "y": 4272,
-        "z": "2902829f.18c74e",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "15c4d898.5d69ef",
-        "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": 3893,
-        "y": 4063,
-        "z": "2902829f.18c74e",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "b9514e95.f8a09",
-        "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": 3895,
-        "y": 4110,
-        "z": "2902829f.18c74e",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "c557914b.681778",
-        "type": "comment",
-        "name": "The following two will be done in F1",
-        "info": "",
-        "comments": "",
-        "x": 3817,
-        "y": 4180,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "55d807b9.9e0f1",
-        "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": 4424,
-        "y": 4909,
-        "z": "2902829f.18c74e",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "1aa8a9f7.34b03e",
-        "type": "switchNode",
-        "name": "switch no-pce-call",
-        "xml": "<switch test='`$no-pce-call`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3718,
-        "y": 4809,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "449091f.4415ef",
-                "1ea76e22.242bea"
-            ]
-        ]
-    },
-    {
-        "id": "1ea76e22.242bea",
-        "type": "outcomeFalse",
-        "name": "false",
-        "xml": "<outcome value='false'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3890,
-        "y": 4806,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "8b1b5cc1.1af92"
-            ]
-        ]
-    },
-    {
-        "id": "449091f.4415ef",
-        "type": "outcomeFalse",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3803,
-        "y": 5906,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "6b1cb253.86fb4c"
-            ]
-        ]
-    },
-    {
-        "id": "c26b2751.5ae09",
-        "type": "comment",
-        "name": "1 --> PCE is needed",
-        "info": "",
-        "comments": "",
-        "x": 3903,
-        "y": 4776,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "ace6e9f0.39e568",
-        "type": "comment",
-        "name": "2 --> no need to call PCE",
-        "info": "",
-        "comments": "",
-        "x": 3874,
-        "y": 5864,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "eff2b9f.ec05748",
-        "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": 3901,
-        "y": 4336,
-        "z": "2902829f.18c74e",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "8b1b5cc1.1af92",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 4066,
-        "y": 4808,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "92650fb7.4fb248",
-                "32b221b8.94e72e",
-                "c940cf7e.ee51b",
-                "dce0cedd.454b5",
-                "5ecdaa6f.e24ff4",
-                "3829dc12.3b5b24"
-            ]
-        ]
-    },
-    {
-        "id": "6001979f.e727",
-        "type": "comment",
-        "name": "Use the middle-man-conn.eth-srv-name for the LEAF connectivity's eth srv name",
-        "info": "",
-        "comments": "",
-        "x": 5472,
-        "y": 4534,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "92650fb7.4fb248",
-        "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": 4419,
-        "y": 5212,
-        "z": "2902829f.18c74e",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "4d81f93.f62ae88",
-        "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": 3911,
-        "y": 4391,
-        "z": "2902829f.18c74e",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "9c2b0edc.50b4c",
-        "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": 4447,
-        "y": 5263,
-        "z": "2902829f.18c74e",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "e161ec1a.4abce",
-        "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": 3877,
-        "y": 3604,
-        "z": "2902829f.18c74e",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "d5e12d5f.415ec",
-        "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": 3337,
-        "y": 1823,
-        "z": "2902829f.18c74e",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "47f64a4f.cc38f4",
-        "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": 3244,
-        "y": 1770,
-        "z": "2902829f.18c74e",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "461bf5c9.7233b4",
-        "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": 3927,
-        "y": 3307,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "53557e78.f7c168",
-        "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": 3874,
-        "y": 2895,
-        "z": "2902829f.18c74e",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "a884ac0.a40fdd8",
-        "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": 3822,
-        "y": 2943,
-        "z": "2902829f.18c74e",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "7b528859.fb04",
-        "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": 3950,
-        "y": 2990,
-        "z": "2902829f.18c74e",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "145ad0a4.4a593f",
-        "type": "comment",
-        "name": "Create LEAF connectivity",
-        "info": "",
-        "comments": "",
-        "x": 3787,
-        "y": 2853,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "4b76c053.d564f8",
-        "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",
-        "comments": "",
-        "outputs": 1,
-        "x": 3784,
-        "y": 3081,
-        "z": "2902829f.18c74e",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "90ff1f35.eee16",
-        "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": 3877,
-        "y": 3134,
-        "z": "2902829f.18c74e",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "f9c3a7e4.4b967",
-        "type": "comment",
-        "name": "Create LEAF UNI",
-        "info": "",
-        "comments": "",
-        "x": 3768,
-        "y": 3037,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "c6c09b88.1384d8",
-        "type": "comment",
-        "name": "Create ROOT UNI",
-        "info": "",
-        "comments": "",
-        "x": 3774,
-        "y": 3487,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "dce0cedd.454b5",
-        "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",
-        "comments": "",
-        "outputs": 1,
-        "x": 4341,
-        "y": 4542,
-        "z": "2902829f.18c74e",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "d819a295.d1d948",
-        "type": "comment",
-        "name": "Create LEAF UNI",
-        "info": "",
-        "comments": "",
-        "x": 4325,
-        "y": 4498,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "8a0e3e5f.c139f",
-        "type": "comment",
-        "name": "Create LEAF connectivity",
-        "info": "",
-        "comments": "",
-        "x": 5072,
-        "y": 4529,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "3d40af5d.b5351",
-        "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": 5159,
-        "y": 4571,
-        "z": "2902829f.18c74e",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "113bf6b.aca4d89",
-        "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": 5107,
-        "y": 4619,
-        "z": "2902829f.18c74e",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "e3b325e.735f958",
-        "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": 5235,
-        "y": 4666,
-        "z": "2902829f.18c74e",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "3829dc12.3b5b24",
-        "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": 4412,
-        "y": 4951,
-        "z": "2902829f.18c74e",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "78032561.382d8c",
-        "type": "comment",
-        "name": "populate connectivity-B variable in the context map",
-        "info": "",
-        "comments": "",
-        "x": 4395,
-        "y": 5013,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "32b221b8.94e72e",
-        "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": 4506,
-        "y": 5055,
-        "z": "2902829f.18c74e",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "ddb22b48.c7951",
-        "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": 4954,
-        "y": 5108,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "8dae734b.2f3cf",
-        "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": 4264,
-        "y": 5806,
-        "z": "2902829f.18c74e",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "6b696600.0c94ac",
-        "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",
-        "comments": "",
-        "outputs": 1,
-        "x": 4162,
-        "y": 5755,
-        "z": "2902829f.18c74e",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "63a3c79e.874c38",
-        "type": "comment",
-        "name": "Create LEAF UNI",
-        "info": "",
-        "comments": "",
-        "x": 4146,
-        "y": 5711,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "f7343942.604c5",
-        "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": 4921,
-        "y": 5967,
-        "z": "2902829f.18c74e",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "c940cf7e.ee51b",
-        "type": "switchNode",
-        "name": "switch found-root-connectivity",
-        "xml": "\n<switch test=\"`$found-root-connectivity`\">\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 4333,
-        "y": 5112,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "b0427d82.5bfe9",
-                "b8ae94d3.c9ad9"
-            ]
-        ]
-    },
-    {
-        "id": "b0427d82.5bfe9",
-        "type": "outcomeTrue",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 4544,
-        "y": 5112,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "25de2beb.6b950c"
-            ]
-        ]
-    },
-    {
-        "id": "25de2beb.6b950c",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 4700,
-        "y": 5108,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "ddb22b48.c7951"
-            ]
-        ]
-    },
-    {
-        "id": "b8ae94d3.c9ad9",
-        "type": "outcomeFalse",
-        "name": "false",
-        "xml": "<outcome value='false'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 4540,
-        "y": 5160,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "bc7f369f.c4ff98"
-            ]
-        ]
-    },
-    {
-        "id": "bc7f369f.c4ff98",
-        "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": 4688,
-        "y": 5155,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "9a0e4d6a.9ad2e",
-        "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": 5196,
-        "y": 4737,
-        "z": "2902829f.18c74e",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "8ffbf90a.9a2a4",
-        "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": 2362,
-        "y": 148,
-        "z": "2902829f.18c74e",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "9ccad127.ffcf6",
-        "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": 2296,
-        "y": 184,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "9431421f.8473c8",
-        "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": 2481,
-        "y": 111,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "4acaf17d.83ce3",
-        "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": 4231,
-        "y": 5872,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "26219883.65a92",
-        "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": 4364,
-        "y": 5920,
-        "z": "2902829f.18c74e",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "1d162fbe.3673a",
-        "type": "switchNode",
-        "name": "switch found-connectivity?",
-        "xml": "\n<switch test=\"`$found-connectivity`\">\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 4183,
-        "y": 5978,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "b4622dbc.20b678",
-                "1a01b81f.922a4"
-            ]
-        ]
-    },
-    {
-        "id": "b4622dbc.20b678",
-        "type": "outcomeFalse",
-        "name": "false",
-        "xml": "<outcome value='false'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 4376,
-        "y": 5979,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "b10bfde8.027e5"
-            ]
-        ]
-    },
-    {
-        "id": "b10bfde8.027e5",
-        "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": 4532,
-        "y": 5976,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "1a01b81f.922a4",
-        "type": "outcomeTrue",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 4380,
-        "y": 6023,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "6ceb0be5.2a433c"
-            ]
-        ]
-    },
-    {
-        "id": "6ceb0be5.2a433c",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 4519,
-        "y": 6018,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "f7343942.604c5",
-                "c05fdbdc.265b6",
-                "97927bbc.dcd8c8",
-                "1cb127d3.5a2788",
-                "f2b1cf37.e0a26",
-                "8f16ceb.590e9b",
-                "60b731fb.d0503",
-                "bcde9e56.e926a",
-                "c55840d4.91858",
-                "9ff86b70.d2fcb"
-            ]
-        ]
-    },
-    {
-        "id": "60b731fb.d0503",
-        "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": 4716,
-        "y": 6697,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "cedc6e.0697a39",
-                "a047ea62.8c149",
-                "e7b3fd60.6832b8"
-            ]
-        ]
-    },
-    {
-        "id": "cedc6e.0697a39",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 4921,
-        "y": 6694,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "193246bb.dba7e9"
-            ]
-        ]
-    },
-    {
-        "id": "a047ea62.8c149",
-        "type": "not-found",
-        "name": "not-found",
-        "xml": "<outcome value='not-found'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 4904.490966796875,
-        "y": 6755.574035644531,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "6166d474.1f401c"
-            ]
-        ]
-    },
-    {
-        "id": "e7b3fd60.6832b8",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 4902,
-        "y": 6799,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "a8cf7040.6462c8"
-            ]
-        ]
-    },
-    {
-        "id": "193246bb.dba7e9",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 5077,
-        "y": 6708,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "8ab9510b.66ea08"
-            ]
-        ]
-    },
-    {
-        "id": "6166d474.1f401c",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 5067.0623779296875,
-        "y": 6755.859771728516,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "a8cf7040.6462c8",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
-        "comments": "",
-        "x": 5069,
-        "y": 6798,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "8ab9510b.66ea08",
-        "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": 5324,
-        "y": 6705,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "4468378.6607f48"
-            ]
-        ]
-    },
-    {
-        "id": "4468378.6607f48",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 5561,
-        "y": 6701,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "fb8fcf56.6ea2f8"
-            ]
-        ]
-    },
-    {
-        "id": "fb8fcf56.6ea2f8",
-        "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": 5808,
-        "y": 6703,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "b35a7d25.7fd0a",
-                "74f376ab.a729f"
-            ]
-        ]
-    },
-    {
-        "id": "b35a7d25.7fd0a",
-        "type": "outcomeTrue",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 6009,
-        "y": 6693,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "53ea7250.143694"
-            ]
-        ]
-    },
-    {
-        "id": "74f376ab.a729f",
-        "type": "outcomeFalse",
-        "name": "false",
-        "xml": "<outcome value='false'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 6008,
-        "y": 6646,
-        "z": "2902829f.18c74e",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "53ea7250.143694",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 4752,
-        "y": 6968,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "2651f488.54465c"
-            ]
-        ]
-    },
-    {
-        "id": "26dbc9a6.ab4616",
-        "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": 5601,
-        "y": 6873,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "fba4365f.21d6b",
-        "type": "comment",
-        "name": "find all OTNs that have srcTtpOtnLayer and increase their bandwidth",
-        "info": "",
-        "comments": "",
-        "x": 4814,
-        "y": 6644,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "8f16ceb.590e9b",
-        "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": 4698,
-        "y": 6493,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "db5a4ceb.707c88",
-        "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": 5043,
-        "y": 6324,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "45fd9533.be2acc"
-            ]
-        ]
-    },
-    {
-        "id": "45fd9533.be2acc",
-        "type": "outcomeTrue",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 5263,
-        "y": 6330,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "530fb98.e048cc8"
-            ]
-        ]
-    },
-    {
-        "id": "530fb98.e048cc8",
-        "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": 5448,
-        "y": 6329,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "36abe2fe.4a9a96"
-            ]
-        ]
-    },
-    {
-        "id": "36abe2fe.4a9a96",
-        "type": "outcomeTrue",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 5640,
-        "y": 6332,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "75415a60.e2b3b4"
-            ]
-        ]
-    },
-    {
-        "id": "75415a60.e2b3b4",
-        "type": "set",
-        "name": "set otnTopoIdSrc",
-        "xml": "<set>\n<parameter name='otnTopoIdSrc' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />\n",
-        "comments": "",
-        "x": 5849,
-        "y": 6330,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "bcde9e56.e926a",
-        "type": "for",
-        "name": "for netwidx..allNetworksList_length",
-        "xml": "<for index='netwidx' start='0' end='`$allNetworksList.network-resource_length`' >",
-        "comments": "",
-        "outputs": 1,
-        "x": 4750,
-        "y": 6318,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "db5a4ceb.707c88"
-            ]
-        ]
-    },
-    {
-        "id": "97927bbc.dcd8c8",
-        "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": 4758,
-        "y": 6211,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "2440c6c.5eeb4ba",
-                "8721d82f.3e0a3",
-                "3f152fd2.1f0f28"
-            ]
-        ]
-    },
-    {
-        "id": "2440c6c.5eeb4ba",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 4994,
-        "y": 6194,
-        "z": "2902829f.18c74e",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "8721d82f.3e0a3",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 4991,
-        "y": 6235,
-        "z": "2902829f.18c74e",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "3f152fd2.1f0f28",
-        "type": "not-found",
-        "name": "not-found",
-        "xml": "<outcome value='not-found'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 5005,
-        "y": 6275,
-        "z": "2902829f.18c74e",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "1cb127d3.5a2788",
-        "type": "set",
-        "name": "unset parameters",
-        "xml": "<set>\n<parameter name='tmp.pce-src-node.' value='' />\n",
-        "comments": "",
-        "x": 4694,
-        "y": 6370,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "f2b1cf37.e0a26",
-        "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": 4702,
-        "y": 6428,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "c05fdbdc.265b6",
-        "type": "set",
-        "name": "unset parameters",
-        "xml": "<set>\n<parameter name='allNetworksList.' value='' />\n",
-        "comments": "",
-        "x": 4707,
-        "y": 6168,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "b11f8629.171c6",
-        "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": 4822,
-        "y": 6120,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "2651f488.54465c",
-        "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": 4995,
-        "y": 6965,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "69eb57bf.22dfc8",
-                "815687f4.685f18"
-            ]
-        ]
-    },
-    {
-        "id": "69eb57bf.22dfc8",
-        "type": "outcomeTrue",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 5224,
-        "y": 6942,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "3784edbf.83acfa"
-            ]
-        ]
-    },
-    {
-        "id": "815687f4.685f18",
-        "type": "outcomeFalse",
-        "name": "false",
-        "xml": "<outcome value='false'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 5224,
-        "y": 6991,
-        "z": "2902829f.18c74e",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "3784edbf.83acfa",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 5385,
-        "y": 6947,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "6a238d9a.9b2fec",
-                "26dbc9a6.ab4616",
-                "2310374c.1d397"
-            ]
-        ]
-    },
-    {
-        "id": "bb082a0b.0ed128",
-        "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": 5729,
-        "y": 6927,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "2310374c.1d397",
-        "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": 5699,
-        "y": 6987,
-        "z": "2902829f.18c74e",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "6a238d9a.9b2fec",
-        "type": "set",
-        "name": "unset tmp.aai.the-vpn-binding",
-        "xml": "<set>\n<parameter name='tmp.aai.the-vpn-binding.' value=\"\" />\n",
-        "comments": "",
-        "x": 5606,
-        "y": 6815,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "6b1cb253.86fb4c",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 3955,
-        "y": 5905,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "6b696600.0c94ac",
-                "4acaf17d.83ce3",
-                "26219883.65a92",
-                "1d162fbe.3673a"
-            ]
-        ]
-    },
-    {
-        "id": "4a1e792c.5d4bf8",
-        "type": "set",
-        "name": "unset otnTopoIdSrc",
-        "xml": "<set>\n<parameter name='otnTopoIdSrc' value='' />\n",
-        "comments": "",
-        "x": 4699,
-        "y": 6268,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "c55840d4.91858",
-        "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": 4814,
-        "y": 6048,
-        "z": "2902829f.18c74e",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "f6160d91.b00c5",
-        "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": 4951,
-        "y": 5998,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "d896a0c9.160fe8",
-        "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": 4278,
-        "y": 6108,
-        "z": "2902829f.18c74e",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "8cf629c6.d63328",
-        "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",
-        "comments": "",
-        "outputs": 1,
-        "x": 3790,
-        "y": 3546,
-        "z": "2902829f.18c74e",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "b2b24558.6d75f8",
-        "type": "comment",
-        "name": "NOT NEEDED ANYMORE?",
-        "info": "",
-        "comments": "",
-        "x": 3972,
-        "y": 1801,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "bb31c80c.f29398",
-        "type": "comment",
-        "name": "NOT NEEDED ANYMORE?",
-        "info": "",
-        "comments": "",
-        "x": 3950,
-        "y": 2671,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "f5dbe745.5a7ca",
-        "type": "comment",
-        "name": "TEMPORARY REMOVING THE FOLLOWING TWO NODES",
-        "info": "",
-        "comments": "",
-        "x": 3781,
-        "y": 4013,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "58aa906f.8d52e",
-        "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": 3462,
-        "y": 6045,
-        "z": "2902829f.18c74e",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "b0ed6ff1.30772",
-        "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": 3712,
-        "y": 4669,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "727be5c.c27771c",
-        "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": 3845,
-        "y": 4717,
-        "z": "2902829f.18c74e",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "5ecdaa6f.e24ff4",
-        "type": "switchNode",
-        "name": "switch found-connectivity?",
-        "xml": "\n<switch test=\"`$found-connectivity`\">\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 4352,
-        "y": 4598,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "27ad8f3e.2bb148",
-                "1abb8af.fa663f5"
-            ]
-        ]
-    },
-    {
-        "id": "27ad8f3e.2bb148",
-        "type": "outcomeFalse",
-        "name": "false",
-        "xml": "<outcome value='false'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 4545,
-        "y": 4599,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "c5f554a7.be6918"
-            ]
-        ]
-    },
-    {
-        "id": "1abb8af.fa663f5",
-        "type": "outcomeTrue",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 4549,
-        "y": 4643,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "359fab60.1e1edc"
-            ]
-        ]
-    },
-    {
-        "id": "359fab60.1e1edc",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 4688,
-        "y": 4638,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "9fca53b1.0733f"
-            ]
-        ]
-    },
-    {
-        "id": "c5f554a7.be6918",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 4688,
-        "y": 4595,
-        "z": "2902829f.18c74e",
-        "wires": [
-            [
-                "3d40af5d.b5351",
-                "113bf6b.aca4d89",
-                "e3b325e.735f958",
-                "9a0e4d6a.9ad2e"
-            ]
-        ]
-    },
-    {
-        "id": "9fca53b1.0733f",
-        "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": 5082,
-        "y": 4889,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "fa5528e4.cedd58",
-        "type": "comment",
-        "name": "populate connectivity-A variable in the context map",
-        "info": "",
-        "comments": "",
-        "x": 5089,
-        "y": 4843,
-        "z": "2902829f.18c74e",
-        "wires": []
-    },
-    {
-        "id": "9ff86b70.d2fcb",
-        "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": 4887,
-        "y": 6593,
-        "z": "2902829f.18c74e",
-        "wires": [
-            []
-        ]
-    }
+  {
+    "id": "401457dc.d91b78",
+    "type": "dgstart",
+    "name": "DGSTART",
+    "outputs": 1,
+    "x": 112,
+    "y": 81,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "a013fef2.6f2958"
+      ]
+    ]
+  },
+  {
+    "id": "a013fef2.6f2958",
+    "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": 396.2856903076172,
+    "y": 142.23810863494873,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "6ff7b54f.12fd9c"
+      ]
+    ]
+  },
+  {
+    "id": "6ff7b54f.12fd9c",
+    "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": 402.42860412597656,
+    "y": 227.00003051757812,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "515432f3.743c34"
+      ]
+    ]
+  },
+  {
+    "id": "515432f3.743c34",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 752,
+    "y": 286,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "dd15978c.a7e49",
+        "818743.6c6790c",
+        "ecb6f865.396d18"
+      ]
+    ]
+  },
+  {
+    "id": "dd15978c.a7e49",
+    "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": 1053.33349609375,
+    "y": 556.9302978515625,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "818743.6c6790c",
+    "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": 1074.761962890625,
+    "y": 259.33331298828125,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "5ecdc66f.f6a9f8",
+        "a5115d.53bf7ea",
+        "6a040cf4.34a5f4"
+      ]
+    ]
+  },
+  {
+    "id": "5ecdc66f.f6a9f8",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1299.761962890625,
+    "y": 117.33331298828125,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "79d6f337.acb234"
+      ]
+    ]
+  },
+  {
+    "id": "a5115d.53bf7ea",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1295.2529296875,
+    "y": 186.9073486328125,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "5f1113a0.08e40c"
+      ]
+    ]
+  },
+  {
+    "id": "6a040cf4.34a5f4",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1283.761962890625,
+    "y": 233.33331298828125,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "90f3a407.501d38"
+      ]
+    ]
+  },
+  {
+    "id": "de3b14d3.6ada2",
+    "type": "comment",
+    "name": "new for TransportSlicing",
+    "info": "",
+    "comments": "",
+    "x": 1053.761962890625,
+    "y": 147.33331298828125,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "ecb6f865.396d18",
+    "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": 1041.761962890625,
+    "y": 199.33331298828125,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "79d6f337.acb234",
+    "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": 1540,
+    "y": 114,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "43c20e21.f32cd8",
+        "28c5af7a.923d38"
+      ]
+    ]
+  },
+  {
+    "id": "5f1113a0.08e40c",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 1450.0623779296875,
+    "y": 189.85977172851562,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "90f3a407.501d38",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+    "comments": "",
+    "x": 1454,
+    "y": 234,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "43c20e21.f32cd8",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1745,
+    "y": 151,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "80d61dda.518fc"
+      ]
+    ]
+  },
+  {
+    "id": "28c5af7a.923d38",
+    "type": "outcomeFalse",
+    "name": "false",
+    "xml": "<outcome value='false'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1755,
+    "y": 78,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "80d61dda.518fc",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 1738,
+    "y": 226,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "28653cf0.44562c",
+        "75a68f8a.78ad9",
+        "3bc8660b.b8496a",
+        "1213b45b.844d1c",
+        "2c9dde75.d2cff2"
+      ]
+    ]
+  },
+  {
+    "id": "98945bed.eff0a8",
+    "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": 2224,
+    "y": 277,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "2960f1eb.c720a6",
+        "872a9fc7.c0cff",
+        "8c06b22e.eee49"
+      ]
+    ]
+  },
+  {
+    "id": "2960f1eb.c720a6",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2440,
+    "y": 344,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "c7e960b7.dc23f"
+      ]
+    ]
+  },
+  {
+    "id": "872a9fc7.c0cff",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2440.490966796875,
+    "y": 243.573974609375,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "6cf8dc3d.cca5ac"
+      ]
+    ]
+  },
+  {
+    "id": "8c06b22e.eee49",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2436,
+    "y": 293,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "9afdf1e0.0463b"
+      ]
+    ]
+  },
+  {
+    "id": "28653cf0.44562c",
+    "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": 1941,
+    "y": 258,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "b0c3b925.5a198",
+        "98945bed.eff0a8",
+        "59db3330.69645c",
+        "4ebbcee7.69b52"
+      ]
+    ]
+  },
+  {
+    "id": "b0c3b925.5a198",
+    "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": 2221,
+    "y": 196,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "1213b45b.844d1c",
+    "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": 1915,
+    "y": 208,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "75a68f8a.78ad9",
+    "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": 1958,
+    "y": 67,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "3bc8660b.b8496a",
+    "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": 1970,
+    "y": 108,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "886bedb4.af1a3",
+    "type": "comment",
+    "name": "The following two nodes are for PCE",
+    "info": "",
+    "comments": "",
+    "x": 1995,
+    "y": 20,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "1506b37b.81c545",
+    "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": 1915,
+    "y": 154,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "6cf8dc3d.cca5ac",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 2619,
+    "y": 246,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "9afdf1e0.0463b",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+    "comments": "",
+    "x": 2618.9375,
+    "y": 295.1402587890625,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "c7e960b7.dc23f",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 2620.9375,
+    "y": 346.1402587890625,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "39c57327.b8862c"
+      ]
+    ]
+  },
+  {
+    "id": "39c57327.b8862c",
+    "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": 2913.9375,
+    "y": 293.1402587890625,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "3bec086a.17141",
+        "202b395f.8fc9be",
+        "205a58b1.00a5c"
+      ]
+    ]
+  },
+  {
+    "id": "202b395f.8fc9be",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3187.428466796875,
+    "y": 185.7142333984375,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "113df3fa.92a3d4"
+      ]
+    ]
+  },
+  {
+    "id": "113df3fa.92a3d4",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 3365,
+    "y": 186,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "205a58b1.00a5c",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3182.9375,
+    "y": 235.1402587890625,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "158df1dd.6f3716"
+      ]
+    ]
+  },
+  {
+    "id": "158df1dd.6f3716",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+    "comments": "",
+    "x": 3364.9375,
+    "y": 235.1402587890625,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "3bec086a.17141",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3186.9375,
+    "y": 286.1402587890625,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "b7f25fb9.397e68"
+      ]
+    ]
+  },
+  {
+    "id": "b7f25fb9.397e68",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 3366.9375,
+    "y": 286.1402587890625,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "b5f441a1.12264"
+      ]
+    ]
+  },
+  {
+    "id": "b5f441a1.12264",
+    "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": 2933,
+    "y": 421,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "8b1d1a2b.bf0fd8",
+        "1b31225e.143a7e"
+      ]
+    ]
+  },
+  {
+    "id": "1b31225e.143a7e",
+    "type": "outcomeFalse",
+    "name": "false",
+    "xml": "<outcome value='false'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3243,
+    "y": 428,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "8b1d1a2b.bf0fd8",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3242,
+    "y": 482,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "f82eb181.80b6b8"
+      ]
+    ]
+  },
+  {
+    "id": "a23264d4.676238",
+    "type": "outcome",
+    "name": "network-policy",
+    "xml": "<outcome value='network-policy'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3987,
+    "y": 436,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "ff9fd818.342fc"
+      ]
+    ]
+  },
+  {
+    "id": "ff9fd818.342fc",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 4163.9998779296875,
+    "y": 428.9998779296875,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "792ffad7.7e059c",
+        "f4f213f7.1f09b"
+      ]
+    ]
+  },
+  {
+    "id": "f82eb181.80b6b8",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 3406,
+    "y": 408,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "ecdd8960.6c28f",
+        "89ab1181.5cfe68"
+      ]
+    ]
+  },
+  {
+    "id": "ecdd8960.6c28f",
+    "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": 3687,
+    "y": 364,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "b496725b.6310f"
+      ]
+    ]
+  },
+  {
+    "id": "b496725b.6310f",
+    "type": "switchNode",
+    "name": "switch related-to",
+    "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3949,
+    "y": 364,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "a23264d4.676238"
+      ]
+    ]
+  },
+  {
+    "id": "792ffad7.7e059c",
+    "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": 4406.9998779296875,
+    "y": 385.9998779296875,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "f4f213f7.1f09b",
+    "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": 4395.9998779296875,
+    "y": 440.9998779296875,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "738543a5.e85744",
+        "13a5e063.163af8",
+        "e90bc7b5.1f09c"
+      ]
+    ]
+  },
+  {
+    "id": "e90bc7b5.1f09c",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4649,
+    "y": 327,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "5d8fd93.58407a8"
+      ]
+    ]
+  },
+  {
+    "id": "5d8fd93.58407a8",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 4797.571533203125,
+    "y": 327.2857666015625,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "53518ce7.6d697c",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+    "comments": "",
+    "x": 4796.509033203125,
+    "y": 371.426025390625,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "13a5e063.163af8",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4637.509033203125,
+    "y": 371.426025390625,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "53518ce7.6d697c"
+      ]
+    ]
+  },
+  {
+    "id": "738543a5.e85744",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4644.509033203125,
+    "y": 450.426025390625,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "937d3d5d.26f97"
+      ]
+    ]
+  },
+  {
+    "id": "937d3d5d.26f97",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 4783.509033203125,
+    "y": 450.426025390625,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "72f3c760.2ca228",
+        "8ec14dfe.92b848"
+      ]
+    ]
+  },
+  {
+    "id": "72f3c760.2ca228",
+    "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": 4989,
+    "y": 448,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "8ec14dfe.92b848",
+    "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": 4988,
+    "y": 494,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "89ab1181.5cfe68",
+    "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": 3504,
+    "y": 480,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "f7fb6622.9ee6a8"
+      ]
+    ]
+  },
+  {
+    "id": "f7fb6622.9ee6a8",
+    "type": "switchNode",
+    "name": "switch related-to",
+    "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3784,
+    "y": 480,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "ae35e793.89faa8"
+      ]
+    ]
+  },
+  {
+    "id": "ae35e793.89faa8",
+    "type": "outcome",
+    "name": "logical-link",
+    "xml": "<outcome value='logical-link'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2197.0001220703125,
+    "y": 733.0001220703125,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "c9798d0a.ecd3b"
+      ]
+    ]
+  },
+  {
+    "id": "c9798d0a.ecd3b",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 2374,
+    "y": 726,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "c196b024.7ddda8",
+        "7125c66b.59e98"
+      ]
+    ]
+  },
+  {
+    "id": "c196b024.7ddda8",
+    "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": 2617,
+    "y": 683,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "7125c66b.59e98",
+    "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": 2606,
+    "y": 738,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "9959c5db.04ddc8",
+        "5c37ab7d.23ef4c",
+        "360651b5.116166"
+      ]
+    ]
+  },
+  {
+    "id": "9959c5db.04ddc8",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2897.490966796875,
+    "y": 716.573974609375,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "95b8ba37.0aee2"
+      ]
+    ]
+  },
+  {
+    "id": "5c37ab7d.23ef4c",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2886,
+    "y": 761,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "f8728a74.d6db68"
+      ]
+    ]
+  },
+  {
+    "id": "95b8ba37.0aee2",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 3046.0625,
+    "y": 716.8597412109375,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "f8728a74.d6db68",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+    "comments": "",
+    "x": 3045,
+    "y": 761,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "360651b5.116166",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2893,
+    "y": 840,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "7326b1f2.1f515"
+      ]
+    ]
+  },
+  {
+    "id": "7326b1f2.1f515",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 3032,
+    "y": 840,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "defc50da.4e3908",
+        "b7df8e67.09b008",
+        "8bf3b76.abce348",
+        "25a0f8e1.052e18",
+        "b381c251.6b96c",
+        "89e7916b.fb9e18",
+        "5511f093.c411d8",
+        "d2628754.9207b8",
+        "6481b806.b26798",
+        "20bb7eae.be3a32",
+        "9fcb0922.e08ed",
+        "3db2acf8.6fe83c",
+        "d8a34ec.a6346b",
+        "2783e99.3726216"
+      ]
+    ]
+  },
+  {
+    "id": "57e34af8.6ff4e4",
+    "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": 3346,
+    "y": 646,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "defc50da.4e3908",
+    "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": 3327,
+    "y": 696,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "2783e99.3726216",
+    "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": 3284,
+    "y": 741,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "b7df8e67.09b008",
+    "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": 3259,
+    "y": 804,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "8bf3b76.abce348",
+    "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": 3260,
+    "y": 859,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "25a0f8e1.052e18",
+    "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": 3276,
+    "y": 907,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "bd8c7e03.e7323",
+        "d55fdbac.2e4bb8",
+        "1bd38601.f7d742"
+      ]
+    ]
+  },
+  {
+    "id": "b381c251.6b96c",
+    "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": 3265,
+    "y": 993.9998779296875,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "1da7e0f.b56889f",
+        "484d133e.c5022c",
+        "511cb1cb.4e0758"
+      ]
+    ]
+  },
+  {
+    "id": "bd8c7e03.e7323",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3477,
+    "y": 791,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "2e4151be.e64316"
+      ]
+    ]
+  },
+  {
+    "id": "d55fdbac.2e4bb8",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3472.509033203125,
+    "y": 840.426025390625,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "13e83f49.acd859"
+      ]
+    ]
+  },
+  {
+    "id": "1bd38601.f7d742",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3476.509033203125,
+    "y": 893.426025390625,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "bbf6b192.5183e"
+      ]
+    ]
+  },
+  {
+    "id": "2e4151be.e64316",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 3625.571533203125,
+    "y": 790.2857666015625,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "13e83f49.acd859",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+    "comments": "",
+    "x": 3615.509033203125,
+    "y": 840.426025390625,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "1da7e0f.b56889f",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3488,
+    "y": 963.9998779296875,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "27b6a672.93ff42"
+      ]
+    ]
+  },
+  {
+    "id": "484d133e.c5022c",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3483.509033203125,
+    "y": 1013.4259033203125,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "9dfa6094.6f7fc"
+      ]
+    ]
+  },
+  {
+    "id": "511cb1cb.4e0758",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3484.509033203125,
+    "y": 1066.4259033203125,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "597eb63e.8508f8"
+      ]
+    ]
+  },
+  {
+    "id": "27b6a672.93ff42",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 3636.571533203125,
+    "y": 963.28564453125,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "9dfa6094.6f7fc",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+    "comments": "",
+    "x": 3626.509033203125,
+    "y": 1013.4259033203125,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "bbf6b192.5183e",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 3638,
+    "y": 893,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "254a0cd4.86f82c"
+      ]
+    ]
+  },
+  {
+    "id": "597eb63e.8508f8",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 3638,
+    "y": 1065.9998779296875,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "e889443b.6afcf"
+      ]
+    ]
+  },
+  {
+    "id": "254a0cd4.86f82c",
+    "type": "switchNode",
+    "name": "switch nr type",
+    "xml": "<switch test='`$tmp.aai.network-route-one.type`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3810,
+    "y": 893,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "6d2ef37a.d5fd0c",
+        "52c8f078.ee2cf"
+      ]
+    ]
+  },
+  {
+    "id": "e889443b.6afcf",
+    "type": "switchNode",
+    "name": "switch nr type",
+    "xml": "<switch test='`$tmp.aai.network-route-two.type`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3811,
+    "y": 1066,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "a0b3468.4c1dbb8",
+        "ed4bd4a4.7c002"
+      ]
+    ]
+  },
+  {
+    "id": "6d2ef37a.d5fd0c",
+    "type": "outcome",
+    "name": "ROOT",
+    "xml": "<outcome value='ROOT'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3986,
+    "y": 872,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "e77feac5.4ef39"
+      ]
+    ]
+  },
+  {
+    "id": "52c8f078.ee2cf",
+    "type": "outcome",
+    "name": "LEAF",
+    "xml": "<outcome value='LEAF'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3988,
+    "y": 926,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "dc5de667.94277"
+      ]
+    ]
+  },
+  {
+    "id": "a0b3468.4c1dbb8",
+    "type": "outcome",
+    "name": "ROOT",
+    "xml": "<outcome value='ROOT'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3987,
+    "y": 1036,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "79d85b32.4dba8c"
+      ]
+    ]
+  },
+  {
+    "id": "ed4bd4a4.7c002",
+    "type": "outcome",
+    "name": "LEAF",
+    "xml": "<outcome value='LEAF'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3989,
+    "y": 1090,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "5799e4b6.bb5c84"
+      ]
+    ]
+  },
+  {
+    "id": "985f8e8b.05bee8",
+    "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": 4296,
+    "y": 824,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "f70bc04c.4e53a8",
+    "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": 4289,
+    "y": 922,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "279fdf30.7efb5",
+    "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": 4289,
+    "y": 1009,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "59ab7a89.d7cd04",
+    "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": 4293,
+    "y": 1102,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "88375125.392df",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3520,
+    "y": 1511,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "70cb5f48.205d5"
+      ]
+    ]
+  },
+  {
+    "id": "f9f9639f.39277",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3529.490966796875,
+    "y": 1553.5740356445312,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "3188784d.74df2"
+      ]
+    ]
+  },
+  {
+    "id": "5caadc0.419f8a4",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3518,
+    "y": 1600,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "150b9d67.7501b3"
+      ]
+    ]
+  },
+  {
+    "id": "3a7a9a9d.f62dc6",
+    "type": "comment",
+    "name": "Question?",
+    "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
+    "comments": "",
+    "x": 3220,
+    "y": 1473,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "5511f093.c411d8",
+    "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": 3263,
+    "y": 1538,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "88375125.392df",
+        "f9f9639f.39277",
+        "5caadc0.419f8a4"
+      ]
+    ]
+  },
+  {
+    "id": "89e7916b.fb9e18",
+    "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": 3264,
+    "y": 1208,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "e837ae68.fc604",
+        "bb41717d.607c08"
+      ]
+    ]
+  },
+  {
+    "id": "bb41717d.607c08",
+    "type": "failure",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3487,
+    "y": 1194,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "d2362461.2f81"
+      ]
+    ]
+  },
+  {
+    "id": "e837ae68.fc604",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3489,
+    "y": 1227,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "3512d9a4.ea10d6"
+      ]
+    ]
+  },
+  {
+    "id": "70cb5f48.205d5",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 3692.66650390625,
+    "y": 1510,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "e94025a.e4524d8",
+        "c5dba695.8712a"
+      ]
+    ]
+  },
+  {
+    "id": "3188784d.74df2",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 3683.0623779296875,
+    "y": 1556.8597717285156,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "150b9d67.7501b3",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+    "comments": "",
+    "x": 3687,
+    "y": 1601,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "e94025a.e4524d8",
+    "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": 3957,
+    "y": 1494,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "e5529b75.8cebe8",
+        "23d40330.51306c"
+      ]
+    ]
+  },
+  {
+    "id": "23d40330.51306c",
+    "type": "failure",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4180,
+    "y": 1449,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "3c287465.76fa9c"
+      ]
+    ]
+  },
+  {
+    "id": "e5529b75.8cebe8",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4182,
+    "y": 1513,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "68bbdd27.0bc724"
+      ]
+    ]
+  },
+  {
+    "id": "68bbdd27.0bc724",
+    "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": 4344,
+    "y": 1509,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "3c287465.76fa9c",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 4345,
+    "y": 1446,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "bdb7c671.344b18",
+        "c34e936c.c687c"
+      ]
+    ]
+  },
+  {
+    "id": "c36404f4.836da8",
+    "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": 3959,
+    "y": 1653,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "b7b75306.125ca8",
+    "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": 4004,
+    "y": 1563,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "6cc070b0.831948",
+    "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": 4087,
+    "y": 1701,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "3512d9a4.ea10d6",
+    "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": 3632,
+    "y": 1224,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "d2362461.2f81",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 3635,
+    "y": 1187,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "e726be0e.35ac3",
+        "2627d74c.d6bd68"
+      ]
+    ]
+  },
+  {
+    "id": "e726be0e.35ac3",
+    "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": 3809,
+    "y": 1143,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "c5dba695.8712a",
+    "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": 3911,
+    "y": 1778,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "e649e24c.a2956"
+      ]
+    ]
+  },
+  {
+    "id": "e649e24c.a2956",
+    "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": 4117,
+    "y": 1778,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "b51c6327.c26b2"
+      ]
+    ]
+  },
+  {
+    "id": "b51c6327.c26b2",
+    "type": "outcome",
+    "name": "tunnel-termination-point",
+    "xml": "<outcome value='tunnel-termination-point'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4332.28564453125,
+    "y": 1777.82177734375,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "4a081ef3.a11e7"
+      ]
+    ]
+  },
+  {
+    "id": "2627d74c.d6bd68",
+    "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": 3824,
+    "y": 1254,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "e436419e.4fabd8",
+        "652a3cad.15b09c",
+        "70700ce3.d1704c"
+      ]
+    ]
+  },
+  {
+    "id": "e436419e.4fabd8",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4019.5001220703125,
+    "y": 1206,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "cac46a50.7c9a2"
+      ]
+    ]
+  },
+  {
+    "id": "652a3cad.15b09c",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4011.5001220703125,
+    "y": 1261,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "7a559df8.2fbb14"
+      ]
+    ]
+  },
+  {
+    "id": "70700ce3.d1704c",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4016.5001220703125,
+    "y": 1318,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "74d49b92.9fc25c"
+      ]
+    ]
+  },
+  {
+    "id": "74d49b92.9fc25c",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return 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.5001220703125,
+    "y": 1319,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "7a559df8.2fbb14",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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.5001220703125,
+    "y": 1264,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "cac46a50.7c9a2",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 4163.8824462890625,
+    "y": 1203.6556701660156,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "66f1613b.919fb"
+      ]
+    ]
+  },
+  {
+    "id": "66f1613b.919fb",
+    "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": 4348,
+    "y": 1218,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "c85b648c.95d8c8"
+      ]
+    ]
+  },
+  {
+    "id": "c34e936c.c687c",
+    "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": 4515,
+    "y": 1404,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "bdb7c671.344b18",
+    "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": 4516,
+    "y": 1512,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "c2c86af0.87457",
+    "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": 4517,
+    "y": 1461,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "4a081ef3.a11e7",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 4539.1171875,
+    "y": 1778.34033203125,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "feabfc8a.6835d8",
+        "3ad150ae.9686d8",
+        "7f60aea1.758cf8"
+      ]
+    ]
+  },
+  {
+    "id": "feabfc8a.6835d8",
+    "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": 4754.1171875,
+    "y": 1740.34033203125,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "3ad150ae.9686d8",
+    "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": 4751.1171875,
+    "y": 1779.34033203125,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "ee0e6ba7.1ab528"
+      ]
+    ]
+  },
+  {
+    "id": "7f60aea1.758cf8",
+    "type": "break",
+    "name": "break",
+    "xml": "<break>\n",
+    "comments": "",
+    "x": 4706.6171875,
+    "y": 1821.34033203125,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "ee0e6ba7.1ab528",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4931.6171875,
+    "y": 1778.34033203125,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "f1c6f75a.7a676"
+      ]
+    ]
+  },
+  {
+    "id": "3cd8e203.e194b6",
+    "type": "outcome",
+    "name": "esr-thirdparty-sdnc",
+    "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4746,
+    "y": 1222,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "17b6f38.a7a3d8d"
+      ]
+    ]
+  },
+  {
+    "id": "17b6f38.a7a3d8d",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 4923,
+    "y": 1214,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "676933bd.3d8274",
+        "263106c3.f9fd42"
+      ]
+    ]
+  },
+  {
+    "id": "c85b648c.95d8c8",
+    "type": "switchNode",
+    "name": "switch related-to",
+    "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4543,
+    "y": 1218,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "3cd8e203.e194b6",
+        "a370dab4.6f2d18"
+      ]
+    ]
+  },
+  {
+    "id": "a370dab4.6f2d18",
+    "type": "outcome",
+    "name": "network-resource",
+    "xml": "<outcome value='network-resource'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 4749,
+    "y": 1296,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "9dd5a5f0.afd2"
+      ]
+    ]
+  },
+  {
+    "id": "9dd5a5f0.afd2",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 4926,
+    "y": 1288,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "fbf0fc4a.17b5c8"
+      ]
+    ]
+  },
+  {
+    "id": "f1c6f75a.7a676",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 5089.6171875,
+    "y": 1778.34033203125,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "3b33bb0c.f032cc"
+      ]
+    ]
+  },
+  {
+    "id": "3b33bb0c.f032cc",
+    "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": 5296.6171875,
+    "y": 1778.34033203125,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "263106c3.f9fd42",
+    "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": 5131,
+    "y": 1221,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "ddcc8888.29b548",
+        "db7fdb45.821a78",
+        "ff56d5.bfda3928"
+      ]
+    ]
+  },
+  {
+    "id": "676933bd.3d8274",
+    "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": 5161,
+    "y": 1169,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "ddcc8888.29b548",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5341,
+    "y": 1212,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "e7e5466f.7658a"
+      ]
+    ]
+  },
+  {
+    "id": "db7fdb45.821a78",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5333,
+    "y": 1267,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "1793a855.2047c"
+      ]
+    ]
+  },
+  {
+    "id": "ff56d5.bfda3928",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5338,
+    "y": 1324,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "81dadd48.c741d8"
+      ]
+    ]
+  },
+  {
+    "id": "81dadd48.c741d8",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return 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": 5490,
+    "y": 1325,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "1793a855.2047c",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 5501,
+    "y": 1270,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "e7e5466f.7658a",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 5485.38232421875,
+    "y": 1209.6556701660156,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "dde9f23c.0ef22"
+      ]
+    ]
+  },
+  {
+    "id": "fbf0fc4a.17b5c8",
+    "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": 5161,
+    "y": 1412,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "dde9f23c.0ef22",
+    "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": 5700,
+    "y": 1206,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "f4910610.e101b8",
+    "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": 4284,
+    "y": 860,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "f3cd87cd.165138",
+    "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": 4275,
+    "y": 958,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "e77feac5.4ef39",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 4109,
+    "y": 866,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "985f8e8b.05bee8",
+        "f4910610.e101b8"
+      ]
+    ]
+  },
+  {
+    "id": "dc5de667.94277",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 4115,
+    "y": 930,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "f70bc04c.4e53a8",
+        "f3cd87cd.165138"
+      ]
+    ]
+  },
+  {
+    "id": "79d85b32.4dba8c",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 4115,
+    "y": 1036,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "279fdf30.7efb5",
+        "746b1d51.0e2bec"
+      ]
+    ]
+  },
+  {
+    "id": "5799e4b6.bb5c84",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 4118,
+    "y": 1089,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "59ab7a89.d7cd04",
+        "b63e0082.68a46"
+      ]
+    ]
+  },
+  {
+    "id": "746b1d51.0e2bec",
+    "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": 4275,
+    "y": 1049,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "b63e0082.68a46",
+    "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": 4278,
+    "y": 1140,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "87a4f79d.f1b41",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 3650,
+    "y": 2350,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "8613884a.623e8",
+        "df0137f0.20c7a8"
+      ]
+    ]
+  },
+  {
+    "id": "af9ecc7.c2e763",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3477.33349609375,
+    "y": 2351,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "87a4f79d.f1b41"
+      ]
+    ]
+  },
+  {
+    "id": "53f2a3cf.4dd8a4",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3486.824462890625,
+    "y": 2393.5740356445312,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "50bbbd16.7373fc"
+      ]
+    ]
+  },
+  {
+    "id": "aba66972.a33e38",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3475.33349609375,
+    "y": 2440,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "6c045770.56d3d"
+      ]
+    ]
+  },
+  {
+    "id": "50bbbd16.7373fc",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 3640.3958740234375,
+    "y": 2396.8597717285156,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "6c045770.56d3d",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+    "comments": "",
+    "x": 3644.33349609375,
+    "y": 2441,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "8613884a.623e8",
+    "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": 3936.33349609375,
+    "y": 2354.0001220703125,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "d23083de.2cf1e",
+        "7516fca6.f7fc04"
+      ]
+    ]
+  },
+  {
+    "id": "7516fca6.f7fc04",
+    "type": "failure",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4159.33349609375,
+    "y": 2309.0001220703125,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "c66357b4.73185"
+      ]
+    ]
+  },
+  {
+    "id": "d23083de.2cf1e",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4161.33349609375,
+    "y": 2373.0001220703125,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "a82df7d1.ae6a"
+      ]
+    ]
+  },
+  {
+    "id": "a82df7d1.ae6a",
+    "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": 4320.33349609375,
+    "y": 2392.0001220703125,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "c66357b4.73185",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 4324.33349609375,
+    "y": 2306.0001220703125,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "dffb0ed6.823ba",
+        "1dd3dd1b.7300fb"
+      ]
+    ]
+  },
+  {
+    "id": "634f24c.033d45c",
+    "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": 3938.33349609375,
+    "y": 2513.0001220703125,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "165310c1.3dcf57",
+    "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": 3983.33349609375,
+    "y": 2423.0001220703125,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "1c4663ba.666f24",
+    "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": 4065.33349609375,
+    "y": 2578.0001220703125,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "6481b806.b26798",
+    "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": 3249.33349609375,
+    "y": 2386,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "af9ecc7.c2e763",
+        "53f2a3cf.4dd8a4",
+        "aba66972.a33e38"
+      ]
+    ]
+  },
+  {
+    "id": "357b021d.ccef76",
+    "type": "comment",
+    "name": "Question?",
+    "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
+    "comments": "",
+    "x": 3210.33349609375,
+    "y": 2330,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "d2628754.9207b8",
+    "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": 3267.33349609375,
+    "y": 2048.9998779296875,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "f940533a.3599b",
+        "b0b7c077.9433c"
+      ]
+    ]
+  },
+  {
+    "id": "b0b7c077.9433c",
+    "type": "failure",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3490.33349609375,
+    "y": 2034.9998779296875,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "c06f7f13.a06918"
+      ]
+    ]
+  },
+  {
+    "id": "f940533a.3599b",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3492.33349609375,
+    "y": 2067.9998779296875,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "1b16d50a.3ac5a3"
+      ]
+    ]
+  },
+  {
+    "id": "1b16d50a.3ac5a3",
+    "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": 3635.33349609375,
+    "y": 2064.9998779296875,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "c06f7f13.a06918",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 3638.33349609375,
+    "y": 2027.9998779296875,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "f576457.60ef6b8",
+        "57336dca.385a1c"
+      ]
+    ]
+  },
+  {
+    "id": "f576457.60ef6b8",
+    "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": 3832.33349609375,
+    "y": 2031,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "df0137f0.20c7a8",
+    "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": 3895.33349609375,
+    "y": 2663,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "e2836384.c2ccb8"
+      ]
+    ]
+  },
+  {
+    "id": "e2836384.c2ccb8",
+    "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": 4101.33349609375,
+    "y": 2663,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "fca69a38.03a91"
+      ]
+    ]
+  },
+  {
+    "id": "fca69a38.03a91",
+    "type": "outcome",
+    "name": "tunnel-termination-point",
+    "xml": "<outcome value='tunnel-termination-point'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4318.619140625,
+    "y": 2661.82177734375,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "7ea58eaa.2fe4c8"
+      ]
+    ]
+  },
+  {
+    "id": "57336dca.385a1c",
+    "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": 3854.33349609375,
+    "y": 2099,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "4f2611a4.8dfaa",
+        "d01e89f4.899b8",
+        "4dbe2024.2418c8"
+      ]
+    ]
+  },
+  {
+    "id": "4f2611a4.8dfaa",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4049.8336181640625,
+    "y": 2051,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "c7fe21e9.219fb"
+      ]
+    ]
+  },
+  {
+    "id": "d01e89f4.899b8",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4041.8336181640625,
+    "y": 2106,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "711f5b9.04549a4"
+      ]
+    ]
+  },
+  {
+    "id": "4dbe2024.2418c8",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4046.8336181640625,
+    "y": 2163,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "7a110b6a.211174"
+      ]
+    ]
+  },
+  {
+    "id": "7a110b6a.211174",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return 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": 4198.8336181640625,
+    "y": 2164,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "711f5b9.04549a4",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 4209.8336181640625,
+    "y": 2109,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "c7fe21e9.219fb",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 4194.2159423828125,
+    "y": 2048.6556701660156,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "5f7a4387.8903dc"
+      ]
+    ]
+  },
+  {
+    "id": "dffb0ed6.823ba",
+    "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": 4494.33349609375,
+    "y": 2267.0001220703125,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "1dd3dd1b.7300fb",
+    "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": 4495.33349609375,
+    "y": 2372.0001220703125,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "132cb9b4.8d2256",
+    "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": 4490.33349609375,
+    "y": 2321.0001220703125,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "7ea58eaa.2fe4c8",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 4525.45068359375,
+    "y": 2651.3404541015625,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "9217eff0.7fa96",
+        "965ae906.eae45",
+        "1b19b6f0.8ece39"
+      ]
+    ]
+  },
+  {
+    "id": "9217eff0.7fa96",
+    "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": 4740.45068359375,
+    "y": 2613.3404541015625,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "965ae906.eae45",
+    "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": 4737.45068359375,
+    "y": 2652.3404541015625,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "87f8942.95038e8"
+      ]
+    ]
+  },
+  {
+    "id": "1b19b6f0.8ece39",
+    "type": "break",
+    "name": "break",
+    "xml": "<break>\n",
+    "comments": "",
+    "x": 4692.95068359375,
+    "y": 2694.3404541015625,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "87f8942.95038e8",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4917.95068359375,
+    "y": 2651.3404541015625,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "65d1ff2e.3f2e18"
+      ]
+    ]
+  },
+  {
+    "id": "65d1ff2e.3f2e18",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 5075.95068359375,
+    "y": 2651.3404541015625,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "fedf1a96.f1456"
+      ]
+    ]
+  },
+  {
+    "id": "fedf1a96.f1456",
+    "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": 5282.95068359375,
+    "y": 2651.3404541015625,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "115bab50.32a055",
+    "type": "outcome",
+    "name": "esr-thirdparty-sdnc",
+    "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4776.33349609375,
+    "y": 2067,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "e64c3553.0ae97"
+      ]
+    ]
+  },
+  {
+    "id": "e64c3553.0ae97",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 4953.33349609375,
+    "y": 2059,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "a2d6f837.6f757",
+        "eeac3b28.315368"
+      ]
+    ]
+  },
+  {
+    "id": "5f7a4387.8903dc",
+    "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": 4378.33349609375,
+    "y": 2063,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "bd77f52.650d108"
+      ]
+    ]
+  },
+  {
+    "id": "bd77f52.650d108",
+    "type": "switchNode",
+    "name": "switch related-to",
+    "xml": "<switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4573.33349609375,
+    "y": 2063,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "115bab50.32a055",
+        "c1dba387.605d3"
+      ]
+    ]
+  },
+  {
+    "id": "eeac3b28.315368",
+    "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": 5161.33349609375,
+    "y": 2066,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "fa5ccc46.c0c8e8",
+        "7f544ab3.a923ac",
+        "629c31b0.bf54b"
+      ]
+    ]
+  },
+  {
+    "id": "3e060ac3.b125d6",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 4955.33349609375,
+    "y": 2132,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "a8b3b7de.4e882"
+      ]
+    ]
+  },
+  {
+    "id": "c1dba387.605d3",
+    "type": "outcome",
+    "name": "network-resource",
+    "xml": "<outcome value='network-resource'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 4778.33349609375,
+    "y": 2140,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "3e060ac3.b125d6"
+      ]
+    ]
+  },
+  {
+    "id": "a2d6f837.6f757",
+    "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": 5191.33349609375,
+    "y": 2014,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "a8b3b7de.4e882",
+    "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": 5190.33349609375,
+    "y": 2256,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "fa5ccc46.c0c8e8",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5371.33349609375,
+    "y": 2057,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "58f99424.7527f4"
+      ]
+    ]
+  },
+  {
+    "id": "7f544ab3.a923ac",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5363.33349609375,
+    "y": 2112,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "ffe0cce7.8e8ca"
+      ]
+    ]
+  },
+  {
+    "id": "629c31b0.bf54b",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5368.33349609375,
+    "y": 2169,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "cc8477b8.611dc8"
+      ]
+    ]
+  },
+  {
+    "id": "cc8477b8.611dc8",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return 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": 5520.33349609375,
+    "y": 2170,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "ffe0cce7.8e8ca",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 5531.33349609375,
+    "y": 2115,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "58f99424.7527f4",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 5515.7158203125,
+    "y": 2054.6556701660156,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "f5242e64.71f82"
+      ]
+    ]
+  },
+  {
+    "id": "f5242e64.71f82",
+    "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": 5730.33349609375,
+    "y": 2051,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "20bb7eae.be3a32",
+    "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`\" />\n<parameter name='tmp.LEAF.uni-tp-id' value=\"`$tmp.src.ltpId`\" />\n",
+    "comments": "",
+    "x": 3229,
+    "y": 1661,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "7762f3ae.52a254",
+    "type": "comment",
+    "name": "This is it (should be)",
+    "info": "",
+    "comments": "",
+    "x": 4451,
+    "y": 944,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "edff520.fc6aeb",
+    "type": "comment",
+    "name": "This is it (should be)",
+    "info": "",
+    "comments": "",
+    "x": 4443,
+    "y": 1034,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "9fcb0922.e08ed",
+    "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`\" />\n<parameter name='tmp.ROOT.uni-tp-id' value=\"`$tmp.dst.ltpId`\" />\n",
+    "comments": "",
+    "x": 3210,
+    "y": 2517,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "3db2acf8.6fe83c",
+    "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": 3361,
+    "y": 2765,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "d8a34ec.a6346b",
+    "type": "switchNode",
+    "name": "switch found-middle-man?",
+    "xml": "<switch test='`$found-middle-man`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3238,
+    "y": 2875,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "52347f79.8db4f",
+        "cd09ff82.d8b0a8"
+      ]
+    ]
+  },
+  {
+    "id": "52347f79.8db4f",
+    "type": "outcomeFalse",
+    "name": "false",
+    "xml": "<outcome value='false'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3422,
+    "y": 2854,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "2a86c6f9.428e32"
+      ]
+    ]
+  },
+  {
+    "id": "cd09ff82.d8b0a8",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3314,
+    "y": 5032,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "36762610.1073d2"
+      ]
+    ]
+  },
+  {
+    "id": "36762610.1073d2",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic='true'>",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 3469,
+    "y": 5025,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "ae52f9b0.eb7378",
+        "6bdb71eb.cd7da",
+        "5ba113f8.d2a564",
+        "536ae5e9.b25a04",
+        "5c19cae5.23f224"
+      ]
+    ]
+  },
+  {
+    "id": "2a86c6f9.428e32",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic='true'>",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 3565,
+    "y": 2854,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "60b7b56f.adea4c",
+        "bdc41b3b.e9f9e8",
+        "9a7dac44.d03ca8",
+        "bedde447.35d04",
+        "7fc21231.2a386c",
+        "541e3cf1.3cdc4c",
+        "8e19f306.cd166",
+        "7aa2001.036a58",
+        "fd1584d2.77bd18",
+        "4d65e0ad.f66548",
+        "799454e3.25827c",
+        "ca44c46f.688fa8",
+        "3e5313a9.d78034",
+        "3f9a9e6f.0fc392",
+        "f035278d.c09ef",
+        "c934426f.9b2fb",
+        "a387df7d.b7b76",
+        "944ed400.3d2108",
+        "e04ee2dc.c84258"
+      ]
+    ]
+  },
+  {
+    "id": "fd1584d2.77bd18",
+    "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": 3876,
+    "y": 3209,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "60b7b56f.adea4c",
+    "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": 3830,
+    "y": 3307,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "bdc41b3b.e9f9e8",
+    "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": 3966,
+    "y": 3354,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "335c026d.7b6e86",
+    "type": "comment",
+    "name": "Create ROOT connectivity",
+    "info": "",
+    "comments": "",
+    "x": 3797,
+    "y": 3158,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "15801117.33a03f",
+    "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": 4323,
+    "y": 3649,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "9a7dac44.d03ca8",
+    "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": 3887,
+    "y": 3688,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "bedde447.35d04",
+    "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": 3835,
+    "y": 3739,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "7fc21231.2a386c",
+    "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": 3971,
+    "y": 3786,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "9c57f099.e1906",
+    "type": "comment",
+    "name": "Create MIDDLE-MAN connectivity",
+    "info": "",
+    "comments": "",
+    "x": 3828,
+    "y": 3648,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "c4862f6c.a2a29",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic='true'>",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 4258,
+    "y": 3845,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "541e3cf1.3cdc4c",
+    "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": 3849,
+    "y": 3892,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "42cf0b77.2dec84",
+        "81ea64e.302c518",
+        "1a138015.57b74"
+      ]
+    ]
+  },
+  {
+    "id": "42cf0b77.2dec84",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4096,
+    "y": 3846,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "c4862f6c.a2a29"
+      ]
+    ]
+  },
+  {
+    "id": "81ea64e.302c518",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4096.490966796875,
+    "y": 3891.5740356445312,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "396ed743.e6ca6"
+      ]
+    ]
+  },
+  {
+    "id": "1a138015.57b74",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4094,
+    "y": 3935,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "f5385619.47f03"
+      ]
+    ]
+  },
+  {
+    "id": "396ed743.e6ca6",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 4259.0623779296875,
+    "y": 3891.8597717285156,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "f5385619.47f03",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+    "comments": "",
+    "x": 4263,
+    "y": 3936,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "f035278d.c09ef",
+    "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": 3906,
+    "y": 4171,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "c934426f.9b2fb",
+    "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": 3909,
+    "y": 4216,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "944ed400.3d2108",
+    "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": 3898,
+    "y": 4007,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "e04ee2dc.c84258",
+    "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": 3900,
+    "y": 4054,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "49a17204.cabfec",
+    "type": "comment",
+    "name": "The following two will be done in F1",
+    "info": "",
+    "comments": "",
+    "x": 3822,
+    "y": 4124,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "f9147a44.abd5d",
+    "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": 4429,
+    "y": 4853,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "ae52f9b0.eb7378",
+    "type": "switchNode",
+    "name": "switch no-pce-call",
+    "xml": "<switch test='`$no-pce-call`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3684,
+    "y": 5006,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "2031568b.5c466a",
+        "d5c3bda4.9d44d"
+      ]
+    ]
+  },
+  {
+    "id": "d5c3bda4.9d44d",
+    "type": "outcomeFalse",
+    "name": "false",
+    "xml": "<outcome value='false'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3856,
+    "y": 5003,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "3fb1d79b.8d6fb8"
+      ]
+    ]
+  },
+  {
+    "id": "2031568b.5c466a",
+    "type": "outcomeFalse",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3808,
+    "y": 5850,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "ff5eb6bb.d3898"
+      ]
+    ]
+  },
+  {
+    "id": "35005760.153d9",
+    "type": "comment",
+    "name": "1 --> PCE is needed",
+    "info": "",
+    "comments": "",
+    "x": 3869,
+    "y": 4973,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "53b6adea.273794",
+    "type": "comment",
+    "name": "2 --> no need to call PCE",
+    "info": "",
+    "comments": "",
+    "x": 3879,
+    "y": 5808,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "8e19f306.cd166",
+    "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": 3906,
+    "y": 4280,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "3fb1d79b.8d6fb8",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic='true'>",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 4032,
+    "y": 5005,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "a4f5d754.33c548",
+        "77d0a120.a8d4c8",
+        "ea3dea31.55403",
+        "faf54698.eda79",
+        "e80f8be5.03c42",
+        "3b266df3.e7977a",
+        "f9147a44.abd5d"
+      ]
+    ]
+  },
+  {
+    "id": "30197835.1bf978",
+    "type": "comment",
+    "name": "Use the middle-man-conn.eth-srv-name for the LEAF connectivity's eth srv name",
+    "info": "",
+    "comments": "",
+    "x": 5477,
+    "y": 4478,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "a4f5d754.33c548",
+    "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": 4424,
+    "y": 5156,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "cce2d7d9.b9218",
+    "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": 3916,
+    "y": 4335,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "7aa2001.036a58",
+    "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": 3882,
+    "y": 3548,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "2d8b9b70.b52efc",
+    "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": 3342,
+    "y": 1767,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "26382876.b9a68",
+    "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": 3249,
+    "y": 1714,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "31c62db7.5b8522",
+    "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": 3932,
+    "y": 3251,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "4d65e0ad.f66548",
+    "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": 3879,
+    "y": 2839,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "799454e3.25827c",
+    "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": 3827,
+    "y": 2887,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "ca44c46f.688fa8",
+    "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": 3955,
+    "y": 2934,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "c038b97c.5e298",
+    "type": "comment",
+    "name": "Create LEAF connectivity",
+    "info": "",
+    "comments": "",
+    "x": 3792,
+    "y": 2797,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "3e5313a9.d78034",
+    "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": 3789,
+    "y": 3025,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "3f9a9e6f.0fc392",
+    "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": 3882,
+    "y": 3078,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "281fc4fa.e1a84c",
+    "type": "comment",
+    "name": "Create LEAF UNI",
+    "info": "",
+    "comments": "",
+    "x": 3773,
+    "y": 2981,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "9dc1c6e1.2dba4",
+    "type": "comment",
+    "name": "Create ROOT UNI",
+    "info": "",
+    "comments": "",
+    "x": 3779,
+    "y": 3431,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "faf54698.eda79",
+    "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": 4346,
+    "y": 4486,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "eb955021.5749d",
+    "type": "comment",
+    "name": "Create LEAF UNI",
+    "info": "",
+    "comments": "",
+    "x": 4330,
+    "y": 4442,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "b9a6d392.b28d6",
+    "type": "comment",
+    "name": "Create LEAF connectivity",
+    "info": "",
+    "comments": "",
+    "x": 5077,
+    "y": 4473,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "bed8a2a5.609b9",
+    "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": 5164,
+    "y": 4515,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "bbe5119a.b6b9a",
+    "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": 5112,
+    "y": 4563,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "2aa44f99.3f02c8",
+    "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": 5240,
+    "y": 4610,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "3b266df3.e7977a",
+    "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": 4417,
+    "y": 4895,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "bd185a34.34e6a8",
+    "type": "comment",
+    "name": "populate connectivity-B variable in the context map",
+    "info": "",
+    "comments": "",
+    "x": 4400,
+    "y": 4957,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "77d0a120.a8d4c8",
+    "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": 4511,
+    "y": 4999,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "915b754b.45601",
+    "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": 4959,
+    "y": 5052,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "8cb093f8.38739",
+    "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": 4269,
+    "y": 5750,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "90b420e2.468d1",
+    "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": 4167,
+    "y": 5699,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "e890a410.6577f8",
+    "type": "comment",
+    "name": "Create LEAF UNI",
+    "info": "",
+    "comments": "",
+    "x": 4151,
+    "y": 5655,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "ca407fe0.a74b58",
+    "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": 4957.999755859375,
+    "y": 5853,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "ea3dea31.55403",
+    "type": "switchNode",
+    "name": "switch found-root-connectivity",
+    "xml": "\n<switch test=\"`$found-root-connectivity`\">\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4338,
+    "y": 5056,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "130129c6.4e6896",
+        "c2790bbb.b39ef"
+      ]
+    ]
+  },
+  {
+    "id": "130129c6.4e6896",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4549,
+    "y": 5056,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "b2be4205.132768"
+      ]
+    ]
+  },
+  {
+    "id": "b2be4205.132768",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic='true'>",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 4705,
+    "y": 5052,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "915b754b.45601",
+        "3264661d.b6671a",
+        "cf1a8f36.08af8"
+      ]
+    ]
+  },
+  {
+    "id": "c2790bbb.b39ef",
+    "type": "outcomeFalse",
+    "name": "false",
+    "xml": "<outcome value='false'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4545,
+    "y": 5104,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "1090c9ed.cf8dde"
+      ]
+    ]
+  },
+  {
+    "id": "1090c9ed.cf8dde",
+    "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": 4693,
+    "y": 5099,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "53ad7751.2dcd08",
+    "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": 5201,
+    "y": 4681,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "59db3330.69645c",
+    "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": 2367,
+    "y": 92,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "4ebbcee7.69b52",
+    "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": 2301,
+    "y": 128,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "4ea5390e.a52cc",
+    "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": 2486,
+    "y": 55,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "37299dd0.22785a",
+    "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": 4236,
+    "y": 5816,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "606aa5ab.2206bc",
+    "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": 4369,
+    "y": 5864,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "17ac1f1.6d565e1",
+    "type": "switchNode",
+    "name": "switch found-connectivity?",
+    "xml": "\n<switch test=\"`$found-connectivity`\">\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4188,
+    "y": 5922,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "7b13241a.22fd54",
+        "f9b4895b.fbea48"
+      ]
+    ]
+  },
+  {
+    "id": "7b13241a.22fd54",
+    "type": "outcomeFalse",
+    "name": "false",
+    "xml": "<outcome value='false'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4381,
+    "y": 5923,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "827a3a72.ba4bd8"
+      ]
+    ]
+  },
+  {
+    "id": "827a3a72.ba4bd8",
+    "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": 4537,
+    "y": 5920,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "f9b4895b.fbea48",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4385,
+    "y": 5967,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "4c414c23.1dfa5c"
+      ]
+    ]
+  },
+  {
+    "id": "4c414c23.1dfa5c",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 4524,
+    "y": 5962,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "ca407fe0.a74b58",
+        "87b885a5.5cf0c8",
+        "7c94a6cd.50e738",
+        "9f0fa012.5d1bf",
+        "fafaba2.e8268c8",
+        "25a2525f.49399e",
+        "593dba4.344bf44",
+        "90f4ba85.137fb",
+        "52c2d3cf.976804",
+        "274ef282.e256ee",
+        "eba4a386.8ade58",
+        "91ff8ca0.2410d8"
+      ]
+    ]
+  },
+  {
+    "id": "593dba4.344bf44",
+    "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": 4721,
+    "y": 6641,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "a83c7fc2.c5da78",
+        "914d2791.9def8",
+        "a0fd345.ac08f48"
+      ]
+    ]
+  },
+  {
+    "id": "a83c7fc2.c5da78",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4926,
+    "y": 6638,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "c1df45ea.8ba52"
+      ]
+    ]
+  },
+  {
+    "id": "914d2791.9def8",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4909.490966796875,
+    "y": 6699.574035644531,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "119f1b5d.4e6f5d"
+      ]
+    ]
+  },
+  {
+    "id": "a0fd345.ac08f48",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4907,
+    "y": 6743,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "3791525f.f4d3fe"
+      ]
+    ]
+  },
+  {
+    "id": "c1df45ea.8ba52",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 5082,
+    "y": 6652,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "78ac2a8d.cd0874"
+      ]
+    ]
+  },
+  {
+    "id": "119f1b5d.4e6f5d",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 5072.0623779296875,
+    "y": 6699.859771728516,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "3791525f.f4d3fe",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+    "comments": "",
+    "x": 5074,
+    "y": 6742,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "78ac2a8d.cd0874",
+    "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": 5329,
+    "y": 6649,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "110b3f91.4725e8"
+      ]
+    ]
+  },
+  {
+    "id": "110b3f91.4725e8",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic='true'>",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 5566,
+    "y": 6645,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "e53605cc.b83c3"
+      ]
+    ]
+  },
+  {
+    "id": "cf79f711.acd51",
+    "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": 5809,
+    "y": 6617,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "f8a0a965.9fe23",
+        "b32c6358.b77858"
+      ]
+    ]
+  },
+  {
+    "id": "f8a0a965.9fe23",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 6014,
+    "y": 6637,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "e53605cc.b83c3"
+      ]
+    ]
+  },
+  {
+    "id": "b32c6358.b77858",
+    "type": "outcomeFalse",
+    "name": "false",
+    "xml": "<outcome value='false'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 6013,
+    "y": 6590,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "e53605cc.b83c3",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic='true'>",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 4757,
+    "y": 6912,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "d173aa3d.6dc13"
+      ]
+    ]
+  },
+  {
+    "id": "fdc415c8.6a0598",
+    "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": 5606,
+    "y": 6817,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "37d800ad.83215",
+    "type": "comment",
+    "name": "find all OTNs that have srcTtpOtnLayer and increase their bandwidth",
+    "info": "",
+    "comments": "",
+    "x": 4819,
+    "y": 6588,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "25a2525f.49399e",
+    "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": 4703,
+    "y": 6437,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "5323ec48.960894",
+    "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": 5048,
+    "y": 6268,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "de0031e3.730958"
+      ]
+    ]
+  },
+  {
+    "id": "de0031e3.730958",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5268,
+    "y": 6274,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "2707e8d8.7ec9d"
+      ]
+    ]
+  },
+  {
+    "id": "2707e8d8.7ec9d",
+    "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": 5453,
+    "y": 6273,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "37890125.bbe60e"
+      ]
+    ]
+  },
+  {
+    "id": "37890125.bbe60e",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5645,
+    "y": 6276,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "95332efd.102e7"
+      ]
+    ]
+  },
+  {
+    "id": "95332efd.102e7",
+    "type": "set",
+    "name": "set otnTopoIdSrc",
+    "xml": "<set>\n<parameter name='otnTopoIdSrc' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />\n",
+    "comments": "",
+    "x": 5854,
+    "y": 6274,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "90f4ba85.137fb",
+    "type": "for",
+    "name": "for netwidx..allNetworksList_length",
+    "xml": "<for index='netwidx' start='0' end='`$allNetworksList.network-resource_length`' >",
+    "comments": "",
+    "outputs": 1,
+    "x": 4755,
+    "y": 6262,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "5323ec48.960894"
+      ]
+    ]
+  },
+  {
+    "id": "7c94a6cd.50e738",
+    "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": 4763,
+    "y": 6155,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "b0864a09.98f318",
+        "a95b7f6b.2686a",
+        "109466fa.601861"
+      ]
+    ]
+  },
+  {
+    "id": "b0864a09.98f318",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4999,
+    "y": 6138,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "a95b7f6b.2686a",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4996,
+    "y": 6179,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "109466fa.601861",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5010,
+    "y": 6219,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "9f0fa012.5d1bf",
+    "type": "set",
+    "name": "unset parameters",
+    "xml": "<set>\n<parameter name='tmp.pce-src-node.' value='' />\n",
+    "comments": "",
+    "x": 4699,
+    "y": 6314,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "fafaba2.e8268c8",
+    "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": 4707,
+    "y": 6372,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "87b885a5.5cf0c8",
+    "type": "set",
+    "name": "unset parameters",
+    "xml": "<set>\n<parameter name='allNetworksList.' value='' />\n",
+    "comments": "",
+    "x": 4712,
+    "y": 6112,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "aa72fa33.6435d",
+    "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": 4827,
+    "y": 6064,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "d173aa3d.6dc13",
+    "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": 5000,
+    "y": 6909,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "cecd58a1.5c073",
+        "a1afbc37.0664b8"
+      ]
+    ]
+  },
+  {
+    "id": "cecd58a1.5c073",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5229,
+    "y": 6886,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "217cc28.e6a45be"
+      ]
+    ]
+  },
+  {
+    "id": "a1afbc37.0664b8",
+    "type": "outcomeFalse",
+    "name": "false",
+    "xml": "<outcome value='false'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5229,
+    "y": 6935,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "217cc28.e6a45be",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic='true'>",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 5390,
+    "y": 6891,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "efcdc93a.a5e52",
+        "fdc415c8.6a0598",
+        "1d0e63ee.415bac"
+      ]
+    ]
+  },
+  {
+    "id": "3c8e9462.ad4a14",
+    "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": 5734,
+    "y": 6871,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "1d0e63ee.415bac",
+    "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": 5704,
+    "y": 6931,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "efcdc93a.a5e52",
+    "type": "set",
+    "name": "unset tmp.aai.the-vpn-binding",
+    "xml": "<set>\n<parameter name='tmp.aai.the-vpn-binding.' value=\"\" />\n",
+    "comments": "",
+    "x": 5611,
+    "y": 6759,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "ff5eb6bb.d3898",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic='true'>",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 3960,
+    "y": 5849,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "90b420e2.468d1",
+        "37299dd0.22785a",
+        "606aa5ab.2206bc",
+        "17ac1f1.6d565e1",
+        "8cb093f8.38739"
+      ]
+    ]
+  },
+  {
+    "id": "754638fa.2f5ed",
+    "type": "set",
+    "name": "unset otnTopoIdSrc",
+    "xml": "<set>\n<parameter name='otnTopoIdSrc' value='' />\n",
+    "comments": "",
+    "x": 4704,
+    "y": 6212,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "52c2d3cf.976804",
+    "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": 4850.999755859375,
+    "y": 5934,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "6227c2aa.a1e1a4",
+    "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": 4987.999755859375,
+    "y": 5884,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "a387df7d.b7b76",
+    "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": 3795,
+    "y": 3490,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "a7eb3fa1.887168",
+    "type": "comment",
+    "name": "NOT NEEDED ANYMORE?",
+    "info": "",
+    "comments": "",
+    "x": 3977,
+    "y": 1745,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "c5a9fcf9.09d1b",
+    "type": "comment",
+    "name": "NOT NEEDED ANYMORE?",
+    "info": "",
+    "comments": "",
+    "x": 3955,
+    "y": 2615,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "7010bc9b.4157a4",
+    "type": "comment",
+    "name": "TEMPORARY REMOVING THE FOLLOWING TWO NODES",
+    "info": "",
+    "comments": "",
+    "x": 3786,
+    "y": 3957,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "2c9dde75.d2cff2",
+    "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": 3467,
+    "y": 5989,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "6bdb71eb.cd7da",
+    "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": 3678,
+    "y": 4866,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "5ba113f8.d2a564",
+    "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": 3811,
+    "y": 4914,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "e80f8be5.03c42",
+    "type": "switchNode",
+    "name": "switch found-connectivity?",
+    "xml": "\n<switch test=\"`$found-connectivity`\">\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4357,
+    "y": 4542,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "8d6edd02.689f",
+        "977606e5.20b248"
+      ]
+    ]
+  },
+  {
+    "id": "8d6edd02.689f",
+    "type": "outcomeFalse",
+    "name": "false",
+    "xml": "<outcome value='false'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4550,
+    "y": 4543,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "5ee87f24.28a388"
+      ]
+    ]
+  },
+  {
+    "id": "977606e5.20b248",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4554,
+    "y": 4587,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "89bf54cd.2d4a38"
+      ]
+    ]
+  },
+  {
+    "id": "89bf54cd.2d4a38",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic='true'>",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 4693,
+    "y": 4582,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "32dd4db5.fb786a",
+        "c09e6974.d8d248",
+        "47355e53.0b694"
+      ]
+    ]
+  },
+  {
+    "id": "5ee87f24.28a388",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic='true'>",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 4693,
+    "y": 4539,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "bed8a2a5.609b9",
+        "bbe5119a.b6b9a",
+        "2aa44f99.3f02c8",
+        "53ad7751.2dcd08"
+      ]
+    ]
+  },
+  {
+    "id": "32dd4db5.fb786a",
+    "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": 5095.000244140625,
+    "y": 4804,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "62f002ed.2a5444",
+    "type": "comment",
+    "name": "populate connectivity-A variable in the context map",
+    "info": "",
+    "comments": "",
+    "x": 5102.000244140625,
+    "y": 4758,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "274ef282.e256ee",
+    "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": 4892,
+    "y": 6537,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "c09e6974.d8d248",
+    "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": 5213.000244140625,
+    "y": 4846,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "3264661d.b6671a",
+    "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": 5088,
+    "y": 5104,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "7ec54c4d.3b77ec",
+    "type": "comment",
+    "name": "Update ROOT UNI's bw",
+    "info": "",
+    "comments": "",
+    "x": 3642,
+    "y": 4464,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "f9f5a12a.cd0cc",
+    "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": 3976,
+    "y": 4647,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "536ae5e9.b25a04",
+    "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": 3588,
+    "y": 4514,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "d61393d.72bde7",
+        "afea424c.c72b88",
+        "48da2e94.b0d678"
+      ]
+    ]
+  },
+  {
+    "id": "afea424c.c72b88",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3815.490966796875,
+    "y": 4486.573974609375,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "74d191cb.7bdf48"
+      ]
+    ]
+  },
+  {
+    "id": "48da2e94.b0d678",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3811,
+    "y": 4530.999938964844,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "d340d8ff.74286"
+      ]
+    ]
+  },
+  {
+    "id": "74d191cb.7bdf48",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 3978.0625,
+    "y": 4485.859680175781,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "d340d8ff.74286",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+    "comments": "",
+    "x": 3979,
+    "y": 4530.999938964844,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "60eac93d.331ca",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 3764,
+    "y": 4604,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "a693b00.ef5e95",
+        "f9f5a12a.cd0cc"
+      ]
+    ]
+  },
+  {
+    "id": "d61393d.72bde7",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3595,
+    "y": 4604,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "60eac93d.331ca"
+      ]
+    ]
+  },
+  {
+    "id": "a693b00.ef5e95",
+    "type": "set",
+    "name": "set new bw",
+    "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.rootuni.data-source + $gfp`' />\n",
+    "comments": "",
+    "x": 3953,
+    "y": 4596,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "5c19cae5.23f224",
+    "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": 3786,
+    "y": 4742,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "a02818b5.44468",
+    "type": "comment",
+    "name": "Temporary skipping this check - to support multiple instances in one slice",
+    "info": "",
+    "comments": "",
+    "x": 5892.88330078125,
+    "y": 6554.88330078125,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "47355e53.0b694",
+    "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": 5092.667236328125,
+    "y": 4942.08349609375,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "be1641a6.50b31",
+    "type": "comment",
+    "name": "Update connectivity status to modified",
+    "info": "",
+    "comments": "",
+    "x": 5094.884033203125,
+    "y": 4901.88330078125,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "cf1a8f36.08af8",
+    "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": 4968.6669921875,
+    "y": 5192.08349609375,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "19ccdaa7.ec1b4d",
+    "type": "comment",
+    "name": "Update connectivity status to modified",
+    "info": "",
+    "comments": "",
+    "x": 4970.8837890625,
+    "y": 5151.88330078125,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "66b615d7.25ca4c",
+    "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": 5063.466796875,
+    "y": 5647.5166015625,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "ea12eeb9.12b1f",
+    "type": "switchNode",
+    "name": "switch found-root-connectivity",
+    "xml": "\n<switch test=\"`$found-root-connectivity`\">\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4890.466796875,
+    "y": 5704.5166015625,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "7690697f.9ce41",
+        "27f9c6d9.503242"
+      ]
+    ]
+  },
+  {
+    "id": "7690697f.9ce41",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5101.466796875,
+    "y": 5704.5166015625,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "714a5cc9.4d7a1c"
+      ]
+    ]
+  },
+  {
+    "id": "27f9c6d9.503242",
+    "type": "outcomeFalse",
+    "name": "false",
+    "xml": "<outcome value='false'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5097.466796875,
+    "y": 5752.5166015625,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "b6a962d8.a724e8"
+      ]
+    ]
+  },
+  {
+    "id": "714a5cc9.4d7a1c",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic='true'>",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 5257.466796875,
+    "y": 5700.5166015625,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "1ac18bef.6e71e4",
+        "b2d3bd46.bdd318",
+        "7d68f1ff.1c9d18"
+      ]
+    ]
+  },
+  {
+    "id": "b6a962d8.a724e8",
+    "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": 5245.466796875,
+    "y": 5747.5166015625,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "a02cbc6f.9fe0b8",
+    "type": "comment",
+    "name": "Update connectivity status to modified",
+    "info": "",
+    "comments": "",
+    "x": 5523.3505859375,
+    "y": 5800.39990234375,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "7d68f1ff.1c9d18",
+    "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": 5521.1337890625,
+    "y": 5840.60009765625,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "b2d3bd46.bdd318",
+    "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": 5640.466796875,
+    "y": 5752.5166015625,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "1ac18bef.6e71e4",
+    "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": 5511.466796875,
+    "y": 5700.5166015625,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "a899461.9a784b8",
+    "type": "comment",
+    "name": "populate connectivity-B variable in the context map",
+    "info": "",
+    "comments": "",
+    "x": 4952.466796875,
+    "y": 5605.5166015625,
+    "z": "211aaefb.d906ea",
+    "wires": []
+  },
+  {
+    "id": "eba4a386.8ade58",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 4659.7998046875,
+    "y": 5687.5166015625,
+    "z": "211aaefb.d906ea",
+    "wires": [
+      [
+        "66b615d7.25ca4c",
+        "ea12eeb9.12b1f"
+      ]
+    ]
+  },
+  {
+    "id": "91ff8ca0.2410d8",
+    "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": 4980.832763671875,
+    "y": 5989.2001953125,
+    "z": "211aaefb.d906ea",
+    "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-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 5fb89455..5af3b36c 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
@@ -101,12 +101,12 @@
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 987,
+        "x": 966,
         "y": 350,
         "z": "de2a2b68.0a5d7",
         "wires": [
             [
-                "5b569a16.745f1c"
+                "9fe92008.1b7c9"
             ]
         ]
     },
@@ -1095,5 +1095,37 @@
                 "9c7846e0.04a7f"
             ]
         ]
+    },
+    {
+        "id": "9fe92008.1b7c9",
+        "type": "switchNode",
+        "name": "switch has any relationship",
+        "xml": "<switch test=\"`$tmp.aai.service-instance.relationship-list.relationship_length != ''`\">\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1162,
+        "y": 234,
+        "z": "de2a2b68.0a5d7",
+        "wires": [
+            [
+                "9d9cab47.ce0658"
+            ]
+        ]
+    },
+    {
+        "id": "9d9cab47.ce0658",
+        "type": "outcomeTrue",
+        "name": "true",
+        "xml": "<outcome value='true'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1391,
+        "y": 230,
+        "z": "de2a2b68.0a5d7",
+        "wires": [
+            [
+                "5b569a16.745f1c"
+            ]
+        ]
     }
 ]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-helper-find-ROOT-conn.json b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-helper-find-ROOT-conn.json
index 0a7ce271..55104ea9 100644
--- a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-helper-find-ROOT-conn.json
+++ b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-helper-find-ROOT-conn.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "c33d6496.da3878",
+        "id": "5597755d.1ce774",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 166,
-        "y": 104,
-        "z": "21b7f471.47c7cc",
+        "x": 147,
+        "y": 107,
+        "z": "2d4ea144.5587f6",
         "wires": [
             [
-                "248cabde.5d765c"
+                "8d0fd3e7.a3b7e8"
             ]
         ]
     },
     {
-        "id": "248cabde.5d765c",
+        "id": "8d0fd3e7.a3b7e8",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,290 +22,339 @@
         "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": 450.2856903076172,
-        "y": 165.23810863494873,
-        "z": "21b7f471.47c7cc",
+        "x": 431.2856903076172,
+        "y": 168.23810863494873,
+        "z": "2d4ea144.5587f6",
         "wires": [
             [
-                "1bdaee71.203ba2"
+                "86b46a27.ca39b8"
             ]
         ]
     },
     {
-        "id": "1bdaee71.203ba2",
+        "id": "86b46a27.ca39b8",
         "type": "method",
         "name": "method cll-vnf-topology-operation-cll-helper-find-ROOT-conn",
         "xml": "<method rpc='cll-vnf-topology-operation-cll-helper-find-ROOT-conn' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 405.4285888671875,
-        "y": 257.0000305175781,
-        "z": "21b7f471.47c7cc",
+        "x": 386.4285888671875,
+        "y": 260.0000305175781,
+        "z": "2d4ea144.5587f6",
         "wires": [
             [
-                "64d5e785.7466f8"
+                "15886f7b.32e089"
             ]
         ]
     },
     {
-        "id": "64d5e785.7466f8",
+        "id": "15886f7b.32e089",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 766.238037109375,
-        "y": 241.66668701171875,
-        "z": "21b7f471.47c7cc",
+        "x": 747.238037109375,
+        "y": 244.66668701171875,
+        "z": "2d4ea144.5587f6",
         "wires": [
             [
-                "6207a29a.8617c4",
-                "191e2efd.9488c1",
-                "143f0aa4.b75f05"
+                "6bd3471b.bd1a98",
+                "5dece674.dd027",
+                "4d1bc5df.1d031c"
             ]
         ]
     },
     {
-        "id": "6207a29a.8617c4",
+        "id": "6bd3471b.bd1a98",
         "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-root-all-connectivities\" >\n",
         "comments": "",
         "outputs": 1,
-        "x": 251,
-        "y": 427,
-        "z": "21b7f471.47c7cc",
+        "x": 232,
+        "y": 430,
+        "z": "2d4ea144.5587f6",
         "wires": [
             [
-                "bcd679ba.f0004",
-                "3b7a7b5.0230884",
-                "64bbf1e2.e99a8"
+                "92e14f80.21594",
+                "b9796c74.99212",
+                "e5bd0a99.00585"
             ]
         ]
     },
     {
-        "id": "bcd679ba.f0004",
+        "id": "92e14f80.21594",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 495,
-        "y": 387,
-        "z": "21b7f471.47c7cc",
+        "x": 476,
+        "y": 390,
+        "z": "2d4ea144.5587f6",
         "wires": [
             [
-                "34630da2.df03e2"
+                "61e9ae11.23c3a8"
             ]
         ]
     },
     {
-        "id": "3b7a7b5.0230884",
+        "id": "b9796c74.99212",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 492.490966796875,
-        "y": 436.57403564453125,
-        "z": "21b7f471.47c7cc",
+        "x": 473.490966796875,
+        "y": 439.57403564453125,
+        "z": "2d4ea144.5587f6",
         "wires": [
             [
-                "ddd603c0.1c692"
+                "cd38df9d.37406"
             ]
         ]
     },
     {
-        "id": "64bbf1e2.e99a8",
+        "id": "e5bd0a99.00585",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 490,
-        "y": 479,
-        "z": "21b7f471.47c7cc",
+        "x": 471,
+        "y": 482,
+        "z": "2d4ea144.5587f6",
         "wires": [
             [
-                "16afb1e9.98dc26"
+                "62703aa0.44322c"
             ]
         ]
     },
     {
-        "id": "34630da2.df03e2",
+        "id": "61e9ae11.23c3a8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 643,
-        "y": 388,
-        "z": "21b7f471.47c7cc",
+        "x": 624,
+        "y": 391,
+        "z": "2d4ea144.5587f6",
         "wires": [
             [
-                "55ecd83e.15a1d"
+                "ca24c19f.cdc85"
             ]
         ]
     },
     {
-        "id": "ddd603c0.1c692",
+        "id": "cd38df9d.37406",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 642.0623779296875,
-        "y": 436.8597717285156,
-        "z": "21b7f471.47c7cc",
+        "x": 623.0623779296875,
+        "y": 439.8597717285156,
+        "z": "2d4ea144.5587f6",
         "wires": []
     },
     {
-        "id": "16afb1e9.98dc26",
+        "id": "62703aa0.44322c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 641,
-        "y": 476,
-        "z": "21b7f471.47c7cc",
+        "x": 622,
+        "y": 479,
+        "z": "2d4ea144.5587f6",
         "wires": []
     },
     {
-        "id": "55ecd83e.15a1d",
+        "id": "ca24c19f.cdc85",
         "type": "for",
         "name": "for helprconnidx in all-connectivities",
         "xml": "<for index='helprconnidx' start='0' end='`$tmp.aai.helper-root-all-connectivities.connectivity_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 890,
-        "y": 383,
-        "z": "21b7f471.47c7cc",
+        "x": 871,
+        "y": 386,
+        "z": "2d4ea144.5587f6",
         "wires": [
             [
-                "fc22cf6b.f0c7c"
+                "380582c8.7d331e"
             ]
         ]
     },
     {
-        "id": "fc22cf6b.f0c7c",
+        "id": "380582c8.7d331e",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1137,
-        "y": 389,
-        "z": "21b7f471.47c7cc",
+        "x": 1118,
+        "y": 392,
+        "z": "2d4ea144.5587f6",
         "wires": [
             [
-                "c4afc0a8.ad7c88"
+                "174c6173.8ff53f"
             ]
         ]
     },
     {
-        "id": "c4afc0a8.ad7c88",
+        "id": "206a627e.5c0d46",
         "type": "switchNode",
         "name": "switch color-aware is ROOT?",
         "xml": "\n<switch test=\"`$tmp.aai.helper-root-all-connectivities.connectivity[$helprconnidx].color-aware == $tmp.ROOT.uni-p-interface-long`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 331,
-        "y": 638,
-        "z": "21b7f471.47c7cc",
+        "x": 312,
+        "y": 641,
+        "z": "2d4ea144.5587f6",
         "wires": [
             [
-                "904750de.971a4"
+                "463cdf78.946e4"
             ]
         ]
     },
     {
-        "id": "904750de.971a4",
+        "id": "463cdf78.946e4",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 540,
-        "y": 632,
-        "z": "21b7f471.47c7cc",
+        "x": 521,
+        "y": 635,
+        "z": "2d4ea144.5587f6",
         "wires": [
             [
-                "383b6bb8.2c2de4"
+                "65cbe881.f7d1b"
             ]
         ]
     },
     {
-        "id": "383b6bb8.2c2de4",
+        "id": "65cbe881.f7d1b",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 697,
-        "y": 632,
-        "z": "21b7f471.47c7cc",
+        "x": 678,
+        "y": 635,
+        "z": "2d4ea144.5587f6",
         "wires": [
             [
-                "b4d77263.4231a8",
-                "16085fc0.8f0cc",
-                "5d3bf45c.2ebcf4"
+                "ba048fa4.246cf8",
+                "34ebbdc4.bca6fa",
+                "3a84227a.7da866"
             ]
         ]
     },
     {
-        "id": "191e2efd.9488c1",
+        "id": "5dece674.dd027",
         "type": "set",
         "name": "unset found-root-connectivity",
         "xml": "<set>\n<parameter name='found-root-connectivity' value=\"false\" />\n",
         "comments": "",
-        "x": 1009,
-        "y": 156,
-        "z": "21b7f471.47c7cc",
+        "x": 990,
+        "y": 159,
+        "z": "2d4ea144.5587f6",
         "wires": []
     },
     {
-        "id": "b4d77263.4231a8",
+        "id": "ba048fa4.246cf8",
         "type": "set",
         "name": "set found-root-connectivity=true",
         "xml": "<set>\n<parameter name='found-root-connectivity' value=\"true\" />\n",
         "comments": "",
-        "x": 958,
-        "y": 580,
-        "z": "21b7f471.47c7cc",
+        "x": 939,
+        "y": 583,
+        "z": "2d4ea144.5587f6",
         "wires": []
     },
     {
-        "id": "16085fc0.8f0cc",
+        "id": "34ebbdc4.bca6fa",
         "type": "set",
         "name": "set tmp.aai.ROOT.connectivity.",
         "xml": "<set>\n<parameter name='tmp.aai.ROOT.connectivity.' value=\"`$tmp.aai.helper-root-all-connectivities.connectivity[$helprconnidx].`\" />\n",
         "comments": "",
-        "x": 961,
-        "y": 633,
-        "z": "21b7f471.47c7cc",
+        "x": 942,
+        "y": 636,
+        "z": "2d4ea144.5587f6",
         "wires": []
     },
     {
-        "id": "143f0aa4.b75f05",
+        "id": "4d1bc5df.1d031c",
         "type": "set",
         "name": "unset tmp.aai.ROOT.connectivity.",
         "xml": "<set>\n<parameter name='tmp.aai.ROOT.connectivity.' value=\"\" />\n",
         "comments": "",
-        "x": 1027,
-        "y": 200,
-        "z": "21b7f471.47c7cc",
+        "x": 1008,
+        "y": 203,
+        "z": "2d4ea144.5587f6",
         "wires": []
     },
     {
-        "id": "5d3bf45c.2ebcf4",
+        "id": "3a84227a.7da866",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 889,
-        "y": 696,
-        "z": "21b7f471.47c7cc",
+        "x": 870,
+        "y": 699,
+        "z": "2d4ea144.5587f6",
         "wires": []
+    },
+    {
+        "id": "174c6173.8ff53f",
+        "type": "switchNode",
+        "name": "switch conn type",
+        "xml": "<switch test=\"`$tmp.aai.helper-root-all-connectivities.connectivity[$helprconnidx].vpn-type`\">\n\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 923.88330078125,
+        "y": 480.88330078125,
+        "z": "2d4ea144.5587f6",
+        "wires": [
+            [
+                "466114cf.ced6ec"
+            ]
+        ]
+    },
+    {
+        "id": "466114cf.ced6ec",
+        "type": "outcome",
+        "name": "root",
+        "xml": "<outcome value='root'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1083.88330078125,
+        "y": 482.8833312988281,
+        "z": "2d4ea144.5587f6",
+        "wires": [
+            [
+                "64ce81d.c0f0f"
+            ]
+        ]
+    },
+    {
+        "id": "64ce81d.c0f0f",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 1226.88330078125,
+        "y": 484.8833312988281,
+        "z": "2d4ea144.5587f6",
+        "wires": [
+            [
+                "206a627e.5c0d46"
+            ]
+        ]
     }
 ]
\ 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 8f287f3f..a6c9b05b 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,1627 +1,7639 @@
 [
-    {
-        "id": "9eb6465b.8231d",
-        "type": "dgstart",
-        "name": "DGSTART",
-        "outputs": 1,
-        "x": 174,
-        "y": 129,
-        "z": "7b5a733a.b08434",
-        "wires": [
-            [
-                "c7ce6b7b.48fc18"
-            ]
-        ]
-    },
-    {
-        "id": "c7ce6b7b.48fc18",
-        "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": 399.2856903076172,
-        "y": 203.23810863494873,
-        "z": "7b5a733a.b08434",
-        "wires": [
-            [
-                "5b4de938.1f507"
-            ]
-        ]
-    },
-    {
-        "id": "5b4de938.1f507",
-        "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": 405.42860412597656,
-        "y": 288.0000305175781,
-        "z": "7b5a733a.b08434",
-        "wires": [
-            [
-                "4dc62efc.c83c"
-            ]
-        ]
-    },
-    {
-        "id": "4dc62efc.c83c",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 775.238037109375,
-        "y": 312.66668701171875,
-        "z": "7b5a733a.b08434",
-        "wires": [
-            [
-                "967b1057.e0a818",
-                "c598fe83.44b4b8",
-                "14de5c82.464f93"
-            ]
-        ]
-    },
-    {
-        "id": "967b1057.e0a818",
-        "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": 1030.571533203125,
-        "y": 466.59698486328125,
-        "z": "7b5a733a.b08434",
-        "wires": []
-    },
-    {
-        "id": "c598fe83.44b4b8",
-        "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": 1098,
-        "y": 286,
-        "z": "7b5a733a.b08434",
-        "wires": [
-            [
-                "be5a0198.1ba518",
-                "d9138d20.e2fc8",
-                "91625785.c9ff18"
-            ]
-        ]
-    },
-    {
-        "id": "91625785.c9ff18",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1307,
-        "y": 260,
-        "z": "7b5a733a.b08434",
-        "wires": [
-            [
-                "d564baab.1e6f6"
-            ]
-        ]
-    },
-    {
-        "id": "4d990b70.47f5fc",
-        "type": "outcome",
-        "name": "logical-link",
-        "xml": "<outcome value='logical-link'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1039.0001220703125,
-        "y": 766.0001220703125,
-        "z": "7b5a733a.b08434",
-        "wires": [
-            [
-                "5e1ad592.41ee24"
-            ]
-        ]
-    },
-    {
-        "id": "5e1ad592.41ee24",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 1216,
-        "y": 759,
-        "z": "7b5a733a.b08434",
-        "wires": [
-            [
-                "e398aae7.45cbf8",
-                "a04e6833.e4988",
-                "5187f08e.74ac2"
-            ]
-        ]
-    },
-    {
-        "id": "d902fdae.cea3e8",
-        "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": 814,
-        "y": 695,
-        "z": "7b5a733a.b08434",
-        "wires": [
-            [
-                "4648afd9.f59d38"
-            ]
-        ]
-    },
-    {
-        "id": "4648afd9.f59d38",
-        "type": "switchNode",
-        "name": "switch related-to",
-        "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1085,
-        "y": 691,
-        "z": "7b5a733a.b08434",
-        "wires": [
-            [
-                "4d990b70.47f5fc"
-            ]
-        ]
-    },
-    {
-        "id": "14de5c82.464f93",
-        "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": 1065,
-        "y": 226,
-        "z": "7b5a733a.b08434",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "aaa9891e.70ccc8",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 362,
-        "y": 671,
-        "z": "7b5a733a.b08434",
-        "wires": [
-            [
-                "d7003a6e.38b288",
-                "cee9d4f6.bc12e8"
-            ]
-        ]
-    },
-    {
-        "id": "d7003a6e.38b288",
-        "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": 808,
-        "y": 530,
-        "z": "7b5a733a.b08434",
-        "wires": [
-            [
-                "23206dde.76caa2"
-            ]
-        ]
-    },
-    {
-        "id": "9cc7d8a0.338888",
-        "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": 1290.33349609375,
-        "y": 1177,
-        "z": "7b5a733a.b08434",
-        "wires": [
-            [
-                "361c81d1.d1312e"
-            ]
-        ]
-    },
-    {
-        "id": "cee9d4f6.bc12e8",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic='true'>",
-        "atomic": "true",
-        "comments": "",
-        "outputs": 1,
-        "x": 781,
-        "y": 1176,
-        "z": "7b5a733a.b08434",
-        "wires": [
-            [
-                "80751e9a.0057d8",
-                "26d1ad19.58f772"
-            ]
-        ]
-    },
-    {
-        "id": "80751e9a.0057d8",
-        "type": "for",
-        "name": "for each svc-instance relationship",
-        "xml": "<for index='rel-index' start='0' end='`$tmp.aai.service-instance.relationship-list.relationship_length`' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1055,
-        "y": 1176,
-        "z": "7b5a733a.b08434",
-        "wires": [
-            [
-                "9cc7d8a0.338888"
-            ]
-        ]
-    },
-    {
-        "id": "361c81d1.d1312e",
-        "type": "outcome",
-        "name": "connectivity",
-        "xml": "<outcome value='connectivity'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 574.000244140625,
-        "y": 1330,
-        "z": "7b5a733a.b08434",
-        "wires": [
-            [
-                "eead4d83.93ec08"
-            ]
-        ]
-    },
-    {
-        "id": "fba02c9f.91f47",
-        "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": 963,
-        "y": 1335,
-        "z": "7b5a733a.b08434",
-        "wires": [
-            [
-                "dbda7d85.ee895",
-                "4ef19f13.4e41a8",
-                "2ea82e0b.cdf21a"
-            ]
-        ]
-    },
-    {
-        "id": "dbda7d85.ee895",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1159,
-        "y": 1300,
-        "z": "7b5a733a.b08434",
-        "wires": [
-            [
-                "8ba3755.a15c088"
-            ]
-        ]
-    },
-    {
-        "id": "4ef19f13.4e41a8",
-        "type": "not-found",
-        "name": "not-found",
-        "xml": "<outcome value='not-found'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1159.490966796875,
-        "y": 1345.5740356445312,
-        "z": "7b5a733a.b08434",
-        "wires": [
-            [
-                "729746db.d253f"
-            ]
-        ]
-    },
-    {
-        "id": "2ea82e0b.cdf21a",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1124,
-        "y": 1391,
-        "z": "7b5a733a.b08434",
-        "wires": [
-            [
-                "4b0e29e1.6abb78"
-            ]
-        ]
-    },
-    {
-        "id": "729746db.d253f",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 1319.0625,
-        "y": 1342.8597412109375,
-        "z": "7b5a733a.b08434",
-        "wires": []
-    },
-    {
-        "id": "4b0e29e1.6abb78",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
-        "comments": "",
-        "x": 1277,
-        "y": 1393,
-        "z": "7b5a733a.b08434",
-        "wires": []
-    },
-    {
-        "id": "8ba3755.a15c088",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 1323,
-        "y": 1284,
-        "z": "7b5a733a.b08434",
-        "wires": [
-            [
-                "5032e132.b50ce8"
-            ]
-        ]
-    },
-    {
-        "id": "eead4d83.93ec08",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 746,
-        "y": 1330,
-        "z": "7b5a733a.b08434",
-        "wires": [
-            [
-                "fba02c9f.91f47",
-                "8f9d786c.56a8b8"
-            ]
-        ]
-    },
-    {
-        "id": "8f9d786c.56a8b8",
-        "type": "set",
-        "name": "unset tmp.aai.connectivity",
-        "xml": "<set>\n<parameter name='tmp.aai.connectivity.' value='' />\n",
-        "comments": "",
-        "x": 966,
-        "y": 1278,
-        "z": "7b5a733a.b08434",
-        "wires": []
-    },
-    {
-        "id": "e398aae7.45cbf8",
-        "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<parameter name='currLinkIsFound' value=\"false\" />\n\n\n",
-        "comments": "",
-        "x": 1462,
-        "y": 669,
-        "z": "7b5a733a.b08434",
-        "wires": []
-    },
-    {
-        "id": "a04e6833.e4988",
-        "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": 1429,
-        "y": 783,
-        "z": "7b5a733a.b08434",
-        "wires": [
-            [
-                "49053c81.8b87cc",
-                "6a35a06.779ac6",
-                "64bb497.5849e38"
-            ]
-        ]
-    },
-    {
-        "id": "49053c81.8b87cc",
-        "type": "not-found",
-        "name": "not-found",
-        "xml": "<outcome value='not-found'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1641.490966796875,
-        "y": 749.573974609375,
-        "z": "7b5a733a.b08434",
-        "wires": [
-            [
-                "7b3cd426.944f0c"
-            ]
-        ]
-    },
-    {
-        "id": "6a35a06.779ac6",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1630,
-        "y": 794,
-        "z": "7b5a733a.b08434",
-        "wires": [
-            [
-                "715fffb0.0dd628"
-            ]
-        ]
-    },
-    {
-        "id": "7b3cd426.944f0c",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 1790.0625,
-        "y": 749.8597412109375,
-        "z": "7b5a733a.b08434",
-        "wires": []
-    },
-    {
-        "id": "715fffb0.0dd628",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
-        "comments": "",
-        "x": 1789,
-        "y": 794,
-        "z": "7b5a733a.b08434",
-        "wires": []
-    },
-    {
-        "id": "64bb497.5849e38",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1635,
-        "y": 837,
-        "z": "7b5a733a.b08434",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "cb0d7b9d.4f62",
-        "type": "switchNode",
-        "name": "switch loglink-id exists in conn",
-        "xml": "<switch test='`$tmp.aai.logical-link.link-id == $tmp.aai.connectivity.etht-svc-name`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1552,
-        "y": 1283,
-        "z": "7b5a733a.b08434",
-        "wires": [
-            [
-                "ed843baa.4246c",
-                "77db6f07.dbc38"
-            ]
-        ]
-    },
-    {
-        "id": "ed843baa.4246c",
-        "type": "outcomeTrue",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1763,
-        "y": 1248,
-        "z": "7b5a733a.b08434",
-        "wires": [
-            [
-                "c41e69d5.000d98"
-            ]
-        ]
-    },
-    {
-        "id": "77db6f07.dbc38",
-        "type": "outcomeFalse",
-        "name": "false",
-        "xml": "<outcome value='false'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1760,
-        "y": 1309,
-        "z": "7b5a733a.b08434",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "c41e69d5.000d98",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 1915,
-        "y": 1249,
-        "z": "7b5a733a.b08434",
-        "wires": [
-            [
-                "b90808de.83d488"
-            ]
-        ]
-    },
-    {
-        "id": "c0a4cffa.883e98",
-        "type": "break",
-        "name": "break",
-        "xml": "<break>\n",
-        "comments": "",
-        "x": 2068,
-        "y": 1277,
-        "z": "7b5a733a.b08434",
-        "wires": []
-    },
-    {
-        "id": "1190650a.0a84cb",
-        "type": "comment",
-        "name": "currLinkIsFound. Go to the next logical-link",
-        "info": "",
-        "comments": "",
-        "x": 2073,
-        "y": 1171,
-        "z": "7b5a733a.b08434",
-        "wires": []
-    },
-    {
-        "id": "5187f08e.74ac2",
-        "type": "switchNode",
-        "name": "switch currLinkIsFound",
-        "xml": "<switch test='`$currLinkIsFound`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1355,
-        "y": 901,
-        "z": "7b5a733a.b08434",
-        "wires": [
-            [
-                "bc7d7df2.5493c",
-                "acacd757.221108"
-            ]
-        ]
-    },
-    {
-        "id": "bc7d7df2.5493c",
-        "type": "outcomeTrue",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1541,
-        "y": 880,
-        "z": "7b5a733a.b08434",
-        "wires": [
-            [
-                "1afa8a19.4821fe"
-            ]
-        ]
-    },
-    {
-        "id": "acacd757.221108",
-        "type": "outcomeFalse",
-        "name": "false",
-        "xml": "<outcome value='false'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1538,
-        "y": 1016,
-        "z": "7b5a733a.b08434",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "1afa8a19.4821fe",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 1783,
-        "y": 875,
-        "z": "7b5a733a.b08434",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "790c6016.9667b8",
-        "type": "comment",
-        "name": "A new logical-link has been found: modify process should be triggered",
-        "info": "",
-        "comments": "",
-        "x": 1729,
-        "y": 979,
-        "z": "7b5a733a.b08434",
-        "wires": []
-    },
-    {
-        "id": "5032e132.b50ce8",
-        "type": "switchNode",
-        "name": "switch connectivityBW == gfp",
-        "xml": "<switch test='`$tmp.aai.connectivity.bandwidth-profile-name == $gfp`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1553,
-        "y": 1374,
-        "z": "7b5a733a.b08434",
-        "wires": [
-            [
-                "ee0cb72e.3d8b4",
-                "b958be18.cec7a8"
-            ]
-        ]
-    },
-    {
-        "id": "ee0cb72e.3d8b4",
-        "type": "outcomeTrue",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1758,
-        "y": 1370,
-        "z": "7b5a733a.b08434",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "b958be18.cec7a8",
-        "type": "outcomeFalse",
-        "name": "false",
-        "xml": "<outcome value='false'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1760,
-        "y": 1420,
-        "z": "7b5a733a.b08434",
-        "wires": [
-            [
-                "649f93b2.4fa094"
-            ]
-        ]
-    },
-    {
-        "id": "649f93b2.4fa094",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 1914,
-        "y": 1419,
-        "z": "7b5a733a.b08434",
-        "wires": [
-            [
-                "2c6dae30.c090da",
-                "bec6024a.522f"
-            ]
-        ]
-    },
-    {
-        "id": "b90808de.83d488",
-        "type": "set",
-        "name": "set currLinkIsFound",
-        "xml": "<set>\n<parameter name='currLinkIsFound' value=\"true\" />\n\n\n",
-        "comments": "",
-        "x": 2101,
-        "y": 1221,
-        "z": "7b5a733a.b08434",
-        "wires": []
-    },
-    {
-        "id": "2c6dae30.c090da",
-        "type": "set",
-        "name": "set bwModified",
-        "xml": "<set>\n<parameter name='bwModified' value=\"true\" />\n\n\n",
-        "comments": "",
-        "x": 2109,
-        "y": 1398,
-        "z": "7b5a733a.b08434",
-        "wires": []
-    },
-    {
-        "id": "bec6024a.522f",
-        "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": 934,
-        "y": 1624,
-        "z": "7b5a733a.b08434",
-        "wires": [
-            [
-                "fa7c4190.123f5"
-            ]
-        ]
-    },
-    {
-        "id": "fa7c4190.123f5",
-        "type": "switchNode",
-        "name": "switch related-to",
-        "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1139,
-        "y": 1624,
-        "z": "7b5a733a.b08434",
-        "wires": [
-            [
-                "15fdeaff.12dc65"
-            ]
-        ]
-    },
-    {
-        "id": "15fdeaff.12dc65",
-        "type": "outcome",
-        "name": "vpn-binding",
-        "xml": "<outcome value='vpn-binding'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1305,
-        "y": 1624,
-        "z": "7b5a733a.b08434",
-        "wires": [
-            [
-                "23696373.a05af4"
-            ]
-        ]
-    },
-    {
-        "id": "23696373.a05af4",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 1468,
-        "y": 1624,
-        "z": "7b5a733a.b08434",
-        "wires": [
-            [
-                "393b763a.3c031a",
-                "93b6e437.4f099"
-            ]
-        ]
-    },
-    {
-        "id": "93b6e437.4f099",
-        "type": "set",
-        "name": "unset tmp.aai.vpn-binding",
-        "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value='' />\n",
-        "comments": "",
-        "x": 1697,
-        "y": 1564,
-        "z": "7b5a733a.b08434",
-        "wires": []
-    },
-    {
-        "id": "393b763a.3c031a",
-        "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": 1206,
-        "y": 1718,
-        "z": "7b5a733a.b08434",
-        "wires": [
-            [
-                "2f327191.83395e",
-                "e7652a9b.a6a5d8",
-                "cbe418b.f7d27e8"
-            ]
-        ]
-    },
-    {
-        "id": "8a250676.10f76",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 1590,
-        "y": 1718,
-        "z": "7b5a733a.b08434",
-        "wires": [
-            [
-                "c8600837.7048d8",
-                "6043cb08.7416ec"
-            ]
-        ]
-    },
-    {
-        "id": "2f327191.83395e",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1417,
-        "y": 1720,
-        "z": "7b5a733a.b08434",
-        "wires": [
-            [
-                "8a250676.10f76"
-            ]
-        ]
-    },
-    {
-        "id": "e7652a9b.a6a5d8",
-        "type": "not-found",
-        "name": "not-found",
-        "xml": "<outcome value='not-found'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1417.490966796875,
-        "y": 1765.5740356445312,
-        "z": "7b5a733a.b08434",
-        "wires": [
-            [
-                "a94efe89.188bd8"
-            ]
-        ]
-    },
-    {
-        "id": "cbe418b.f7d27e8",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1415,
-        "y": 1809,
-        "z": "7b5a733a.b08434",
-        "wires": [
-            [
-                "f4d34be9.21913"
-            ]
-        ]
-    },
-    {
-        "id": "f4d34be9.21913",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
-        "comments": "",
-        "x": 1582,
-        "y": 1826,
-        "z": "7b5a733a.b08434",
-        "wires": []
-    },
-    {
-        "id": "a94efe89.188bd8",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 1580.0623779296875,
-        "y": 1765.8597717285156,
-        "z": "7b5a733a.b08434",
-        "wires": []
-    },
-    {
-        "id": "c8600837.7048d8",
-        "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-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='route-distinguisher' value='`$gfp`' />\n<parameter name='operational-status' value='Modified' />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1940.5,
-        "y": 1713,
-        "z": "7b5a733a.b08434",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "6043cb08.7416ec",
-        "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='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": 1867.5,
-        "y": 1777,
-        "z": "7b5a733a.b08434",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "be5a0198.1ba518",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1323,
-        "y": 144,
-        "z": "7b5a733a.b08434",
-        "wires": [
-            [
-                "acd16415.eb51f"
-            ]
-        ]
-    },
-    {
-        "id": "d9138d20.e2fc8",
-        "type": "not-found",
-        "name": "not-found",
-        "xml": "<outcome value='not-found'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1318.490966796875,
-        "y": 213.57403564453125,
-        "z": "7b5a733a.b08434",
-        "wires": [
-            [
-                "855114bb.d4b47"
-            ]
-        ]
-    },
-    {
-        "id": "acd16415.eb51f",
-        "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,
-        "y": 141,
-        "z": "7b5a733a.b08434",
-        "wires": [
-            [
-                "7d32da32.7e3de4",
-                "7d05195c.3ec52"
-            ]
-        ]
-    },
-    {
-        "id": "855114bb.d4b47",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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.0623779296875,
-        "y": 216.85977172851562,
-        "z": "7b5a733a.b08434",
-        "wires": []
-    },
-    {
-        "id": "d564baab.1e6f6",
-        "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,
-        "y": 261,
-        "z": "7b5a733a.b08434",
-        "wires": []
-    },
-    {
-        "id": "7d32da32.7e3de4",
-        "type": "outcomeTrue",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1775,
-        "y": 165,
-        "z": "7b5a733a.b08434",
-        "wires": [
-            [
-                "1771a12b.55c52f"
-            ]
-        ]
-    },
-    {
-        "id": "7d05195c.3ec52",
-        "type": "outcomeFalse",
-        "name": "false",
-        "xml": "<outcome value='false'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1777,
-        "y": 105,
-        "z": "7b5a733a.b08434",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "1771a12b.55c52f",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 1720,
-        "y": 347,
-        "z": "7b5a733a.b08434",
-        "wires": [
-            [
-                "e4c22eb.a2aea5",
-                "6160b6fc.008b48"
-            ]
-        ]
-    },
-    {
-        "id": "e4c22eb.a2aea5",
-        "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": 1978,
-        "y": 300,
-        "z": "7b5a733a.b08434",
-        "wires": [
-            [
-                "fc0dfed8.0cac3",
-                "c57f71e8.93673"
-            ]
-        ]
-    },
-    {
-        "id": "6160b6fc.008b48",
-        "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<parameter name='bwModified' value='false' />\n",
-        "comments": "",
-        "x": 1937,
-        "y": 250,
-        "z": "7b5a733a.b08434",
-        "wires": []
-    },
-    {
-        "id": "d51caf90.a463f",
-        "type": "comment",
-        "name": "The following two nodes are for PCE",
-        "info": "",
-        "comments": "",
-        "x": 2012,
-        "y": 105,
-        "z": "7b5a733a.b08434",
-        "wires": []
-    },
-    {
-        "id": "f6765cf8.85e25",
-        "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/v21/network/pnfs?depth=0'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"ccsdkTopopnfs\" >",
-        "comments": "",
-        "outputs": 1,
-        "x": 1972,
-        "y": 149,
-        "z": "7b5a733a.b08434",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "66aed450.169b54",
-        "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/v21/network/logical-links?depth=0'\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"ccsdkTopologicalLinks\" >",
-        "comments": "",
-        "outputs": 1,
-        "x": 1985,
-        "y": 194,
-        "z": "7b5a733a.b08434",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "c3532310.372288",
-        "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": 2205,
-        "y": 465,
-        "z": "7b5a733a.b08434",
-        "wires": [
-            [
-                "9a292ac4.9b06e",
-                "35630785.237e1"
-            ]
-        ]
-    },
-    {
-        "id": "c57f71e8.93673",
-        "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,
-        "y": 304,
-        "z": "7b5a733a.b08434",
-        "wires": [
-            [
-                "87b192bc.e1f0e",
-                "d00bb928.2d4ff",
-                "29adfdf9.b65b62"
-            ]
-        ]
-    },
-    {
-        "id": "87b192bc.e1f0e",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2462,
-        "y": 371,
-        "z": "7b5a733a.b08434",
-        "wires": [
-            [
-                "8f69272a.fd278"
-            ]
-        ]
-    },
-    {
-        "id": "d00bb928.2d4ff",
-        "type": "not-found",
-        "name": "not-found",
-        "xml": "<outcome value='not-found'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2462.490966796875,
-        "y": 270.573974609375,
-        "z": "7b5a733a.b08434",
-        "wires": [
-            [
-                "b5f2de6e.0aa398"
-            ]
-        ]
-    },
-    {
-        "id": "29adfdf9.b65b62",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2458,
-        "y": 320,
-        "z": "7b5a733a.b08434",
-        "wires": [
-            [
-                "8aece160.d46958"
-            ]
-        ]
-    },
-    {
-        "id": "b5f2de6e.0aa398",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 2640.0625,
-        "y": 270.8597412109375,
-        "z": "7b5a733a.b08434",
-        "wires": []
-    },
-    {
-        "id": "8aece160.d46958",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
-        "comments": "",
-        "x": 2640,
-        "y": 320,
-        "z": "7b5a733a.b08434",
-        "wires": []
-    },
-    {
-        "id": "8f69272a.fd278",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 2642,
-        "y": 371,
-        "z": "7b5a733a.b08434",
-        "wires": [
-            [
-                "a8018aed.5af3e8"
-            ]
-        ]
-    },
-    {
-        "id": "35630785.237e1",
-        "type": "outcomeFalse",
-        "name": "false",
-        "xml": "<outcome value='false'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2526,
-        "y": 447,
-        "z": "7b5a733a.b08434",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "9a292ac4.9b06e",
-        "type": "outcomeTrue",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2508,
-        "y": 545,
-        "z": "7b5a733a.b08434",
-        "wires": [
-            [
-                "aaa9891e.70ccc8"
-            ]
-        ]
-    },
-    {
-        "id": "a8018aed.5af3e8",
-        "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": 2935,
-        "y": 318,
-        "z": "7b5a733a.b08434",
-        "wires": [
-            [
-                "ee26c76e.4e13b",
-                "ebfa2004.002188",
-                "d77341f8.228578"
-            ]
-        ]
-    },
-    {
-        "id": "ebfa2004.002188",
-        "type": "not-found",
-        "name": "not-found",
-        "xml": "<outcome value='not-found'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3208.490966796875,
-        "y": 210.573974609375,
-        "z": "7b5a733a.b08434",
-        "wires": [
-            [
-                "c12dc61.2210b38"
-            ]
-        ]
-    },
-    {
-        "id": "d77341f8.228578",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3204,
-        "y": 260,
-        "z": "7b5a733a.b08434",
-        "wires": [
-            [
-                "bd3bae8a.af124"
-            ]
-        ]
-    },
-    {
-        "id": "ee26c76e.4e13b",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3208,
-        "y": 311,
-        "z": "7b5a733a.b08434",
-        "wires": [
-            [
-                "de61d430.83d478"
-            ]
-        ]
-    },
-    {
-        "id": "23206dde.76caa2",
-        "type": "switchNode",
-        "name": "switch related-to",
-        "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3173,
-        "y": 512,
-        "z": "7b5a733a.b08434",
-        "wires": [
-            [
-                "9e627c37.4741c8"
-            ]
-        ]
-    },
-    {
-        "id": "fc0dfed8.0cac3",
-        "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,
-        "y": 223,
-        "z": "7b5a733a.b08434",
-        "wires": []
-    },
-    {
-        "id": "c12dc61.2210b38",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 3386.0625,
-        "y": 210.8597412109375,
-        "z": "7b5a733a.b08434",
-        "wires": []
-    },
-    {
-        "id": "bd3bae8a.af124",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
-        "comments": "",
-        "x": 3386,
-        "y": 260,
-        "z": "7b5a733a.b08434",
-        "wires": []
-    },
-    {
-        "id": "de61d430.83d478",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 3388,
-        "y": 311,
-        "z": "7b5a733a.b08434",
-        "wires": [
-            [
-                "c3532310.372288"
-            ]
-        ]
-    },
-    {
-        "id": "9e627c37.4741c8",
-        "type": "outcome",
-        "name": "network-policy",
-        "xml": "<outcome value='network-policy'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 3364,
-        "y": 509,
-        "z": "7b5a733a.b08434",
-        "wires": [
-            [
-                "e7f365c6.bea78"
-            ]
-        ]
-    },
-    {
-        "id": "e7f365c6.bea78",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 3540.9998779296875,
-        "y": 501.9998779296875,
-        "z": "7b5a733a.b08434",
-        "wires": [
-            [
-                "dc98dc9c.c8fc5",
-                "d938d57f.cf2528"
-            ]
-        ]
-    },
-    {
-        "id": "dc98dc9c.c8fc5",
-        "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": 3783.9998779296875,
-        "y": 458.9998779296875,
-        "z": "7b5a733a.b08434",
-        "wires": []
-    },
-    {
-        "id": "d938d57f.cf2528",
-        "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": 3772.9998779296875,
-        "y": 513.9998779296875,
-        "z": "7b5a733a.b08434",
-        "wires": [
-            [
-                "21724bd7.b5773c",
-                "86152ffd.44c928",
-                "acc93ab6.b56018"
-            ]
-        ]
-    },
-    {
-        "id": "acc93ab6.b56018",
-        "type": "not-found",
-        "name": "not-found",
-        "xml": "<outcome value='not-found'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 4026,
-        "y": 400,
-        "z": "7b5a733a.b08434",
-        "wires": [
-            [
-                "958f19ed.72cb28"
-            ]
-        ]
-    },
-    {
-        "id": "958f19ed.72cb28",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 4174.571533203125,
-        "y": 400.2857666015625,
-        "z": "7b5a733a.b08434",
-        "wires": []
-    },
-    {
-        "id": "34514989.26e926",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
-        "comments": "",
-        "x": 4173.509033203125,
-        "y": 444.426025390625,
-        "z": "7b5a733a.b08434",
-        "wires": []
-    },
-    {
-        "id": "86152ffd.44c928",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 4014.509033203125,
-        "y": 444.426025390625,
-        "z": "7b5a733a.b08434",
-        "wires": [
-            [
-                "34514989.26e926"
-            ]
-        ]
-    },
-    {
-        "id": "21724bd7.b5773c",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 4021.509033203125,
-        "y": 523.426025390625,
-        "z": "7b5a733a.b08434",
-        "wires": [
-            [
-                "9ee2f354.296c2"
-            ]
-        ]
-    },
-    {
-        "id": "9ee2f354.296c2",
-        "type": "block",
-        "name": "block",
-        "xml": "<block>\n",
-        "atomic": "false",
-        "comments": "",
-        "outputs": 1,
-        "x": 4160.509033203125,
-        "y": 523.426025390625,
-        "z": "7b5a733a.b08434",
-        "wires": [
-            [
-                "66fe28af.a13018",
-                "a2cba337.578da8"
-            ]
-        ]
-    },
-    {
-        "id": "66fe28af.a13018",
-        "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": 4366,
-        "y": 521,
-        "z": "7b5a733a.b08434",
-        "wires": []
-    },
-    {
-        "id": "a2cba337.578da8",
-        "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": 4365,
-        "y": 567,
-        "z": "7b5a733a.b08434",
-        "wires": []
-    },
-    {
-        "id": "26d1ad19.58f772",
-        "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": 838,
-        "y": 2032,
-        "z": "7b5a733a.b08434",
-        "wires": [
-            []
-        ]
-    }
+  {
+    "id": "e621eef4.cd8d48",
+    "type": "dgstart",
+    "name": "DGSTART",
+    "outputs": 1,
+    "x": 146,
+    "y": 100,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "5137b88e.d87af"
+      ]
+    ]
+  },
+  {
+    "id": "5137b88e.d87af",
+    "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": 430.2856903076172,
+    "y": 161.23810863494873,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "ce96326b.b535f8"
+      ]
+    ]
+  },
+  {
+    "id": "ce96326b.b535f8",
+    "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": 436.42860412597656,
+    "y": 246.00003051757812,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "b7cce22e.b85eb"
+      ]
+    ]
+  },
+  {
+    "id": "b7cce22e.b85eb",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 786,
+    "y": 305,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "42227f1d.ff6a08",
+        "719e39ea.7d4d2",
+        "ad74749f.3bbda"
+      ]
+    ]
+  },
+  {
+    "id": "42227f1d.ff6a08",
+    "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": 1087.33349609375,
+    "y": 575.9302978515625,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "719e39ea.7d4d2",
+    "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": 1108.761962890625,
+    "y": 278.33331298828125,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "c1550efc.b74cd",
+        "59d9b8f3.c672f8",
+        "1a9d72a7.1ac33d"
+      ]
+    ]
+  },
+  {
+    "id": "c1550efc.b74cd",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1333.761962890625,
+    "y": 136.33331298828125,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "c25ad576.a55988"
+      ]
+    ]
+  },
+  {
+    "id": "59d9b8f3.c672f8",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1329.2529296875,
+    "y": 205.9073486328125,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "c5236a8e.8fcb78"
+      ]
+    ]
+  },
+  {
+    "id": "1a9d72a7.1ac33d",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1317.761962890625,
+    "y": 252.33331298828125,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "cebf9d48.2d23"
+      ]
+    ]
+  },
+  {
+    "id": "742cc4f4.befaf4",
+    "type": "comment",
+    "name": "new for TransportSlicing",
+    "info": "",
+    "comments": "",
+    "x": 1087.761962890625,
+    "y": 166.33331298828125,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "ad74749f.3bbda",
+    "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": 1075.761962890625,
+    "y": 218.33331298828125,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "c25ad576.a55988",
+    "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": 1574,
+    "y": 133,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "4f4f6457.1e4aa4",
+        "5da7fc70.28ac2c"
+      ]
+    ]
+  },
+  {
+    "id": "c5236a8e.8fcb78",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 1484.0623779296875,
+    "y": 208.85977172851562,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "cebf9d48.2d23",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+    "comments": "",
+    "x": 1488,
+    "y": 253,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "4f4f6457.1e4aa4",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1779,
+    "y": 170,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "25469631.b624fa"
+      ]
+    ]
+  },
+  {
+    "id": "5da7fc70.28ac2c",
+    "type": "outcomeFalse",
+    "name": "false",
+    "xml": "<outcome value='false'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1789,
+    "y": 97,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "25469631.b624fa",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 1772,
+    "y": 245,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "a3f9c066.8f6f98",
+        "a0f7473f.d23fe8",
+        "dc772464.b9eb38",
+        "796beb97.0c4de4",
+        "52d5e6df.7a6948"
+      ]
+    ]
+  },
+  {
+    "id": "3f08ab8e.dc612c",
+    "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": 2258,
+    "y": 296,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "7db27beb.b640fc",
+        "37eea1d.ba0815e",
+        "9aa976b3.179a58"
+      ]
+    ]
+  },
+  {
+    "id": "7db27beb.b640fc",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2474,
+    "y": 363,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "5eea79ce.34755"
+      ]
+    ]
+  },
+  {
+    "id": "37eea1d.ba0815e",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2474.490966796875,
+    "y": 262.573974609375,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "2ecbbf0c.1ea018"
+      ]
+    ]
+  },
+  {
+    "id": "9aa976b3.179a58",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2470,
+    "y": 312,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "a265198.4abd2e8"
+      ]
+    ]
+  },
+  {
+    "id": "a3f9c066.8f6f98",
+    "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": 1975,
+    "y": 277,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "31eb076e.43ecb",
+        "3f08ab8e.dc612c",
+        "2c19139d.1b72fc",
+        "24e6a4ae.ee277c"
+      ]
+    ]
+  },
+  {
+    "id": "31eb076e.43ecb",
+    "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": 2255,
+    "y": 215,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "796beb97.0c4de4",
+    "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": 1949,
+    "y": 227,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "a0f7473f.d23fe8",
+    "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": 1992,
+    "y": 86,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "dc772464.b9eb38",
+    "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": 2004,
+    "y": 127,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "5c36a24a.1b53d4",
+    "type": "comment",
+    "name": "The following two nodes are for PCE",
+    "info": "",
+    "comments": "",
+    "x": 2029,
+    "y": 39,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "45b74940.f8db1",
+    "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": 1949,
+    "y": 173,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "2ecbbf0c.1ea018",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 2653,
+    "y": 265,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "a265198.4abd2e8",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+    "comments": "",
+    "x": 2652.9375,
+    "y": 314.1402587890625,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "5eea79ce.34755",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 2654.9375,
+    "y": 365.1402587890625,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "c6a94a58.c561c"
+      ]
+    ]
+  },
+  {
+    "id": "c6a94a58.c561c",
+    "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": 2947.9375,
+    "y": 312.1402587890625,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "ec6a2655.48d45",
+        "712e1966.36d6e8",
+        "3dacde72.866102"
+      ]
+    ]
+  },
+  {
+    "id": "712e1966.36d6e8",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3221.428466796875,
+    "y": 204.7142333984375,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "df2b1006.9eb7f8"
+      ]
+    ]
+  },
+  {
+    "id": "df2b1006.9eb7f8",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 3399,
+    "y": 205,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "3dacde72.866102",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3216.9375,
+    "y": 254.1402587890625,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "5f8f39bd.4229a"
+      ]
+    ]
+  },
+  {
+    "id": "5f8f39bd.4229a",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+    "comments": "",
+    "x": 3398.9375,
+    "y": 254.1402587890625,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "ec6a2655.48d45",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3220.9375,
+    "y": 305.1402587890625,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "6e0b9d94.87db34"
+      ]
+    ]
+  },
+  {
+    "id": "6e0b9d94.87db34",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 3400.9375,
+    "y": 305.1402587890625,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "2c8651cc.72086e"
+      ]
+    ]
+  },
+  {
+    "id": "2c8651cc.72086e",
+    "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": 2967,
+    "y": 440,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "870fb1ac.7a3748",
+        "89946234.838048"
+      ]
+    ]
+  },
+  {
+    "id": "89946234.838048",
+    "type": "outcomeFalse",
+    "name": "false",
+    "xml": "<outcome value='false'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3277,
+    "y": 447,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "870fb1ac.7a3748",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3276,
+    "y": 501,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "cd3a7965.655da8"
+      ]
+    ]
+  },
+  {
+    "id": "df2cd421.7d5bf",
+    "type": "outcome",
+    "name": "network-policy",
+    "xml": "<outcome value='network-policy'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4021,
+    "y": 455,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "bcfd0609.c91ee"
+      ]
+    ]
+  },
+  {
+    "id": "bcfd0609.c91ee",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 4197.9998779296875,
+    "y": 447.9998779296875,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "12f46999.b2c5d6",
+        "f8cd059e.d4c72"
+      ]
+    ]
+  },
+  {
+    "id": "cd3a7965.655da8",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 3440,
+    "y": 427,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "bd1bee0.0c5829",
+        "10113dad.89c1ca"
+      ]
+    ]
+  },
+  {
+    "id": "bd1bee0.0c5829",
+    "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": 3721,
+    "y": 383,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "b08f5d28.99f6d8"
+      ]
+    ]
+  },
+  {
+    "id": "b08f5d28.99f6d8",
+    "type": "switchNode",
+    "name": "switch related-to",
+    "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3983,
+    "y": 383,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "df2cd421.7d5bf"
+      ]
+    ]
+  },
+  {
+    "id": "12f46999.b2c5d6",
+    "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": 4440.9998779296875,
+    "y": 404.9998779296875,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "f8cd059e.d4c72",
+    "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": 4429.9998779296875,
+    "y": 459.9998779296875,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "15139b9.c06bf64",
+        "b4015405.9769",
+        "29def152.0b9dae"
+      ]
+    ]
+  },
+  {
+    "id": "29def152.0b9dae",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4683,
+    "y": 346,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "220ef3fd.c7b134"
+      ]
+    ]
+  },
+  {
+    "id": "220ef3fd.c7b134",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 4831.571533203125,
+    "y": 346.2857666015625,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "d3449945.7a9e68",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+    "comments": "",
+    "x": 4830.509033203125,
+    "y": 390.426025390625,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "b4015405.9769",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4671.509033203125,
+    "y": 390.426025390625,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "d3449945.7a9e68"
+      ]
+    ]
+  },
+  {
+    "id": "15139b9.c06bf64",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4678.509033203125,
+    "y": 469.426025390625,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "5056b056.87e29"
+      ]
+    ]
+  },
+  {
+    "id": "5056b056.87e29",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 4817.509033203125,
+    "y": 469.426025390625,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "b058eb58.7f931",
+        "9244d790.6180a"
+      ]
+    ]
+  },
+  {
+    "id": "b058eb58.7f931",
+    "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": 5023,
+    "y": 467,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "9244d790.6180a",
+    "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": 5022,
+    "y": 513,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "10113dad.89c1ca",
+    "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": 3538,
+    "y": 499,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "d6e4de4f.158168"
+      ]
+    ]
+  },
+  {
+    "id": "d6e4de4f.158168",
+    "type": "switchNode",
+    "name": "switch related-to",
+    "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3818,
+    "y": 499,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "aee1198a.c056f"
+      ]
+    ]
+  },
+  {
+    "id": "aee1198a.c056f",
+    "type": "outcome",
+    "name": "logical-link",
+    "xml": "<outcome value='logical-link'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2231.0001220703125,
+    "y": 752.0001220703125,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "e0dc30a1.49a6b"
+      ]
+    ]
+  },
+  {
+    "id": "e0dc30a1.49a6b",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 2408,
+    "y": 745,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "ede7fb40.692cf",
+        "de035f6e.5999f"
+      ]
+    ]
+  },
+  {
+    "id": "ede7fb40.692cf",
+    "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": 2651,
+    "y": 702,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "de035f6e.5999f",
+    "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": 2640,
+    "y": 757,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "91b15c70.189168",
+        "f983d1cd.751748",
+        "e2731f07.c2a9e8"
+      ]
+    ]
+  },
+  {
+    "id": "91b15c70.189168",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2931.490966796875,
+    "y": 735.573974609375,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "9ed0117f.e4187"
+      ]
+    ]
+  },
+  {
+    "id": "f983d1cd.751748",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2920,
+    "y": 780,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "c1f1f22f.ac3cb"
+      ]
+    ]
+  },
+  {
+    "id": "9ed0117f.e4187",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 3080.0625,
+    "y": 735.8597412109375,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "c1f1f22f.ac3cb",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+    "comments": "",
+    "x": 3079,
+    "y": 780,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "e2731f07.c2a9e8",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2927,
+    "y": 859,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "7a39b25.5549b4c"
+      ]
+    ]
+  },
+  {
+    "id": "7a39b25.5549b4c",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 3066,
+    "y": 859,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "f25cc9ec.b05168",
+        "a634b8ac.ea4e88",
+        "1bb6ef49.bdd341",
+        "a7071b50.c7486",
+        "e80ddce6.4971e",
+        "32d67853.ec65d",
+        "a4a1e109.208d68",
+        "8e7b1d45.48bf2",
+        "c8257b0d.cf8598",
+        "e4d1916e.82a0f",
+        "e42c5746.0b4288",
+        "e73ce695.7bd48",
+        "9b16af83.d76cd8",
+        "93a3aa4f.0f4e8"
+      ]
+    ]
+  },
+  {
+    "id": "ae0c8d20.5892e8",
+    "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": 3380,
+    "y": 665,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "f25cc9ec.b05168",
+    "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": 3361,
+    "y": 715,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "93a3aa4f.0f4e8",
+    "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": 3318,
+    "y": 760,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "a634b8ac.ea4e88",
+    "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": 3293,
+    "y": 823,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "1bb6ef49.bdd341",
+    "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": 3294,
+    "y": 878,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "a7071b50.c7486",
+    "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": 3310,
+    "y": 926,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "6881c546.e37ddc",
+        "f8f6c69f.ac74d8",
+        "d522feff.e8a5a"
+      ]
+    ]
+  },
+  {
+    "id": "e80ddce6.4971e",
+    "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": 3299,
+    "y": 1012.9998779296875,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "9806969b.fc3ae",
+        "65b603dc.721f64",
+        "fd2316c5.747f38"
+      ]
+    ]
+  },
+  {
+    "id": "6881c546.e37ddc",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3511,
+    "y": 810,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "8a0e99df.d3a74"
+      ]
+    ]
+  },
+  {
+    "id": "f8f6c69f.ac74d8",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3506.509033203125,
+    "y": 859.426025390625,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "34078213.5a26be"
+      ]
+    ]
+  },
+  {
+    "id": "d522feff.e8a5a",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3510.509033203125,
+    "y": 912.426025390625,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "f11965b9.9944c8"
+      ]
+    ]
+  },
+  {
+    "id": "8a0e99df.d3a74",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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.571533203125,
+    "y": 809.2857666015625,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "34078213.5a26be",
+    "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.509033203125,
+    "y": 859.426025390625,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "9806969b.fc3ae",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3522,
+    "y": 982.9998779296875,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "a6e046a6.757e98"
+      ]
+    ]
+  },
+  {
+    "id": "65b603dc.721f64",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3517.509033203125,
+    "y": 1032.4259033203125,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "45e0f2da.8f444c"
+      ]
+    ]
+  },
+  {
+    "id": "fd2316c5.747f38",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3518.509033203125,
+    "y": 1085.4259033203125,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "415f5150.f3e08"
+      ]
+    ]
+  },
+  {
+    "id": "a6e046a6.757e98",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 3670.571533203125,
+    "y": 982.28564453125,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "45e0f2da.8f444c",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+    "comments": "",
+    "x": 3660.509033203125,
+    "y": 1032.4259033203125,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "f11965b9.9944c8",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 3672,
+    "y": 912,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "f51320c4.bcfce"
+      ]
+    ]
+  },
+  {
+    "id": "415f5150.f3e08",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 3672,
+    "y": 1084.9998779296875,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "1cfd4758.0338b1"
+      ]
+    ]
+  },
+  {
+    "id": "f51320c4.bcfce",
+    "type": "switchNode",
+    "name": "switch nr type",
+    "xml": "<switch test='`$tmp.aai.network-route-one.type`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3844,
+    "y": 912,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "89f8c0d6.b51fa8",
+        "aead6b27.4c3a7"
+      ]
+    ]
+  },
+  {
+    "id": "1cfd4758.0338b1",
+    "type": "switchNode",
+    "name": "switch nr type",
+    "xml": "<switch test='`$tmp.aai.network-route-two.type`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3845,
+    "y": 1085,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "5b9b8e64.ed3588",
+        "226da409.894754"
+      ]
+    ]
+  },
+  {
+    "id": "89f8c0d6.b51fa8",
+    "type": "outcome",
+    "name": "ROOT",
+    "xml": "<outcome value='ROOT'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4020,
+    "y": 891,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "6cfb261d.1543a8"
+      ]
+    ]
+  },
+  {
+    "id": "aead6b27.4c3a7",
+    "type": "outcome",
+    "name": "LEAF",
+    "xml": "<outcome value='LEAF'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4022,
+    "y": 945,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "5cbc637f.f1f25c"
+      ]
+    ]
+  },
+  {
+    "id": "5b9b8e64.ed3588",
+    "type": "outcome",
+    "name": "ROOT",
+    "xml": "<outcome value='ROOT'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4021,
+    "y": 1055,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "1f3d6111.fb3d4f"
+      ]
+    ]
+  },
+  {
+    "id": "226da409.894754",
+    "type": "outcome",
+    "name": "LEAF",
+    "xml": "<outcome value='LEAF'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4023,
+    "y": 1109,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "27ea8b3.eb35a74"
+      ]
+    ]
+  },
+  {
+    "id": "cf6b5beb.abd2a",
+    "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": 4330,
+    "y": 843,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "ab5b8db7.2c0b2",
+    "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": 4323,
+    "y": 941,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "d1673a3d.bf2ad",
+    "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": 4323,
+    "y": 1028,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "6f54a53.db0de5c",
+    "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": 4327,
+    "y": 1121,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "1814f478.bad66c",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3554,
+    "y": 1530,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "d9e53024.28f5e8"
+      ]
+    ]
+  },
+  {
+    "id": "f9e21eb6.e051f",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3563.490966796875,
+    "y": 1572.5740356445312,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "cd9fd29c.16f54"
+      ]
+    ]
+  },
+  {
+    "id": "13935c82.38c04b",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3552,
+    "y": 1619,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "fd85e1a6.4ce26"
+      ]
+    ]
+  },
+  {
+    "id": "f8a45af2.8fc23",
+    "type": "comment",
+    "name": "Question?",
+    "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
+    "comments": "",
+    "x": 3254,
+    "y": 1492,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "a4a1e109.208d68",
+    "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": 3297,
+    "y": 1557,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "1814f478.bad66c",
+        "f9e21eb6.e051f",
+        "13935c82.38c04b"
+      ]
+    ]
+  },
+  {
+    "id": "32d67853.ec65d",
+    "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": 3298,
+    "y": 1227,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "7cda231b.f03dc4",
+        "15924723.6e7491"
+      ]
+    ]
+  },
+  {
+    "id": "15924723.6e7491",
+    "type": "failure",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3521,
+    "y": 1213,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "5b420eac.7f2e3"
+      ]
+    ]
+  },
+  {
+    "id": "7cda231b.f03dc4",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3523,
+    "y": 1246,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "59d39de3.e2d86c"
+      ]
+    ]
+  },
+  {
+    "id": "d9e53024.28f5e8",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 3726.66650390625,
+    "y": 1529,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "dfaba2c2.eca4e8",
+        "4097fc0c.2ebcd4"
+      ]
+    ]
+  },
+  {
+    "id": "cd9fd29c.16f54",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 3717.0623779296875,
+    "y": 1575.8597717285156,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "fd85e1a6.4ce26",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+    "comments": "",
+    "x": 3721,
+    "y": 1620,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "dfaba2c2.eca4e8",
+    "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": 3991,
+    "y": 1513,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "8d48769f.5119e8",
+        "8debbded.83326"
+      ]
+    ]
+  },
+  {
+    "id": "8debbded.83326",
+    "type": "failure",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4214,
+    "y": 1468,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "2541c31e.77739c"
+      ]
+    ]
+  },
+  {
+    "id": "8d48769f.5119e8",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4216,
+    "y": 1532,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "2ddc4c0.3ed3fb4"
+      ]
+    ]
+  },
+  {
+    "id": "2ddc4c0.3ed3fb4",
+    "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": 4378,
+    "y": 1528,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "2541c31e.77739c",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 4379,
+    "y": 1465,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "147c7198.960c76",
+        "5b133092.209f98"
+      ]
+    ]
+  },
+  {
+    "id": "810155a4.74088",
+    "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": 3993,
+    "y": 1672,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "c595cb5f.3ebc78",
+    "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": 4038,
+    "y": 1582,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "d29a1dc3.4eeb5",
+    "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": 4121,
+    "y": 1720,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "59d39de3.e2d86c",
+    "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": 3666,
+    "y": 1243,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "5b420eac.7f2e3",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 3669,
+    "y": 1206,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "c6570a48.d5e8a",
+        "fa28539a.6f35e"
+      ]
+    ]
+  },
+  {
+    "id": "c6570a48.d5e8a",
+    "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": 3843,
+    "y": 1162,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "4097fc0c.2ebcd4",
+    "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": 3945,
+    "y": 1797,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "55bdaff8.d6fa7"
+      ]
+    ]
+  },
+  {
+    "id": "55bdaff8.d6fa7",
+    "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": 4151,
+    "y": 1797,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "13e441a4.daf476"
+      ]
+    ]
+  },
+  {
+    "id": "13e441a4.daf476",
+    "type": "outcome",
+    "name": "tunnel-termination-point",
+    "xml": "<outcome value='tunnel-termination-point'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4366.28564453125,
+    "y": 1796.82177734375,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "9c1550de.a16d68"
+      ]
+    ]
+  },
+  {
+    "id": "fa28539a.6f35e",
+    "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": 3858,
+    "y": 1273,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "b1379be2.7c731",
+        "98821e3.6cffa6",
+        "93a11cc9.4e6df"
+      ]
+    ]
+  },
+  {
+    "id": "b1379be2.7c731",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4053.5001220703125,
+    "y": 1225,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "49daba06.206634"
+      ]
+    ]
+  },
+  {
+    "id": "98821e3.6cffa6",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4045.5001220703125,
+    "y": 1280,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "78abfa9e.41d134"
+      ]
+    ]
+  },
+  {
+    "id": "93a11cc9.4e6df",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4050.5001220703125,
+    "y": 1337,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "ae2448ff.86872"
+      ]
+    ]
+  },
+  {
+    "id": "ae2448ff.86872",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return 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": 4202.5001220703125,
+    "y": 1338,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "78abfa9e.41d134",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 4213.5001220703125,
+    "y": 1283,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "49daba06.206634",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 4197.8824462890625,
+    "y": 1222.6556701660156,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "a244814e.1fdb1"
+      ]
+    ]
+  },
+  {
+    "id": "a244814e.1fdb1",
+    "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": 4382,
+    "y": 1237,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "6f66ca5.eff0fb4"
+      ]
+    ]
+  },
+  {
+    "id": "5b133092.209f98",
+    "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": 4549,
+    "y": 1423,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "147c7198.960c76",
+    "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": 4550,
+    "y": 1531,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "83128f31.28dd3",
+    "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": 4551,
+    "y": 1480,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "9c1550de.a16d68",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 4573.1171875,
+    "y": 1797.34033203125,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "3dd5d699.d7912a",
+        "31d244a7.769454",
+        "41228511.9d3d04"
+      ]
+    ]
+  },
+  {
+    "id": "3dd5d699.d7912a",
+    "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": 4788.1171875,
+    "y": 1759.34033203125,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "31d244a7.769454",
+    "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": 4785.1171875,
+    "y": 1798.34033203125,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "3f687ffd.7ac738"
+      ]
+    ]
+  },
+  {
+    "id": "41228511.9d3d04",
+    "type": "break",
+    "name": "break",
+    "xml": "<break>\n",
+    "comments": "",
+    "x": 4740.6171875,
+    "y": 1840.34033203125,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "3f687ffd.7ac738",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4965.6171875,
+    "y": 1797.34033203125,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "b1d8da7c.fb9068"
+      ]
+    ]
+  },
+  {
+    "id": "73e89a58.b8a2f4",
+    "type": "outcome",
+    "name": "esr-thirdparty-sdnc",
+    "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4780,
+    "y": 1241,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "35399481.176a44"
+      ]
+    ]
+  },
+  {
+    "id": "35399481.176a44",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 4957,
+    "y": 1233,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "689257af.1e32e8",
+        "cffc6960.3515f8"
+      ]
+    ]
+  },
+  {
+    "id": "6f66ca5.eff0fb4",
+    "type": "switchNode",
+    "name": "switch related-to",
+    "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4577,
+    "y": 1237,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "73e89a58.b8a2f4",
+        "8f00bdd8.7bfea8"
+      ]
+    ]
+  },
+  {
+    "id": "8f00bdd8.7bfea8",
+    "type": "outcome",
+    "name": "network-resource",
+    "xml": "<outcome value='network-resource'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 4783,
+    "y": 1315,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "54b58f35.b7982"
+      ]
+    ]
+  },
+  {
+    "id": "54b58f35.b7982",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 4960,
+    "y": 1307,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "bd4488b3.a3f2f8"
+      ]
+    ]
+  },
+  {
+    "id": "b1d8da7c.fb9068",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 5123.6171875,
+    "y": 1797.34033203125,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "45f3cc43.b8716c"
+      ]
+    ]
+  },
+  {
+    "id": "45f3cc43.b8716c",
+    "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": 5330.6171875,
+    "y": 1797.34033203125,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "cffc6960.3515f8",
+    "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": 5165,
+    "y": 1240,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "4c1fabd5.3f0e34",
+        "7bde9a25.02996c",
+        "405a47f8.a7ca18"
+      ]
+    ]
+  },
+  {
+    "id": "689257af.1e32e8",
+    "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": 5195,
+    "y": 1188,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "4c1fabd5.3f0e34",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5375,
+    "y": 1231,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "d4e512d1.26f248"
+      ]
+    ]
+  },
+  {
+    "id": "7bde9a25.02996c",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5367,
+    "y": 1286,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "ecb49f32.439908"
+      ]
+    ]
+  },
+  {
+    "id": "405a47f8.a7ca18",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5372,
+    "y": 1343,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "3104200a.eb8e7"
+      ]
+    ]
+  },
+  {
+    "id": "3104200a.eb8e7",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return 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": 5524,
+    "y": 1344,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "ecb49f32.439908",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 5535,
+    "y": 1289,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "d4e512d1.26f248",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 5519.38232421875,
+    "y": 1228.6556701660156,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "7caf8ab2.26a4a4"
+      ]
+    ]
+  },
+  {
+    "id": "bd4488b3.a3f2f8",
+    "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": 5195,
+    "y": 1431,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "7caf8ab2.26a4a4",
+    "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": 5734,
+    "y": 1225,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "65bbdfd5.3dc13",
+    "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": 4318,
+    "y": 879,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "c089b95e.30fd28",
+    "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": 4309,
+    "y": 977,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "6cfb261d.1543a8",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 4143,
+    "y": 885,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "cf6b5beb.abd2a",
+        "65bbdfd5.3dc13"
+      ]
+    ]
+  },
+  {
+    "id": "5cbc637f.f1f25c",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 4149,
+    "y": 949,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "ab5b8db7.2c0b2",
+        "c089b95e.30fd28"
+      ]
+    ]
+  },
+  {
+    "id": "1f3d6111.fb3d4f",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 4149,
+    "y": 1055,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "d1673a3d.bf2ad",
+        "4aa0587f.0931c"
+      ]
+    ]
+  },
+  {
+    "id": "27ea8b3.eb35a74",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 4152,
+    "y": 1108,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "6f54a53.db0de5c",
+        "21e23a32.325fde"
+      ]
+    ]
+  },
+  {
+    "id": "4aa0587f.0931c",
+    "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": 4309,
+    "y": 1068,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "21e23a32.325fde",
+    "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": 4312,
+    "y": 1159,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "15f88e7e.38b0fa",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 3684,
+    "y": 2369,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "f975e555.4f0a2",
+        "a7320af4.ed9d8"
+      ]
+    ]
+  },
+  {
+    "id": "8b26e8b4.e3dba",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3511.33349609375,
+    "y": 2370,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "15f88e7e.38b0fa"
+      ]
+    ]
+  },
+  {
+    "id": "365caf9e.ae04d8",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3520.824462890625,
+    "y": 2412.5740356445312,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "10960619.7120e2"
+      ]
+    ]
+  },
+  {
+    "id": "f6d27283.d43c08",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3509.33349609375,
+    "y": 2459,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "f60d033c.caa1a"
+      ]
+    ]
+  },
+  {
+    "id": "10960619.7120e2",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 3674.3958740234375,
+    "y": 2415.8597717285156,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "f60d033c.caa1a",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+    "comments": "",
+    "x": 3678.33349609375,
+    "y": 2460,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "f975e555.4f0a2",
+    "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": 3970.33349609375,
+    "y": 2373.0001220703125,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "fb51a1db.aad5c",
+        "a0fb7141.f8212"
+      ]
+    ]
+  },
+  {
+    "id": "a0fb7141.f8212",
+    "type": "failure",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4193.33349609375,
+    "y": 2328.0001220703125,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "db58e724.c5bd7"
+      ]
+    ]
+  },
+  {
+    "id": "fb51a1db.aad5c",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4195.33349609375,
+    "y": 2392.0001220703125,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "c50c321c.8bd388"
+      ]
+    ]
+  },
+  {
+    "id": "c50c321c.8bd388",
+    "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": 4354.33349609375,
+    "y": 2411.0001220703125,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "db58e724.c5bd7",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 4358.33349609375,
+    "y": 2325.0001220703125,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "b0670b4d.55e7b8",
+        "6c9ffe8c.9af1e8"
+      ]
+    ]
+  },
+  {
+    "id": "299e7ae7.513c9e",
+    "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": 3972.33349609375,
+    "y": 2532.0001220703125,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "cbea16a7.2be638",
+    "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": 4017.33349609375,
+    "y": 2442.0001220703125,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "3d100357.15f07c",
+    "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": 4099.33349609375,
+    "y": 2597.0001220703125,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "c8257b0d.cf8598",
+    "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": 3283.33349609375,
+    "y": 2405,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "8b26e8b4.e3dba",
+        "365caf9e.ae04d8",
+        "f6d27283.d43c08"
+      ]
+    ]
+  },
+  {
+    "id": "e000777e.059758",
+    "type": "comment",
+    "name": "Question?",
+    "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
+    "comments": "",
+    "x": 3244.33349609375,
+    "y": 2349,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "8e7b1d45.48bf2",
+    "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": 3301.33349609375,
+    "y": 2067.9998779296875,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "3e16baed.e61f9e",
+        "718c7d79.85c5bc"
+      ]
+    ]
+  },
+  {
+    "id": "718c7d79.85c5bc",
+    "type": "failure",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3524.33349609375,
+    "y": 2053.9998779296875,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "c56ba64b.9ec5c"
+      ]
+    ]
+  },
+  {
+    "id": "3e16baed.e61f9e",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3526.33349609375,
+    "y": 2086.9998779296875,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "8748d48a.d5e098"
+      ]
+    ]
+  },
+  {
+    "id": "8748d48a.d5e098",
+    "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": 3669.33349609375,
+    "y": 2083.9998779296875,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "c56ba64b.9ec5c",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 3672.33349609375,
+    "y": 2046.9998779296875,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "883d33bf.bf29f",
+        "dcb0b05e.f2669"
+      ]
+    ]
+  },
+  {
+    "id": "883d33bf.bf29f",
+    "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": 3866.33349609375,
+    "y": 2050,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "a7320af4.ed9d8",
+    "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": 3929.33349609375,
+    "y": 2682,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "fd321c11.d40e7"
+      ]
+    ]
+  },
+  {
+    "id": "fd321c11.d40e7",
+    "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": 4135.33349609375,
+    "y": 2682,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "e08d51dc.da4c1"
+      ]
+    ]
+  },
+  {
+    "id": "e08d51dc.da4c1",
+    "type": "outcome",
+    "name": "tunnel-termination-point",
+    "xml": "<outcome value='tunnel-termination-point'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4352.619140625,
+    "y": 2680.82177734375,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "10f977b0.bb1b3"
+      ]
+    ]
+  },
+  {
+    "id": "dcb0b05e.f2669",
+    "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": 3888.33349609375,
+    "y": 2118,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "c9b4249e.0909d8",
+        "9e2542d0.859f",
+        "4dfd412.b843d4"
+      ]
+    ]
+  },
+  {
+    "id": "c9b4249e.0909d8",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4083.8336181640625,
+    "y": 2070,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "ade6b82e.1a55d"
+      ]
+    ]
+  },
+  {
+    "id": "9e2542d0.859f",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4075.8336181640625,
+    "y": 2125,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "44f6f51.d8f8c8c"
+      ]
+    ]
+  },
+  {
+    "id": "4dfd412.b843d4",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4080.8336181640625,
+    "y": 2182,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "f041c0d3.954d68"
+      ]
+    ]
+  },
+  {
+    "id": "f041c0d3.954d68",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return 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": 4232.8336181640625,
+    "y": 2183,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "44f6f51.d8f8c8c",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 4243.8336181640625,
+    "y": 2128,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "ade6b82e.1a55d",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 4228.2159423828125,
+    "y": 2067.6556701660156,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "6075bcd4.2c69ac"
+      ]
+    ]
+  },
+  {
+    "id": "b0670b4d.55e7b8",
+    "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": 4528.33349609375,
+    "y": 2286.0001220703125,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "6c9ffe8c.9af1e8",
+    "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": 4529.33349609375,
+    "y": 2391.0001220703125,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "f79c8df1.ba3188",
+    "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": 4524.33349609375,
+    "y": 2340.0001220703125,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "10f977b0.bb1b3",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 4559.45068359375,
+    "y": 2670.3404541015625,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "20309de8.4632aa",
+        "f73e5414.3285",
+        "d0b059a0.487158"
+      ]
+    ]
+  },
+  {
+    "id": "20309de8.4632aa",
+    "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": 4774.45068359375,
+    "y": 2632.3404541015625,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "f73e5414.3285",
+    "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": 4771.45068359375,
+    "y": 2671.3404541015625,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "e534043d.5bd38"
+      ]
+    ]
+  },
+  {
+    "id": "d0b059a0.487158",
+    "type": "break",
+    "name": "break",
+    "xml": "<break>\n",
+    "comments": "",
+    "x": 4726.95068359375,
+    "y": 2713.3404541015625,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "e534043d.5bd38",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4951.95068359375,
+    "y": 2670.3404541015625,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "e48a79a9.dd196"
+      ]
+    ]
+  },
+  {
+    "id": "e48a79a9.dd196",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 5109.95068359375,
+    "y": 2670.3404541015625,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "1f6fa1b2.460606"
+      ]
+    ]
+  },
+  {
+    "id": "1f6fa1b2.460606",
+    "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": 5316.95068359375,
+    "y": 2670.3404541015625,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "a30de028.b28d48",
+    "type": "outcome",
+    "name": "esr-thirdparty-sdnc",
+    "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4810.33349609375,
+    "y": 2086,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "ef5b074c.536d6"
+      ]
+    ]
+  },
+  {
+    "id": "ef5b074c.536d6",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 4987.33349609375,
+    "y": 2078,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "c21d00de.e0733",
+        "82588df6.f2c43"
+      ]
+    ]
+  },
+  {
+    "id": "6075bcd4.2c69ac",
+    "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": 4412.33349609375,
+    "y": 2082,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "9110b39.2ad945"
+      ]
+    ]
+  },
+  {
+    "id": "9110b39.2ad945",
+    "type": "switchNode",
+    "name": "switch related-to",
+    "xml": "<switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4607.33349609375,
+    "y": 2082,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "a30de028.b28d48",
+        "8b328cb8.458cf8"
+      ]
+    ]
+  },
+  {
+    "id": "82588df6.f2c43",
+    "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": 5195.33349609375,
+    "y": 2085,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "815a30c0.42847",
+        "e73296ce.c3274",
+        "43d82526.bf146c"
+      ]
+    ]
+  },
+  {
+    "id": "14ab331b.3a14dd",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 4989.33349609375,
+    "y": 2151,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "d397e592.0e40b"
+      ]
+    ]
+  },
+  {
+    "id": "8b328cb8.458cf8",
+    "type": "outcome",
+    "name": "network-resource",
+    "xml": "<outcome value='network-resource'>",
+    "comments": "",
+    "outputs": 1,
+    "x": 4812.33349609375,
+    "y": 2159,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "14ab331b.3a14dd"
+      ]
+    ]
+  },
+  {
+    "id": "c21d00de.e0733",
+    "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": 5225.33349609375,
+    "y": 2033,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "d397e592.0e40b",
+    "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": 5224.33349609375,
+    "y": 2275,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "815a30c0.42847",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5405.33349609375,
+    "y": 2076,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "665156df.6f87a"
+      ]
+    ]
+  },
+  {
+    "id": "e73296ce.c3274",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5397.33349609375,
+    "y": 2131,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "ae5fbc43.dedc3"
+      ]
+    ]
+  },
+  {
+    "id": "43d82526.bf146c",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5402.33349609375,
+    "y": 2188,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "75c235dd.25a9b4"
+      ]
+    ]
+  },
+  {
+    "id": "75c235dd.25a9b4",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return 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": 5554.33349609375,
+    "y": 2189,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "ae5fbc43.dedc3",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 5565.33349609375,
+    "y": 2134,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "665156df.6f87a",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 5549.7158203125,
+    "y": 2073.6556701660156,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "d81c240c.0e54a"
+      ]
+    ]
+  },
+  {
+    "id": "d81c240c.0e54a",
+    "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": 5764.33349609375,
+    "y": 2070,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "e4d1916e.82a0f",
+    "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`\" />\n<parameter name='tmp.LEAF.uni-tp-id' value=\"`$tmp.src.ltpId`\" />\n",
+    "comments": "",
+    "x": 3263,
+    "y": 1680,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "40d6ba08.05b09c",
+    "type": "comment",
+    "name": "This is it (should be)",
+    "info": "",
+    "comments": "",
+    "x": 4485,
+    "y": 963,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "229afe55.f96f4a",
+    "type": "comment",
+    "name": "This is it (should be)",
+    "info": "",
+    "comments": "",
+    "x": 4477,
+    "y": 1053,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "e42c5746.0b4288",
+    "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`\" />\n<parameter name='tmp.ROOT.uni-tp-id' value=\"`$tmp.dst.ltpId`\" />\n",
+    "comments": "",
+    "x": 3244,
+    "y": 2536,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "e73ce695.7bd48",
+    "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": 3395,
+    "y": 2784,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "9b16af83.d76cd8",
+    "type": "switchNode",
+    "name": "switch found-middle-man?",
+    "xml": "<switch test='`$found-middle-man`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3272,
+    "y": 2894,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "a884f3f1.0f482",
+        "4d74d9a8.bbfb9"
+      ]
+    ]
+  },
+  {
+    "id": "a884f3f1.0f482",
+    "type": "outcomeFalse",
+    "name": "false",
+    "xml": "<outcome value='false'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3456,
+    "y": 2873,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "51c791fd.f5a538"
+      ]
+    ]
+  },
+  {
+    "id": "4d74d9a8.bbfb9",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 2992,
+    "y": 4459,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "b3f9daed.71701"
+      ]
+    ]
+  },
+  {
+    "id": "cc64efe3.d91b48",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic='true'>",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 3503,
+    "y": 5044,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "b3fda79b.50166",
+        "d6cce90e.618d6",
+        "1292663a.8513e2",
+        "99c42fc9.238f28",
+        "978af086.86b638"
+      ]
+    ]
+  },
+  {
+    "id": "51c791fd.f5a538",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic='true'>",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 6575,
+    "y": 2903,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "dcfc3248.c259d8",
+        "e0075324.e8eb9",
+        "e518ac23.9dfc28",
+        "537fab21.dec464",
+        "c34912bf.eaaae",
+        "afe65ba5.55b07",
+        "aac07044.b000d8",
+        "b8e3ea6a.2b3c98",
+        "2ef08f21.6201e",
+        "9901809f.3fcb1",
+        "fb2dd54d.4da48",
+        "2cb954fb.0ad334",
+        "328265e5.ceed9a",
+        "c5a55a83.29a8d8",
+        "9aa98499.f86768",
+        "387b0229.0d7006",
+        "4295e286.bfc1e4",
+        "d084e39e.bba608",
+        "a403e16a.cb2408"
+      ]
+    ]
+  },
+  {
+    "id": "2ef08f21.6201e",
+    "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": 6886,
+    "y": 3258,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "dcfc3248.c259d8",
+    "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": 6840,
+    "y": 3356,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "e0075324.e8eb9",
+    "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": 6976,
+    "y": 3403,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "9cbf56aa.ad5218",
+    "type": "comment",
+    "name": "Create ROOT connectivity",
+    "info": "",
+    "comments": "",
+    "x": 6807,
+    "y": 3207,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "2b713353.70ef7c",
+    "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": 7333,
+    "y": 3698,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "e518ac23.9dfc28",
+    "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": 6897,
+    "y": 3737,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "537fab21.dec464",
+    "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": 6845,
+    "y": 3788,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "c34912bf.eaaae",
+    "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": 6981,
+    "y": 3835,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "60b2fbe4.e4d04c",
+    "type": "comment",
+    "name": "Create MIDDLE-MAN connectivity",
+    "info": "",
+    "comments": "",
+    "x": 6838,
+    "y": 3697,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "fcf93995.6af71",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic='true'>",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 7268,
+    "y": 3894,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "afe65ba5.55b07",
+    "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": 6859,
+    "y": 3941,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "68159cb3.0ebba4",
+        "c63fd2a4.712768",
+        "3a361ef1.e7793a"
+      ]
+    ]
+  },
+  {
+    "id": "68159cb3.0ebba4",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 7106,
+    "y": 3895,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "fcf93995.6af71"
+      ]
+    ]
+  },
+  {
+    "id": "c63fd2a4.712768",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 7106.490966796875,
+    "y": 3940.5740356445312,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "a1ea132a.743c88"
+      ]
+    ]
+  },
+  {
+    "id": "3a361ef1.e7793a",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 7104,
+    "y": 3984,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "b000dcd9.6a6a6"
+      ]
+    ]
+  },
+  {
+    "id": "a1ea132a.743c88",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 7269.0623779296875,
+    "y": 3940.8597717285156,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "b000dcd9.6a6a6",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+    "comments": "",
+    "x": 7273,
+    "y": 3985,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "9aa98499.f86768",
+    "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": 6916,
+    "y": 4220,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "387b0229.0d7006",
+    "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": 6919,
+    "y": 4265,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "d084e39e.bba608",
+    "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": 6908,
+    "y": 4056,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "a403e16a.cb2408",
+    "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": 6910,
+    "y": 4103,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "344300f.08239",
+    "type": "comment",
+    "name": "The following two will be done in F1",
+    "info": "",
+    "comments": "",
+    "x": 6832,
+    "y": 4173,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "b25b6055.f41fc",
+    "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": 4461.999755859375,
+    "y": 5324,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "b3fda79b.50166",
+    "type": "switchNode",
+    "name": "switch no-pce-call",
+    "xml": "<switch test='`$no-pce-call`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3718,
+    "y": 5025,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "980c8526.303db",
+        "36a09550.068efa"
+      ]
+    ]
+  },
+  {
+    "id": "36a09550.068efa",
+    "type": "outcomeFalse",
+    "name": "false",
+    "xml": "<outcome value='false'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3890,
+    "y": 5022,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "de34c1af.7b7ab"
+      ]
+    ]
+  },
+  {
+    "id": "980c8526.303db",
+    "type": "outcomeFalse",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3842,
+    "y": 5869,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "a5898926.6491f"
+      ]
+    ]
+  },
+  {
+    "id": "8ada44e5.f9f04",
+    "type": "comment",
+    "name": "1 --> PCE is needed",
+    "info": "",
+    "comments": "",
+    "x": 3903,
+    "y": 4992,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "5e264f22.beeb98",
+    "type": "comment",
+    "name": "2 --> no need to call PCE",
+    "info": "",
+    "comments": "",
+    "x": 3913,
+    "y": 5827,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "aac07044.b000d8",
+    "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": 6916,
+    "y": 4329,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "de34c1af.7b7ab",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic='true'>",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 4066,
+    "y": 5024,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "8283f1ca.0934e",
+        "d88e7d60.d8e85",
+        "d37e54c7.dc098",
+        "74df2b94.0f2054",
+        "e51131c0.7c711",
+        "77a4c18.eb27d4",
+        "b25b6055.f41fc"
+      ]
+    ]
+  },
+  {
+    "id": "557f9fe2.05b59",
+    "type": "comment",
+    "name": "Use the middle-man-conn.eth-srv-name for the LEAF connectivity's eth srv name",
+    "info": "",
+    "comments": "",
+    "x": 5509.999755859375,
+    "y": 4949,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "8283f1ca.0934e",
+    "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": 4456.999755859375,
+    "y": 5627,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "b8e3ea6a.2b3c98",
+    "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": 6892,
+    "y": 3597,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "f013f824.788458",
+    "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": 3376,
+    "y": 1786,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "61df2559.b0a7f4",
+    "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": 3283,
+    "y": 1733,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "a02e380a.b3cf4",
+    "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": 6942,
+    "y": 3300,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "9901809f.3fcb1",
+    "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": 6889,
+    "y": 2888,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "fb2dd54d.4da48",
+    "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": 6837,
+    "y": 2936,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "2cb954fb.0ad334",
+    "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": 6965,
+    "y": 2983,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "d3975532.a6eff",
+    "type": "comment",
+    "name": "Create LEAF connectivity",
+    "info": "",
+    "comments": "",
+    "x": 6802,
+    "y": 2846,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "328265e5.ceed9a",
+    "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": 6799,
+    "y": 3074,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "c5a55a83.29a8d8",
+    "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": 6892,
+    "y": 3127,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "24258df6.dd1f32",
+    "type": "comment",
+    "name": "Create LEAF UNI",
+    "info": "",
+    "comments": "",
+    "x": 6783,
+    "y": 3030,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "9e59bbd5.dc241",
+    "type": "comment",
+    "name": "Create ROOT UNI",
+    "info": "",
+    "comments": "",
+    "x": 6789,
+    "y": 3480,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "74df2b94.0f2054",
+    "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": 4378.999755859375,
+    "y": 4957,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "e382f150.3ff898",
+    "type": "comment",
+    "name": "Create LEAF UNI",
+    "info": "",
+    "comments": "",
+    "x": 4362.999755859375,
+    "y": 4913,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "b5d28059.1f56c",
+    "type": "comment",
+    "name": "Create LEAF connectivity",
+    "info": "",
+    "comments": "",
+    "x": 5109.999755859375,
+    "y": 4944,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "9a9628dc.017478",
+    "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": 5196.999755859375,
+    "y": 4986,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "73763019.23312",
+    "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": 5144.999755859375,
+    "y": 5034,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "8700555a.80709",
+    "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": 5272.999755859375,
+    "y": 5081,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "77a4c18.eb27d4",
+    "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": 4449.999755859375,
+    "y": 5366,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "d49ec047.690ff8",
+    "type": "comment",
+    "name": "populate connectivity-B variable in the context map",
+    "info": "",
+    "comments": "",
+    "x": 4432.999755859375,
+    "y": 5428,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "d88e7d60.d8e85",
+    "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": 4543.999755859375,
+    "y": 5470,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "b06e730a.cb4f08",
+    "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": 4991.999755859375,
+    "y": 5523,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "86caea3e.0715e8",
+    "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": 4301.999755859375,
+    "y": 6221,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "54495687.db6e08",
+    "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": 4234.999755859375,
+    "y": 6175,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "eb729332.c66588",
+    "type": "comment",
+    "name": "Create LEAF UNI",
+    "info": "",
+    "comments": "",
+    "x": 4183.999755859375,
+    "y": 6126,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "d4928728.f80f18",
+    "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": 4967,
+    "y": 6332,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "d37e54c7.dc098",
+    "type": "switchNode",
+    "name": "switch found-root-connectivity",
+    "xml": "\n<switch test=\"`$found-root-connectivity`\">\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4370.999755859375,
+    "y": 5527,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "94ae8414.9a9908",
+        "bf5ff48.5c73588"
+      ]
+    ]
+  },
+  {
+    "id": "94ae8414.9a9908",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4581.999755859375,
+    "y": 5527,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "62e35c20.8fafcc"
+      ]
+    ]
+  },
+  {
+    "id": "62e35c20.8fafcc",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic='true'>",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 4737.999755859375,
+    "y": 5523,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "b06e730a.cb4f08",
+        "4dbfd84e.baba9",
+        "22a50e4b.58e402"
+      ]
+    ]
+  },
+  {
+    "id": "bf5ff48.5c73588",
+    "type": "outcomeFalse",
+    "name": "false",
+    "xml": "<outcome value='false'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4577.999755859375,
+    "y": 5575,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "98134483.cc3d7"
+      ]
+    ]
+  },
+  {
+    "id": "98134483.cc3d7",
+    "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": 4725.999755859375,
+    "y": 5570,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "f71cc5a0.3af018",
+    "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": 5233.999755859375,
+    "y": 5152,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "2c19139d.1b72fc",
+    "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": 2401,
+    "y": 111,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "24e6a4ae.ee277c",
+    "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": 2335,
+    "y": 147,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "f4d12dd6.283218",
+    "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": 2520,
+    "y": 74,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "24b292e6.4df33e",
+    "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": 4268.999755859375,
+    "y": 6287,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "7a0aa2d.fce125c",
+    "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": 4401.999755859375,
+    "y": 6335,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "50b3cc59.11db24",
+    "type": "switchNode",
+    "name": "switch found-connectivity?",
+    "xml": "\n<switch test=\"`$found-connectivity`\">\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4220.999755859375,
+    "y": 6393,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "3d73c45f.10f0ec",
+        "cd840dd8.7d1be8"
+      ]
+    ]
+  },
+  {
+    "id": "3d73c45f.10f0ec",
+    "type": "outcomeFalse",
+    "name": "false",
+    "xml": "<outcome value='false'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4413.999755859375,
+    "y": 6394,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "bd700c8c.0189e8"
+      ]
+    ]
+  },
+  {
+    "id": "bd700c8c.0189e8",
+    "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": 4569.999755859375,
+    "y": 6391,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "cd840dd8.7d1be8",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4417.999755859375,
+    "y": 6438,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "a8ddf5df.ccbdb"
+      ]
+    ]
+  },
+  {
+    "id": "a8ddf5df.ccbdb",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 4556.999755859375,
+    "y": 6433,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "d4928728.f80f18",
+        "dd8d3775.a881a",
+        "85ecad27.9bfc8",
+        "72e32840.b04238",
+        "704867e2.0c96c8",
+        "27d3e822.44bc48",
+        "e87bb1d8.7deca",
+        "fd00316c.9df6b",
+        "dbdf2c9.87c1b5",
+        "4bb3191b.a6309",
+        "6165612a.74a1f8",
+        "901e2d41.157da8"
+      ]
+    ]
+  },
+  {
+    "id": "e87bb1d8.7deca",
+    "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": 4753.999755859375,
+    "y": 7112,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "50c2bb1d.1918b4",
+        "5f510bf0.f61244",
+        "bca3f050.7f93f"
+      ]
+    ]
+  },
+  {
+    "id": "50c2bb1d.1918b4",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4958.999755859375,
+    "y": 7109,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "6803d387.7ac854"
+      ]
+    ]
+  },
+  {
+    "id": "5f510bf0.f61244",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4942.49072265625,
+    "y": 7170.574035644531,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "d60db86d.dbd268"
+      ]
+    ]
+  },
+  {
+    "id": "bca3f050.7f93f",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4939.999755859375,
+    "y": 7214,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "1f943971.7bdbb7"
+      ]
+    ]
+  },
+  {
+    "id": "6803d387.7ac854",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 5127,
+    "y": 7104,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "90b83d2f.dffcf"
+      ]
+    ]
+  },
+  {
+    "id": "d60db86d.dbd268",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 5105.0621337890625,
+    "y": 7170.859771728516,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "1f943971.7bdbb7",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+    "comments": "",
+    "x": 5106.999755859375,
+    "y": 7213,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "90b83d2f.dffcf",
+    "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": 5361.999755859375,
+    "y": 7120,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "495a0b6e.3eb454"
+      ]
+    ]
+  },
+  {
+    "id": "495a0b6e.3eb454",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic='true'>",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 5598.999755859375,
+    "y": 7116,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "34e344a3.9ead3c"
+      ]
+    ]
+  },
+  {
+    "id": "fe37ae21.64a32",
+    "type": "switchNode",
+    "name": "switch vpnuuid is for this slice",
+    "xml": "<!--<switch test=\"`$tmp.slicevpnuuids[$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id] != '' `\">-->\n\n<!-- Replace vpn-type with slice-id (a new attribbute in the latest AAI) -->\n<switch test=\"`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].slice-id == $tmp.aai.service-instance.service-instance-id `\">\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5865.999755859375,
+    "y": 7082,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "f98c5893.919c78",
+        "e901664c.c5fec"
+      ]
+    ]
+  },
+  {
+    "id": "f98c5893.919c78",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 6046.999755859375,
+    "y": 7108,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "34e344a3.9ead3c"
+      ]
+    ]
+  },
+  {
+    "id": "e901664c.c5fec",
+    "type": "outcomeFalse",
+    "name": "false",
+    "xml": "<outcome value='false'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 6045.999755859375,
+    "y": 7061,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "34e344a3.9ead3c",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic='true'>",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 4789.999755859375,
+    "y": 7383,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "254dab5b.54ef9c"
+      ]
+    ]
+  },
+  {
+    "id": "9666a3e2.48dd48",
+    "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": 5638.999755859375,
+    "y": 7288,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "d1379ae2.1582e8",
+    "type": "comment",
+    "name": "find all OTNs that have srcTtpOtnLayer and increase their bandwidth",
+    "info": "",
+    "comments": "",
+    "x": 4851.999755859375,
+    "y": 7059,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "27d3e822.44bc48",
+    "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": 4735.999755859375,
+    "y": 6908,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "e580aaa3.2d8a9",
+    "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": 5080.999755859375,
+    "y": 6739,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "ef9ad0a5.eedb18"
+      ]
+    ]
+  },
+  {
+    "id": "ef9ad0a5.eedb18",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5300.999755859375,
+    "y": 6745,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "5a7e6348.1665b4"
+      ]
+    ]
+  },
+  {
+    "id": "5a7e6348.1665b4",
+    "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": 5485.999755859375,
+    "y": 6744,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "da67f694.85343"
+      ]
+    ]
+  },
+  {
+    "id": "da67f694.85343",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5677.999755859375,
+    "y": 6747,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "4b28f457.fca6dc"
+      ]
+    ]
+  },
+  {
+    "id": "4b28f457.fca6dc",
+    "type": "set",
+    "name": "set otnTopoIdSrc",
+    "xml": "<set>\n<parameter name='otnTopoIdSrc' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />\n",
+    "comments": "",
+    "x": 5886.999755859375,
+    "y": 6745,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "fd00316c.9df6b",
+    "type": "for",
+    "name": "for netwidx..allNetworksList_length",
+    "xml": "<for index='netwidx' start='0' end='`$allNetworksList.network-resource_length`' >",
+    "comments": "",
+    "outputs": 1,
+    "x": 4787.999755859375,
+    "y": 6733,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "e580aaa3.2d8a9"
+      ]
+    ]
+  },
+  {
+    "id": "85ecad27.9bfc8",
+    "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": 4795.999755859375,
+    "y": 6626,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "bf91a387.2b3ef",
+        "a3168ee5.a6eba",
+        "a823346f.949088"
+      ]
+    ]
+  },
+  {
+    "id": "bf91a387.2b3ef",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5031.999755859375,
+    "y": 6609,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "a3168ee5.a6eba",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5028.999755859375,
+    "y": 6650,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "a823346f.949088",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5042.999755859375,
+    "y": 6690,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "72e32840.b04238",
+    "type": "set",
+    "name": "unset parameters",
+    "xml": "<set>\n<parameter name='tmp.pce-src-node.' value='' />\n",
+    "comments": "",
+    "x": 4731.999755859375,
+    "y": 6785,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "704867e2.0c96c8",
+    "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": 4739.999755859375,
+    "y": 6843,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "dd8d3775.a881a",
+    "type": "set",
+    "name": "unset parameters",
+    "xml": "<set>\n<parameter name='allNetworksList.' value='' />\n",
+    "comments": "",
+    "x": 4744.999755859375,
+    "y": 6583,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "405773c0.604cf4",
+    "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": 4859.999755859375,
+    "y": 6535,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "254dab5b.54ef9c",
+    "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": 5032.999755859375,
+    "y": 7380,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "c4177590.731478",
+        "fbd9a21c.61ca1"
+      ]
+    ]
+  },
+  {
+    "id": "c4177590.731478",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5261.999755859375,
+    "y": 7357,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "7eaf264d.a29568"
+      ]
+    ]
+  },
+  {
+    "id": "fbd9a21c.61ca1",
+    "type": "outcomeFalse",
+    "name": "false",
+    "xml": "<outcome value='false'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5261.999755859375,
+    "y": 7406,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "7eaf264d.a29568",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic='true'>",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 5422.999755859375,
+    "y": 7362,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "63b355d2.4342ec",
+        "9666a3e2.48dd48",
+        "ddab8936.6aed7"
+      ]
+    ]
+  },
+  {
+    "id": "74f5cdfa.eb70bc",
+    "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": 5766.999755859375,
+    "y": 7342,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "ddab8936.6aed7",
+    "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": 5736.999755859375,
+    "y": 7402,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "63b355d2.4342ec",
+    "type": "set",
+    "name": "unset tmp.aai.the-vpn-binding",
+    "xml": "<set>\n<parameter name='tmp.aai.the-vpn-binding.' value=\"\" />\n",
+    "comments": "",
+    "x": 5643.999755859375,
+    "y": 7230,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "a5898926.6491f",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic='true'>",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 3994,
+    "y": 5868,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "54495687.db6e08",
+        "24b292e6.4df33e",
+        "7a0aa2d.fce125c",
+        "50b3cc59.11db24",
+        "86caea3e.0715e8"
+      ]
+    ]
+  },
+  {
+    "id": "2f70568d.ac5cfa",
+    "type": "set",
+    "name": "unset otnTopoIdSrc",
+    "xml": "<set>\n<parameter name='otnTopoIdSrc' value='' />\n",
+    "comments": "",
+    "x": 4736.999755859375,
+    "y": 6683,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "dbdf2c9.87c1b5",
+    "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": 4860,
+    "y": 6413,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "9514e457.86bcb",
+    "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": 4997,
+    "y": 6363,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "4295e286.bfc1e4",
+    "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": 6805,
+    "y": 3539,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "68ccdecd.da9c28",
+    "type": "comment",
+    "name": "NOT NEEDED ANYMORE?",
+    "info": "",
+    "comments": "",
+    "x": 4011,
+    "y": 1764,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "604167bb.5b07c",
+    "type": "comment",
+    "name": "NOT NEEDED ANYMORE?",
+    "info": "",
+    "comments": "",
+    "x": 3989,
+    "y": 2634,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "8e1315c9.c7504",
+    "type": "comment",
+    "name": "TEMPORARY REMOVING THE FOLLOWING TWO NODES",
+    "info": "",
+    "comments": "",
+    "x": 6796,
+    "y": 4006,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "52d5e6df.7a6948",
+    "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": 3501,
+    "y": 6008,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "d6cce90e.618d6",
+    "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": 3712,
+    "y": 4885,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "1292663a.8513e2",
+    "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": 3845,
+    "y": 4933,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "e51131c0.7c711",
+    "type": "switchNode",
+    "name": "switch found-connectivity?",
+    "xml": "\n<switch test=\"`$found-connectivity`\">\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4389.999755859375,
+    "y": 5013,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "ed5f2a8f.0d1a9",
+        "e9808943.cadcd8"
+      ]
+    ]
+  },
+  {
+    "id": "ed5f2a8f.0d1a9",
+    "type": "outcomeFalse",
+    "name": "false",
+    "xml": "<outcome value='false'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4582.999755859375,
+    "y": 5014,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "1ae9053e.f80b53"
+      ]
+    ]
+  },
+  {
+    "id": "e9808943.cadcd8",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4586.999755859375,
+    "y": 5058,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "63eaf34c.bfa79c"
+      ]
+    ]
+  },
+  {
+    "id": "63eaf34c.bfa79c",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic='true'>",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 4725.999755859375,
+    "y": 5053,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "5c22d3df.9e2c54",
+        "cdccad8.628e65",
+        "86db9e26.58f248"
+      ]
+    ]
+  },
+  {
+    "id": "1ae9053e.f80b53",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic='true'>",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 4725.999755859375,
+    "y": 5010,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "9a9628dc.017478",
+        "73763019.23312",
+        "8700555a.80709",
+        "f71cc5a0.3af018"
+      ]
+    ]
+  },
+  {
+    "id": "5c22d3df.9e2c54",
+    "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": 5119.999755859375,
+    "y": 5304,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "dc89033c.db42f",
+    "type": "comment",
+    "name": "populate connectivity-A variable in the context map",
+    "info": "",
+    "comments": "",
+    "x": 5126.999755859375,
+    "y": 5258,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "4bb3191b.a6309",
+    "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": 4924.999755859375,
+    "y": 7008,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "cdccad8.628e65",
+    "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": 5238.999755859375,
+    "y": 5357,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "4dbfd84e.baba9",
+    "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": 5120.999755859375,
+    "y": 5575,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "aaf5216a.eeae28",
+    "type": "comment",
+    "name": "Update ROOT UNI's bw",
+    "info": "",
+    "comments": "",
+    "x": 3676,
+    "y": 4483,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "87b59262.19be68",
+    "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": 4010,
+    "y": 4666,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "99c42fc9.238f28",
+    "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": 3622,
+    "y": 4533,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "31595937.eb192e",
+        "22ed3030.07f7",
+        "665827a1.858f8"
+      ]
+    ]
+  },
+  {
+    "id": "22ed3030.07f7",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3849.490966796875,
+    "y": 4505.573974609375,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "dc72fe1c.e68cb8"
+      ]
+    ]
+  },
+  {
+    "id": "665827a1.858f8",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3845,
+    "y": 4549.999938964844,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "a6baec30.078818"
+      ]
+    ]
+  },
+  {
+    "id": "dc72fe1c.e68cb8",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 4012.0625,
+    "y": 4504.859680175781,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "a6baec30.078818",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+    "comments": "",
+    "x": 4013,
+    "y": 4549.999938964844,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "cead87a8.8e6e18",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 3798,
+    "y": 4623,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "6dc71645.66cda8",
+        "87b59262.19be68"
+      ]
+    ]
+  },
+  {
+    "id": "31595937.eb192e",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3629,
+    "y": 4623,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "cead87a8.8e6e18"
+      ]
+    ]
+  },
+  {
+    "id": "6dc71645.66cda8",
+    "type": "set",
+    "name": "set new bw",
+    "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.rootuni.data-source + $gfp`' />\n",
+    "comments": "",
+    "x": 3987,
+    "y": 4615,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "978af086.86b638",
+    "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": 3820,
+    "y": 4761,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "b6303c7e.1a4d78",
+    "type": "comment",
+    "name": "We are doing modify but middle man does not exist ==> it is definitely a new logical link",
+    "info": "",
+    "comments": "",
+    "x": 3603,
+    "y": 2844,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "4a459c78.1597f4",
+    "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": 3458,
+    "y": 4411,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "53b126d5.31588",
+    "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": 3231,
+    "y": 4679,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "60778167.b14ae8",
+        "7c3e1eb0.4f5258"
+      ]
+    ]
+  },
+  {
+    "id": "b3f9daed.71701",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 3063,
+    "y": 4682,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "53b126d5.31588"
+      ]
+    ]
+  },
+  {
+    "id": "7c3e1eb0.4f5258",
+    "type": "outcomeFalse",
+    "name": "false",
+    "xml": "<outcome value='false'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3394,
+    "y": 4698,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "cc64efe3.d91b48"
+      ]
+    ]
+  },
+  {
+    "id": "60778167.b14ae8",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3430,
+    "y": 3305,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "ba6991ee.d10c88"
+      ]
+    ]
+  },
+  {
+    "id": "8a70b695.acfad8",
+    "type": "switchNode",
+    "name": "switch leafuni.data-source == gfp",
+    "xml": "<switch test='`$tmp.aai.leafuni.data-source == $gfp`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3746,
+    "y": 3357,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "e00e54ae.19df5",
+        "8d19b4f.45dca48"
+      ]
+    ]
+  },
+  {
+    "id": "e00e54ae.19df5",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3951,
+    "y": 3353,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "8d19b4f.45dca48",
+    "type": "outcomeFalse",
+    "name": "false",
+    "xml": "<outcome value='false'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3953,
+    "y": 3403,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "bfb5d522.1c8f"
+      ]
+    ]
+  },
+  {
+    "id": "bfb5d522.1c8f",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 4109,
+    "y": 3409,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "913a939f.a7796",
+        "99a26dee.a8c93",
+        "405f8638.47d8b",
+        "7041bf45.3f922"
+      ]
+    ]
+  },
+  {
+    "id": "913a939f.a7796",
+    "type": "set",
+    "name": "set bwModified",
+    "xml": "<set>\n<parameter name='bwModified' value=\"true\" />\n\n\n",
+    "comments": "",
+    "x": 4335.000244140625,
+    "y": 3150,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "1f1cb5e7.86a3a2",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 4913.999755859375,
+    "y": 4081,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "9334ab3f.b057e8",
+        "830719d7.f425c"
+      ]
+    ]
+  },
+  {
+    "id": "830719d7.f425c",
+    "type": "set",
+    "name": "unset tmp.aai.vpn-binding",
+    "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value='' />\n",
+    "comments": "",
+    "x": 5156.99951171875,
+    "y": 4030,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "4b5e092e.90e4a",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+    "comments": "",
+    "x": 4761,
+    "y": 4305.999755859375,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "a99f59e2.0b7f4",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 4758.0621337890625,
+    "y": 4254.859771728516,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "47107257.07ed4c",
+    "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": 4379.999755859375,
+    "y": 4081,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "74f02dc6.f3e414"
+      ]
+    ]
+  },
+  {
+    "id": "74f02dc6.f3e414",
+    "type": "switchNode",
+    "name": "switch related-to",
+    "xml": "<switch test='`$tmp.the-connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4584.999755859375,
+    "y": 4081,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "1b38e917.2d37ff"
+      ]
+    ]
+  },
+  {
+    "id": "1b38e917.2d37ff",
+    "type": "outcome",
+    "name": "vpn-binding",
+    "xml": "<outcome value='vpn-binding'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4750.999755859375,
+    "y": 4081,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "1f1cb5e7.86a3a2"
+      ]
+    ]
+  },
+  {
+    "id": "9334ab3f.b057e8",
+    "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": 4383.999755859375,
+    "y": 4207,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "cee536c3.51917",
+        "9ce1aec4.35a0f8",
+        "3311b32f.fd5cec"
+      ]
+    ]
+  },
+  {
+    "id": "cee536c3.51917",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4594.999755859375,
+    "y": 4209,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "6ce9ff77.88c36"
+      ]
+    ]
+  },
+  {
+    "id": "9ce1aec4.35a0f8",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4595.49072265625,
+    "y": 4254.574035644531,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "a99f59e2.0b7f4"
+      ]
+    ]
+  },
+  {
+    "id": "3311b32f.fd5cec",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4592.999755859375,
+    "y": 4298,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "4b5e092e.90e4a"
+      ]
+    ]
+  },
+  {
+    "id": "ba6991ee.d10c88",
+    "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": 3620,
+    "y": 3200,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "3e6e8807.399b1",
+        "6cb7f3.c190b00c",
+        "4ea4467e.d45e28"
+      ]
+    ]
+  },
+  {
+    "id": "6cb7f3.c190b00c",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3847.490966796875,
+    "y": 3172.573974609375,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "3aa5489d.56185"
+      ]
+    ]
+  },
+  {
+    "id": "4ea4467e.d45e28",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3843,
+    "y": 3216.9999389648438,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "2d33201a.1cd89"
+      ]
+    ]
+  },
+  {
+    "id": "3aa5489d.56185",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 4010.0625,
+    "y": 3171.8596801757812,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "2d33201a.1cd89",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+    "comments": "",
+    "x": 4011,
+    "y": 3216.9999389648438,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "3e6e8807.399b1",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3855,
+    "y": 3267,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "8a70b695.acfad8"
+      ]
+    ]
+  },
+  {
+    "id": "9229fa15.bd2d6",
+    "type": "comment",
+    "name": "Find LEAF and ROOT connectivity, then find vpn-bindings of each. adjust bw",
+    "info": "",
+    "comments": "",
+    "x": 3744.883331298828,
+    "y": 3457.883331298828,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "c7be917.1958a7",
+    "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": 3759.60009765625,
+    "y": 3809.683349609375,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "1c05cf82.c8b1",
+    "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": 3897.60009765625,
+    "y": 3867.683349609375,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "99a26dee.a8c93",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 3475.60009765625,
+    "y": 3549.083251953125,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "c7be917.1958a7",
+        "1c05cf82.c8b1",
+        "469db255.7b4444",
+        "efc1c364.4b4c58",
+        "6f34f40.331fa0c",
+        "1b1a4e3.a475eb2"
+      ]
+    ]
+  },
+  {
+    "id": "469db255.7b4444",
+    "type": "switchNode",
+    "name": "switch found-connectivity?",
+    "xml": "\n<switch test=\"`$found-connectivity`\">\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3716.60009765625,
+    "y": 3977.4833984375,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "464367ed.3d00b",
+        "e6e54b24.32fb6"
+      ]
+    ]
+  },
+  {
+    "id": "464367ed.3d00b",
+    "type": "outcomeFalse",
+    "name": "false",
+    "xml": "<outcome value='false'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3909.60009765625,
+    "y": 3978.4833984375,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "a3ebf193.e277d"
+      ]
+    ]
+  },
+  {
+    "id": "e6e54b24.32fb6",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3913.60009765625,
+    "y": 4022.4833984375,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "6798c9ca.f3748"
+      ]
+    ]
+  },
+  {
+    "id": "6798c9ca.f3748",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic='true'>",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 4052.60009765625,
+    "y": 4017.4833984375,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "47107257.07ed4c"
+      ]
+    ]
+  },
+  {
+    "id": "a3ebf193.e277d",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return 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": 4053.60009765625,
+    "y": 3974.683349609375,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "405f8638.47d8b",
+    "type": "switchNode",
+    "name": "switch leafuni.data-source > gfp",
+    "xml": "<switch test='`$tmp.aai.leafuni.data-source > $gfp`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4368.717041015625,
+    "y": 3406.283447265625,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "69419f95.d9df48",
+        "ee782f6.725585"
+      ]
+    ]
+  },
+  {
+    "id": "69419f95.d9df48",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4567.884033203125,
+    "y": 3472.88330078125,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "47d4988f.567e08"
+      ]
+    ]
+  },
+  {
+    "id": "ee782f6.725585",
+    "type": "outcomeFalse",
+    "name": "false",
+    "xml": "<outcome value='false'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4589.884033203125,
+    "y": 3317.88330078125,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "a0601673.d665f8"
+      ]
+    ]
+  },
+  {
+    "id": "7041bf45.3f922",
+    "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": 4367.717041015625,
+    "y": 3261.4833984375,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "e5025cb2.c9e55",
+    "type": "comment",
+    "name": "update LEAF UNI with the new bw",
+    "info": "",
+    "comments": "",
+    "x": 4383.884033203125,
+    "y": 3214.88330078125,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "33a2f8f.d3c0e88",
+    "type": "comment",
+    "name": "Update ROOT UNI's bw",
+    "info": "",
+    "comments": "",
+    "x": 5052.650634765625,
+    "y": 3191.88330078125,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "b9a113e7.d0095",
+    "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": 5654.650634765625,
+    "y": 3296.88330078125,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "7bc84398.962aec",
+    "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": 5044.650390625,
+    "y": 3237.88330078125,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "e062888e.c155b",
+        "d6caf7a3.a3e818",
+        "20426568.d3347a"
+      ]
+    ]
+  },
+  {
+    "id": "d6caf7a3.a3e818",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5272.141357421875,
+    "y": 3210.457275390625,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "77c8310f.81edd8"
+      ]
+    ]
+  },
+  {
+    "id": "20426568.d3347a",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5267.650390625,
+    "y": 3254.8832397460938,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "b2f89241.488ae8"
+      ]
+    ]
+  },
+  {
+    "id": "77c8310f.81edd8",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 5434.712890625,
+    "y": 3209.7429809570312,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "b2f89241.488ae8",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+    "comments": "",
+    "x": 5435.650390625,
+    "y": 3254.8832397460938,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "b4c466e5.83e028",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 5432.650390625,
+    "y": 3304.88330078125,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "b8d224b3.0d89f8",
+        "b9a113e7.d0095"
+      ]
+    ]
+  },
+  {
+    "id": "e062888e.c155b",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5263.650390625,
+    "y": 3304.88330078125,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "b4c466e5.83e028"
+      ]
+    ]
+  },
+  {
+    "id": "b8d224b3.0d89f8",
+    "type": "set",
+    "name": "set new bw",
+    "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.rootuni.data-source + $tmp.delta`' />\n",
+    "comments": "",
+    "x": 5614.651123046875,
+    "y": 3246.88330078125,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "200ee7db.1193b",
+    "type": "comment",
+    "name": "bw+ has increased ",
+    "info": "",
+    "comments": "",
+    "x": 4581.883331298828,
+    "y": 3279.883331298828,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "cfd7c155.3c953",
+    "type": "comment",
+    "name": "bw- has decreased",
+    "info": "",
+    "comments": "",
+    "x": 4580.717041015625,
+    "y": 3436.683349609375,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "a3f905ae.3412d",
+    "type": "comment",
+    "name": "Update ROOT UNI's bw",
+    "info": "",
+    "comments": "",
+    "x": 5029.717041015625,
+    "y": 3394.683349609375,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "5d9da8bf.af3198",
+    "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": 5631.717041015625,
+    "y": 3499.683349609375,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "a2a42ec7.6b9908",
+    "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": 5021.716796875,
+    "y": 3440.683349609375,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "219cb518.4963a2",
+        "a37936ca.d95308",
+        "6315a679.c1d5a8"
+      ]
+    ]
+  },
+  {
+    "id": "a37936ca.d95308",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5249.207763671875,
+    "y": 3413.25732421875,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "21614efe.681032"
+      ]
+    ]
+  },
+  {
+    "id": "6315a679.c1d5a8",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5244.716796875,
+    "y": 3457.6832885742188,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "f930a997.1bf728"
+      ]
+    ]
+  },
+  {
+    "id": "21614efe.681032",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 5411.779296875,
+    "y": 3412.5430297851562,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "f930a997.1bf728",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+    "comments": "",
+    "x": 5412.716796875,
+    "y": 3457.6832885742188,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "58bbac12.21e334",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 5409.716796875,
+    "y": 3507.683349609375,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "c0a335ca.1c8908",
+        "5d9da8bf.af3198"
+      ]
+    ]
+  },
+  {
+    "id": "219cb518.4963a2",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5240.716796875,
+    "y": 3507.683349609375,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "58bbac12.21e334"
+      ]
+    ]
+  },
+  {
+    "id": "c0a335ca.1c8908",
+    "type": "set",
+    "name": "set new bw",
+    "xml": "<set>\n<parameter name='tmp.newbw' value='`$tmp.aai.rootuni.data-source - $tmp.delta`' />\n",
+    "comments": "",
+    "x": 5591.717529296875,
+    "y": 3449.683349609375,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "137c150b.cd5fd3",
+    "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": 4946.716796875,
+    "y": 3353.683349609375,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "47d4988f.567e08",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 4739.883331298828,
+    "y": 3461.883331298828,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "137c150b.cd5fd3",
+        "a2a42ec7.6b9908"
+      ]
+    ]
+  },
+  {
+    "id": "a0601673.d665f8",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 4760.61669921875,
+    "y": 3288.683349609375,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "10246d12.f8d883",
+        "7bc84398.962aec"
+      ]
+    ]
+  },
+  {
+    "id": "10246d12.f8d883",
+    "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": 4959.4501953125,
+    "y": 3106.4833984375,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "34d8fb24.fcb29c",
+    "type": "comment",
+    "name": "Update ROOT UNI's bw",
+    "info": "",
+    "comments": "",
+    "x": 4354.7666015625,
+    "y": 3361.683349609375,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "efc1c364.4b4c58",
+    "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": 3803.10009765625,
+    "y": 4180.483642578125,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "6f34f40.331fa0c",
+    "type": "switchNode",
+    "name": "switch found-root-connectivity",
+    "xml": "\n<switch test=\"`$found-root-connectivity`\">\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3638.10009765625,
+    "y": 4252.68359375,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "421e3ec9.1cf95",
+        "db056196.ffcc18"
+      ]
+    ]
+  },
+  {
+    "id": "421e3ec9.1cf95",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3849.10009765625,
+    "y": 4252.68359375,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "ebf2f5dc.a6d998"
+      ]
+    ]
+  },
+  {
+    "id": "db056196.ffcc18",
+    "type": "outcomeFalse",
+    "name": "false",
+    "xml": "<outcome value='false'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 3845.10009765625,
+    "y": 4300.68359375,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "dd6eee2e.c4fa6"
+      ]
+    ]
+  },
+  {
+    "id": "ebf2f5dc.a6d998",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic='true'>",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 4005.10009765625,
+    "y": 4248.68359375,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "33d1e42e.bb2424"
+      ]
+    ]
+  },
+  {
+    "id": "dd6eee2e.c4fa6",
+    "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": 3993.10009765625,
+    "y": 4295.68359375,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "fc79e006.6079c",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 4900.066162109375,
+    "y": 4522.882568359375,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "c774ea44.ba62b",
+        "4da3b32.e6aba4c"
+      ]
+    ]
+  },
+  {
+    "id": "4da3b32.e6aba4c",
+    "type": "set",
+    "name": "unset tmp.aai.vpn-binding",
+    "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value='' />\n",
+    "comments": "",
+    "x": 5143.06640625,
+    "y": 4491.882568359375,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "8e9b346.f926ac8",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 4760.066162109375,
+    "y": 4632.882568359375,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "d8bd194f.82e18"
+      ]
+    ]
+  },
+  {
+    "id": "5987f578.7ab7ec",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+    "comments": "",
+    "x": 4748.06640625,
+    "y": 4725.8828125,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "96788a5f.fb73d8",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 4750.1285400390625,
+    "y": 4680.742340087891,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "33d1e42e.bb2424",
+    "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": 4366.066162109375,
+    "y": 4522.882568359375,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "57073b47.b48554"
+      ]
+    ]
+  },
+  {
+    "id": "57073b47.b48554",
+    "type": "switchNode",
+    "name": "switch related-to",
+    "xml": "<switch test='`$tmp.aai.ROOT.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4571.066162109375,
+    "y": 4522.882568359375,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "38862adc.eccce6"
+      ]
+    ]
+  },
+  {
+    "id": "38862adc.eccce6",
+    "type": "outcome",
+    "name": "vpn-binding",
+    "xml": "<outcome value='vpn-binding'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4737.066162109375,
+    "y": 4522.882568359375,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "fc79e006.6079c"
+      ]
+    ]
+  },
+  {
+    "id": "c774ea44.ba62b",
+    "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": 4376.066162109375,
+    "y": 4632.882568359375,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "1cfab11c.2d8e77",
+        "f94fa616.fec76",
+        "4edf7dd3.8d7454"
+      ]
+    ]
+  },
+  {
+    "id": "1cfab11c.2d8e77",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4587.066162109375,
+    "y": 4634.882568359375,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "8e9b346.f926ac8"
+      ]
+    ]
+  },
+  {
+    "id": "f94fa616.fec76",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4587.55712890625,
+    "y": 4680.456604003906,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "96788a5f.fb73d8"
+      ]
+    ]
+  },
+  {
+    "id": "4edf7dd3.8d7454",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4585.066162109375,
+    "y": 4723.882568359375,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "5987f578.7ab7ec"
+      ]
+    ]
+  },
+  {
+    "id": "2a950f62.a5b77",
+    "type": "comment",
+    "name": "Temporary skipping this check - to support multiple instances in one slice",
+    "info": "",
+    "comments": "",
+    "x": 5995.883056640625,
+    "y": 7022.08349609375,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "80d2509.9388bb",
+    "type": "comment",
+    "name": "find all OTNs that have srcTtpOtnLayer and increase their bandwidth",
+    "info": "",
+    "comments": "",
+    "x": 5272.35009765625,
+    "y": 4145.283203125,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "6ce9ff77.88c36",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic='true'>",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 5061.35009765625,
+    "y": 4207.283203125,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "6a93b09.0bf6b5"
+      ]
+    ]
+  },
+  {
+    "id": "6a93b09.0bf6b5",
+    "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": 5305.35009765625,
+    "y": 4213.283203125,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "df869d26.769e7",
+        "54afff98.91fe6"
+      ]
+    ]
+  },
+  {
+    "id": "df869d26.769e7",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5536.35009765625,
+    "y": 4219.282958984375,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "956fa960.98f36"
+      ]
+    ]
+  },
+  {
+    "id": "54afff98.91fe6",
+    "type": "outcomeFalse",
+    "name": "false",
+    "xml": "<outcome value='false'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5541.35009765625,
+    "y": 4293.282958984375,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "b25ba259.308448",
+    "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": 4510.033203125,
+    "y": 3865,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "2595900.42e62f",
+    "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": 4855.033203125,
+    "y": 3727,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "f7c79bc.ed2f368"
+      ]
+    ]
+  },
+  {
+    "id": "2aa73f1e.d8378",
+    "type": "for",
+    "name": "for netwidx..allNetworksList_length",
+    "xml": "<for index='netwidx' start='0' end='`$allNetworksList.network-resource_length`' >",
+    "comments": "",
+    "outputs": 1,
+    "x": 4562.033203125,
+    "y": 3721,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "2595900.42e62f"
+      ]
+    ]
+  },
+  {
+    "id": "a86c57e2.a366f8",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4817.033203125,
+    "y": 3678,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "4c9cebf4.1f804c",
+    "type": "set",
+    "name": "unset parameters",
+    "xml": "<set>\n<parameter name='tmp.pce-src-node.' value='' />\n",
+    "comments": "",
+    "x": 4506.033203125,
+    "y": 3773,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "92d67a36.4d6588",
+    "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": 4514.033203125,
+    "y": 3818,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "3d955905.d1d126",
+    "type": "set",
+    "name": "unset otnTopoIdSrc",
+    "xml": "<set>\n<parameter name='otnTopoIdSrc' value='' />\n",
+    "comments": "",
+    "x": 4511.033203125,
+    "y": 3671,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "f7c79bc.ed2f368",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4764.033203125,
+    "y": 3795,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "4caf1451.b1549c"
+      ]
+    ]
+  },
+  {
+    "id": "4caf1451.b1549c",
+    "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": 4949.033203125,
+    "y": 3794,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "6c72501.b5308b"
+      ]
+    ]
+  },
+  {
+    "id": "6c72501.b5308b",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5141.033203125,
+    "y": 3797,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "a4a53b14.d840c8"
+      ]
+    ]
+  },
+  {
+    "id": "a4a53b14.d840c8",
+    "type": "set",
+    "name": "set otnTopoIdSrc",
+    "xml": "<set>\n<parameter name='otnTopoIdSrc' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />\n",
+    "comments": "",
+    "x": 5313.033203125,
+    "y": 3793,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "1ee93347.2464a5",
+    "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": 4689.033203125,
+    "y": 3908,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "1b1a4e3.a475eb2",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 4206.033203125,
+    "y": 3693,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "6e002627.71f3d",
+        "cc80a6e9.8d5da",
+        "4c9cebf4.1f804c",
+        "92d67a36.4d6588",
+        "b25ba259.308448",
+        "2aa73f1e.d8378",
+        "1ee93347.2464a5"
+      ]
+    ]
+  },
+  {
+    "id": "415f667b.eaf5b",
+    "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": 4191.033203125,
+    "y": 3627,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "cc80a6e9.8d5da",
+    "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": 4570.033203125,
+    "y": 3614,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "cd1fca4d.1735d8",
+        "96e89105.72a848",
+        "a86c57e2.a366f8"
+      ]
+    ]
+  },
+  {
+    "id": "cd1fca4d.1735d8",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4806.033203125,
+    "y": 3597,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "96e89105.72a848",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4803.033203125,
+    "y": 3638,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "6e002627.71f3d",
+    "type": "set",
+    "name": "unset parameters",
+    "xml": "<set>\n<parameter name='allNetworksList.' value='' />\n",
+    "comments": "",
+    "x": 4519.033203125,
+    "y": 3571,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "e62c93af.986d08",
+    "type": "comment",
+    "name": "find all OTNs that have srcTtpOtnLayer and increase their bandwidth",
+    "info": "",
+    "comments": "",
+    "x": 5248.43310546875,
+    "y": 4620.39990234375,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "d8bd194f.82e18",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic='true'>",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 5037.43310546875,
+    "y": 4682.39990234375,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "c9e19536.e28d3"
+      ]
+    ]
+  },
+  {
+    "id": "c9e19536.e28d3",
+    "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": 5281.43310546875,
+    "y": 4688.39990234375,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "2b2ae304.0b3ffc",
+        "c6c47f59.8c703"
+      ]
+    ]
+  },
+  {
+    "id": "2b2ae304.0b3ffc",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5512.43310546875,
+    "y": 4666.39990234375,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "ae674a71.79993"
+      ]
+    ]
+  },
+  {
+    "id": "c6c47f59.8c703",
+    "type": "outcomeFalse",
+    "name": "false",
+    "xml": "<outcome value='false'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5517.43310546875,
+    "y": 4733.39990234375,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "956fa960.98f36",
+    "type": "switchNode",
+    "name": "switch tmp.isBwIncreased",
+    "xml": "<switch test=\"`$tmp.isBwIncreased`\">\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5726.31689453125,
+    "y": 4231.08251953125,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "1ecd65d3.ab1d8a",
+        "db311e45.3ec9c8"
+      ]
+    ]
+  },
+  {
+    "id": "1ecd65d3.ab1d8a",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5921.31689453125,
+    "y": 4159.08251953125,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "d1b82de4.09693"
+      ]
+    ]
+  },
+  {
+    "id": "db311e45.3ec9c8",
+    "type": "outcomeFalse",
+    "name": "false",
+    "xml": "<outcome value='false'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5922.31689453125,
+    "y": 4292.08251953125,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "ef4d4c31.5752b8"
+      ]
+    ]
+  },
+  {
+    "id": "d1b82de4.09693",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic='true'>",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 6066.31689453125,
+    "y": 4159.082763671875,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "55d1eb40.89e1f4",
+        "ab2949ce.172f58"
+      ]
+    ]
+  },
+  {
+    "id": "55d1eb40.89e1f4",
+    "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": 6359.31689453125,
+    "y": 4137.08251953125,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "ab2949ce.172f58",
+    "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": 6310.966796875,
+    "y": 4184.3994140625,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "75b24fb6.238bf",
+    "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": 6383.31689453125,
+    "y": 4098.08251953125,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "ef4d4c31.5752b8",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic='true'>",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 6078.31689453125,
+    "y": 4291.082763671875,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "c3994ac7.46bf7",
+        "bad5aad4.351bf8"
+      ]
+    ]
+  },
+  {
+    "id": "c3994ac7.46bf7",
+    "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": 6371.31689453125,
+    "y": 4269.08251953125,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "bad5aad4.351bf8",
+    "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": 6322.966796875,
+    "y": 4316.3994140625,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "999a7b18.8746a",
+    "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": 6395.31689453125,
+    "y": 4230.08251953125,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "ae674a71.79993",
+    "type": "switchNode",
+    "name": "switch tmp.isBwIncreased",
+    "xml": "<switch test=\"`$tmp.isBwIncreased`\">\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5717.5498046875,
+    "y": 4673.283203125,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "ec19a864.ea4d58",
+        "d73a682a.7a7268"
+      ]
+    ]
+  },
+  {
+    "id": "ec19a864.ea4d58",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5912.5498046875,
+    "y": 4601.283203125,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "a6f4ca31.afd9c8"
+      ]
+    ]
+  },
+  {
+    "id": "d73a682a.7a7268",
+    "type": "outcomeFalse",
+    "name": "false",
+    "xml": "<outcome value='false'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5913.5498046875,
+    "y": 4734.283203125,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "3928fc2d.e43684"
+      ]
+    ]
+  },
+  {
+    "id": "a6f4ca31.afd9c8",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic='true'>",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 6057.5498046875,
+    "y": 4601.283447265625,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "c910035e.3934c",
+        "169e4263.459d16"
+      ]
+    ]
+  },
+  {
+    "id": "c910035e.3934c",
+    "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": 6350.5498046875,
+    "y": 4579.283203125,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "169e4263.459d16",
+    "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": 6302.19970703125,
+    "y": 4626.60009765625,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "7e4549dd.7efbf",
+    "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": 6374.5498046875,
+    "y": 4540.283203125,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "3928fc2d.e43684",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic='true'>",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 6069.5498046875,
+    "y": 4733.283447265625,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "e1457a0f.b9d6c8",
+        "d5693b3e.f3011"
+      ]
+    ]
+  },
+  {
+    "id": "e1457a0f.b9d6c8",
+    "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": 6362.5498046875,
+    "y": 4711.283203125,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "d5693b3e.f3011",
+    "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": 6314.19970703125,
+    "y": 4758.60009765625,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "3c74357c.38d252",
+    "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": 6386.5498046875,
+    "y": 4672.283203125,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "69e6b36a.f41024",
+    "type": "comment",
+    "name": "Update connectivity status to modified",
+    "info": "",
+    "comments": "",
+    "x": 5125.39990234375,
+    "y": 5413.4833984375,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "86db9e26.58f248",
+    "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": 5123.18310546875,
+    "y": 5453.68359375,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "41cc1d.b64a83e4",
+    "type": "comment",
+    "name": "Update connectivity status to modified",
+    "info": "",
+    "comments": "",
+    "x": 4998.433349609375,
+    "y": 5638.16650390625,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "22a50e4b.58e402",
+    "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": 4996.216552734375,
+    "y": 5678.36669921875,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "c6ebbffd.4a2ec",
+    "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": 5100.5498046875,
+    "y": 6121.283203125,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "49a56683.38e268",
+    "type": "switchNode",
+    "name": "switch found-root-connectivity",
+    "xml": "\n<switch test=\"`$found-root-connectivity`\">\n\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 4927.5498046875,
+    "y": 6178.283203125,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "9a2158f1.e886e",
+        "105a2de1.54e63a"
+      ]
+    ]
+  },
+  {
+    "id": "9a2158f1.e886e",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5138.5498046875,
+    "y": 6178.283203125,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "ffb5bb91.04465"
+      ]
+    ]
+  },
+  {
+    "id": "105a2de1.54e63a",
+    "type": "outcomeFalse",
+    "name": "false",
+    "xml": "<outcome value='false'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 5134.5498046875,
+    "y": 6226.283203125,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "42935a.ea360ca8"
+      ]
+    ]
+  },
+  {
+    "id": "ffb5bb91.04465",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic='true'>",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 5294.5498046875,
+    "y": 6174.283203125,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "7f5bea08.d1b89c",
+        "f5914753.58912",
+        "9c4a57c9.e2032"
+      ]
+    ]
+  },
+  {
+    "id": "42935a.ea360ca8",
+    "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": 5282.5498046875,
+    "y": 6221.283203125,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "37f65b5f.7df50c",
+    "type": "comment",
+    "name": "Update connectivity status to modified",
+    "info": "",
+    "comments": "",
+    "x": 5560.43359375,
+    "y": 6274.16650390625,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "9c4a57c9.e2032",
+    "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": 5558.216796875,
+    "y": 6314.36669921875,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "f5914753.58912",
+    "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": 5677.5498046875,
+    "y": 6226.283203125,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "7f5bea08.d1b89c",
+    "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": 5548.5498046875,
+    "y": 6174.283203125,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "e32403dd.64bd88",
+    "type": "comment",
+    "name": "populate connectivity-B variable in the context map",
+    "info": "",
+    "comments": "",
+    "x": 4989.5498046875,
+    "y": 6079.283203125,
+    "z": "d1707f77.d9d96",
+    "wires": []
+  },
+  {
+    "id": "6165612a.74a1f8",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 4696.8828125,
+    "y": 6161.283203125,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      [
+        "c6ebbffd.4a2ec",
+        "49a56683.38e268"
+      ]
+    ]
+  },
+  {
+    "id": "901e2d41.157da8",
+    "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": 4975.63330078125,
+    "y": 6476.283203125,
+    "z": "d1707f77.d9d96",
+    "wires": [
+      []
+    ]
+  }
 ]
\ 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 5f2b4b8e..f49b946f 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
@@ -24,463 +24,456 @@
                     <block atomic="true">
                         <for index='vpnbidx' start='0' end='`$tmp.aai.all-vpn-bindings.vpn-binding_length`' >
                             <block atomic='true'>
-                                <!--<switch test="`$tmp.slicevpnuuids[$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id] != '' `">-->
-                                <!-- Replace vpn-type with slice-id (a new attribbute in the latest AAI) -->
-                                <switch test="`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].slice-id == $tmp.aai.service-instance.service-instance-id `">
-                                    <outcome value='true'>
-                                        <block atomic='true'>
-                                            <set>
-                                                <parameter name='tmp.aai.vpn-binding.' value="" />
-                                            </set>
-                                            <set>
-                                                <parameter name='tmp.aai.vpn-binding.' value="`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].`" />
-                                            </set>
-                                            <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-' +
+                                <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
+                                                                    </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-' +
+                                                                                                              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
+                                                                    </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>
+                                                                                                              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>
-                                                            <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-' +
+                                                        </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
+                                                                    </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>
+                                                                                                              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>
-                                                    </block>
-                                                </outcome>
-                                                <outcome value='false'>
-                                                    <block></block>
-                                                </outcome>
-                                            </switch>
-                                        </block>
-                                    </outcome>
-                                    <outcome value='false'></outcome>
-                                </switch>
+                                                    </outcome>
+                                                </switch>
+                                            </block>
+                                        </outcome>
+                                        <outcome value='false'>
+                                            <block></block>
+                                        </outcome>
+                                    </switch>
+                                </block>
                             </block>
                         </for>
                     </block>
@@ -590,14 +583,15 @@
                                                                                     </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.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.connectivity.cir`' />
-                                                                                    <parameter name='`ethernet-srv-end-points-list[$epidx].EIR`' value='`$tmp.aai.connectivity.eir`' />
+                                                                                    <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>
@@ -666,6 +660,90 @@
                                                                 <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`' />
@@ -684,10 +762,10 @@
                                                                 </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.domainA.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`" />
+                                                                    <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.domainA.user`" />
-                                                                    <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.password`" />
+                                                                    <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" />
@@ -768,14 +846,15 @@
                                                                                     </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.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.connectivity.cir`' />
-                                                                                    <parameter name='`ethernet-srv-end-points-list[$epidx].EIR`' value='`$tmp.aai.connectivity.eir`' />
+                                                                                    <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>
@@ -844,6 +923,90 @@
                                                                 <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`' />
@@ -862,10 +1025,10 @@
                                                                 </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.domainA.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`" />
+                                                                    <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.domainA.user`" />
-                                                                    <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domainA.password`" />
+                                                                    <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" />
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 be49338c..0fc5dcd4 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
@@ -194,6 +194,10 @@
                                                                                                     <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
                                                                                                         <parameter name="ctx-destination" value="prop.otn-tunnel-name"/>
                                                                                                     </execute>
+                                                                                                    <set>
+                                                                                                        <!--<parameter name='prop.ethernet-service-name' value="`$tmp.aai.logical-link.link-name`" />-->
+                                                                                                        <parameter name='prop.ethernet-service-name' value="`$tmp.aai.logical-link.link-id`" />
+                                                                                                    </set>
                                                                                                     <set>
                                                                                                         <parameter name='network-route-one' value="`$tmp.aai.logical-link.link-name`" />
                                                                                                     </set>
@@ -748,6 +752,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='data-source' value='`$gfp`' />
                                                                                                                 </save>
                                                                                                                 <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list'
                                                                                                                       key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'
@@ -813,6 +818,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='data-source' value='`$gfp`' />
                                                                                                                 </save>
                                                                                                                 <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list'
                                                                                                                       key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid'
@@ -893,6 +899,22 @@
                                                                                                                         </return>
                                                                                                                     </outcome>
                                                                                                                 </get-resource>
+                                                                                                                <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.LEAF.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.LEAF.uni-p-interface-long`" />
+                                                                                                                </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="uni" />
+                                                                                                                    <parameter name="relationship-list.relationship[0].related-link" value="`'/network/unis/uni/' + $tmp.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.ROOT.uni-p-interface-long`" />
+                                                                                                                </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">
@@ -914,6 +936,56 @@
                                                                                                         </outcome>
                                                                                                         <outcome value='true'>
                                                                                                             <block atomic='true'>
+                                                                                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                              resource="uni"
+                                                                                                                              key="uni.id = $tmp.ROOT.uni-p-interface-long"
+                                                                                                                              local-only="false"
+                                                                                                                              pfx="tmp.aai.rootuni" >
+                                                                                                                    <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.rootuni.data-source + $gfp`' />
+                                                                                                                            </set>
+                                                                                                                            <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni'
+                                                                                                                                    key='uni.id = $tmp.ROOT.uni-p-interface-long'>
+                                                                                                                                <parameter name='id' value='`$tmp.ROOT.uni-p-interface-long`' />
+                                                                                                                                <parameter name='data-source' value='`$tmp.newbw`' />
+                                                                                                                            </update>
+                                                                                                                        </block>
+                                                                                                                    </outcome>
+                                                                                                                </get-resource>
+                                                                                                                <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/' + $middle-man-conn.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="`$middle-man-conn.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>
                                                                                                                 <set>
                                                                                                                     <parameter name='tmp.current-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />
                                                                                                                     <parameter name='tmp.current-cvlan-id' value='`$tmp.aai.network-route-A.logical-interface-id`' />
@@ -933,6 +1005,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='data-source' value='`$gfp`' />
                                                                                                                             </save>
                                                                                                                             <switch test="`$found-connectivity`">
                                                                                                                                 <outcome value='false'>
@@ -999,9 +1072,41 @@
                                                                                                                                         <set>
                                                                                                                                             <parameter name='uuid.connectivity-domainA-uuid' value="`$tmp.the-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.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 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 = $uuid.connectivity-domainA-uuid'>
+                                                                                                                                            <parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />
+                                                                                                                                            <parameter name='operational-status' value='Modified' />
+                                                                                                                                        </update>
                                                                                                                                     </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">
+                                                                                                                                <parameter name="relationship-list.relationship[0].related-to" value="uni" />
+                                                                                                                                <parameter name="relationship-list.relationship[0].related-link" value="`'/network/unis/uni/' + $tmp.LEAF.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.LEAF.uni-p-interface-long`" />
+                                                                                                                            </save>
                                                                                                                             <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list'
                                                                                                                                   key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'
                                                                                                                                   force="true" pfx="tmp.AnAI-data">
@@ -1019,6 +1124,30 @@
                                                                                                                                             <!--OR-->
                                                                                                                                             <parameter name='prop.connectivity-domainB-uuid' value="`$tmp.aai.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.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.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-domainB-uuid'>
+                                                                                                                                            <parameter name='connectivity-id' value='`$prop.connectivity-domainB-uuid`' />
+                                                                                                                                            <parameter name='operational-status' value='Modified' />
+                                                                                                                                        </update>
                                                                                                                                     </block>
                                                                                                                                 </outcome>
                                                                                                                                 <outcome value='false'>
@@ -1038,6 +1167,15 @@
                                                                                                                                 <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='data-source' value='`$gfp`' />
+                                                                                                                            </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="uni" />
+                                                                                                                                <parameter name="relationship-list.relationship[0].related-link" value="`'/network/unis/uni/' + $tmp.LEAF.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.LEAF.uni-p-interface-long`" />
                                                                                                                             </save>
                                                                                                                             <set>
                                                                                                                                 <parameter name='tmp.current-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />
@@ -1059,6 +1197,50 @@
                                                                                                                                 </outcome>
                                                                                                                                 <outcome value='true'>
                                                                                                                                     <block>
+                                                                                                                                        <block>
+                                                                                                                                            <call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-ROOT-conn' mode='sync' ></call>
+                                                                                                                                            <switch test="`$found-root-connectivity`">
+                                                                                                                                                <outcome value='true'>
+                                                                                                                                                    <block atomic='true'>
+                                                                                                                                                        <set>
+                                                                                                                                                            <!--<parameter name='prop.connectivity-domainB-uuid' value="`$tmp.ROOT.uni-p-interface-long`" />-->
+                                                                                                                                                            <!--OR-->
+                                                                                                                                                            <parameter name='prop.connectivity-domainB-uuid' value="`$tmp.aai.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.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.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-domainB-uuid'>
+                                                                                                                                                            <parameter name='connectivity-id' value='`$prop.connectivity-domainB-uuid`' />
+                                                                                                                                                            <parameter name='operational-status' value='Modified' />
+                                                                                                                                                        </update>
+                                                                                                                                                    </block>
+                                                                                                                                                </outcome>
+                                                                                                                                                <outcome value='false'>
+                                                                                                                                                    <return status='failure'>
+                                                                                                                                                        <parameter name='error-code' value='' />
+                                                                                                                                                        <parameter name='error-message' value='Root Connectivity was not found' />
+                                                                                                                                                    </return>
+                                                                                                                                                </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'
                                                                                                                                               force="true" pfx="tmp.AnAI-data">
@@ -1072,6 +1254,25 @@
                                                                                                                                             <parameter name='connectivity-id' value='`$tmp.the-connectivity.connectivity-id`' />
                                                                                                                                             <parameter name='operational-status' value='Modified' />
                                                                                                                                         </update>
+                                                                                                                                        <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.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 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>
                                                                                                                                         <set>
                                                                                                                                             <parameter name='allNetworksList.' value='' />
                                                                                                                                         </set>
@@ -1136,36 +1337,29 @@
                                                                                                                                                 <block atomic="true">
                                                                                                                                                     <for index='vpnbidx' start='0' end='`$tmp.aai.all-vpn-bindings.vpn-binding_length`' >
                                                                                                                                                         <block atomic='true'>
-                                                                                                                                                            <!--<switch test="`$tmp.slicevpnuuids[$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].vpn-id] != '' `">-->
-                                                                                                                                                            <!-- Replace vpn-type with slice-id (a new attribbute in the latest AAI) -->
-                                                                                                                                                            <switch test="`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].slice-id == $tmp.aai.service-instance.service-instance-id `">
-                                                                                                                                                                <outcome value='false'></outcome>
-                                                                                                                                                                <outcome value='true'>
-                                                                                                                                                                    <block atomic='true'>
-                                                                                                                                                                        <switch test="`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].ops-note == $tmp.srcTtpOtnLayer `">
-                                                                                                                                                                            <outcome value='true'>
-                                                                                                                                                                                <block atomic='true'>
-                                                                                                                                                                                    <set>
-                                                                                                                                                                                        <parameter name='tmp.aai.the-vpn-binding.' value="" />
-                                                                                                                                                                                    </set>
-                                                                                                                                                                                    <set>
-                                                                                                                                                                                        <parameter name='tmp.aai.the-vpn-binding.' value="`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].`" />
-                                                                                                                                                                                    </set>
-                                                                                                                                                                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
-                                                                                                                                                                                            key='vpn-binding.vpn-id = $tmp.aai.the-vpn-binding.vpn-id' >
-                                                                                                                                                                                        <parameter name='vpn-id' value='`$tmp.aai.the-vpn-binding.vpn-id`' />
-                                                                                                                                                                                        <!--<parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />-->
-                                                                                                                                                                                        <parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />
-                                                                                                                                                                                        <parameter name='route-distinguisher' value='`$tmp.aai.the-vpn-binding.route-distinguisher + $gfp`' />
-                                                                                                                                                                                        <parameter name='operational-status' value='Modified' />
-                                                                                                                                                                                    </update>
-                                                                                                                                                                                </block>
-                                                                                                                                                                            </outcome>
-                                                                                                                                                                            <outcome value='false'></outcome>
-                                                                                                                                                                        </switch>
-                                                                                                                                                                    </block>
-                                                                                                                                                                </outcome>
-                                                                                                                                                            </switch>
+                                                                                                                                                            <block atomic='true'>
+                                                                                                                                                                <switch test="`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].ops-note == $tmp.srcTtpOtnLayer `">
+                                                                                                                                                                    <outcome value='true'>
+                                                                                                                                                                        <block atomic='true'>
+                                                                                                                                                                            <set>
+                                                                                                                                                                                <parameter name='tmp.aai.the-vpn-binding.' value="" />
+                                                                                                                                                                            </set>
+                                                                                                                                                                            <set>
+                                                                                                                                                                                <parameter name='tmp.aai.the-vpn-binding.' value="`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].`" />
+                                                                                                                                                                            </set>
+                                                                                                                                                                            <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
+                                                                                                                                                                                    key='vpn-binding.vpn-id = $tmp.aai.the-vpn-binding.vpn-id' >
+                                                                                                                                                                                <parameter name='vpn-id' value='`$tmp.aai.the-vpn-binding.vpn-id`' />
+                                                                                                                                                                                <!--<parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />-->
+                                                                                                                                                                                <parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />
+                                                                                                                                                                                <parameter name='route-distinguisher' value='`$tmp.aai.the-vpn-binding.route-distinguisher + $gfp`' />
+                                                                                                                                                                                <parameter name='operational-status' value='Modified' />
+                                                                                                                                                                            </update>
+                                                                                                                                                                        </block>
+                                                                                                                                                                    </outcome>
+                                                                                                                                                                    <outcome value='false'></outcome>
+                                                                                                                                                                </switch>
+                                                                                                                                                            </block>
                                                                                                                                                         </block>
                                                                                                                                                     </for>
                                                                                                                                                 </block>
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 67cf779a..4f92df4f 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
@@ -23,213 +23,217 @@
                           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'>
-                                        <block>
-                                            <for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.connectivity.relationship-list.relationship_length`' >
-                                                <switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>
-                                                    <outcome value='vpn-binding'>
-                                                        <block atomic="true">
-                                                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                                                                          resource="vpn-binding"
-                                                                          key="vpn-binding.vpn-id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value"
-                                                                          local-only="false"
-                                                                          pfx="tmp.aai.vpn-binding" >
-                                                                <outcome value='success'>
-                                                                    <block atomic="true">
-                                                                        <set>
-                                                                            <parameter name='tmp.domain.pnf-name' value="`'networkId-providerId-' +
+                    <switch test="`$tmp.aai.service-instance.relationship-list.relationship_length != ''`">
+                        <outcome value='true'>
+                            <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'>
+                                                <block>
+                                                    <for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.connectivity.relationship-list.relationship_length`' >
+                                                        <switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>
+                                                            <outcome value='vpn-binding'>
+                                                                <block atomic="true">
+                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                  resource="vpn-binding"
+                                                                                  key="vpn-binding.vpn-id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value"
+                                                                                  local-only="false"
+                                                                                  pfx="tmp.aai.vpn-binding" >
+                                                                        <outcome value='success'>
+                                                                            <block atomic="true">
+                                                                                <set>
+                                                                                    <parameter name='tmp.domain.pnf-name' value="`'networkId-providerId-' +
                                                    $tmp.aai.vpn-binding.access-provider-id + '-clientId-' +
                                                    $tmp.aai.vpn-binding.access-client-id + '-topologyId-' +
                                                    $tmp.aai.vpn-binding.access-topology-id + '-nodeId-' +
                                                    $tmp.aai.vpn-binding.src-access-node-id`" />
-                                                                        </set>
-                                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                                                                                      resource="pnf"
-                                                                                      key="pnf.pnf-name = $tmp.domain.pnf-name"
-                                                                                      pfx='tmp.aai.source-pnf' local-only='false' >
-                                                                            <!--AND depth = '0'"-->
-                                                                            <outcome value='success'>
-                                                                                <block>
-                                                                                    <for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >
-                                                                                        <switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>
-                                                                                            <outcome value='esr-thirdparty-sdnc'>
-                                                                                                <block atomic="true">
-                                                                                                    <set>
-                                                                                                        <parameter name='tmp.domain.esr-thirdparty-id' value="`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`" />
-                                                                                                    </set>
-                                                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
-                                                                                                                  resource="esr-thirdparty-sdnc"
-                                                                                                                  key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domain.esr-thirdparty-id AND
+                                                                                </set>
+                                                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                              resource="pnf"
+                                                                                              key="pnf.pnf-name = $tmp.domain.pnf-name"
+                                                                                              pfx='tmp.aai.source-pnf' local-only='false' >
+                                                                                    <!--AND depth = '0'"-->
+                                                                                    <outcome value='success'>
+                                                                                        <block>
+                                                                                            <for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >
+                                                                                                <switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>
+                                                                                                    <outcome value='esr-thirdparty-sdnc'>
+                                                                                                        <block atomic="true">
+                                                                                                            <set>
+                                                                                                                <parameter name='tmp.domain.esr-thirdparty-id' value="`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`" />
+                                                                                                            </set>
+                                                                                                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                          resource="esr-thirdparty-sdnc"
+                                                                                                                          key="esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domain.esr-thirdparty-id AND
 		     depth = '1'"
-                                                                                                                  pfx='tmp.aai.domain.esr-thirdparty-sdnc' local-only='false' >
-                                                                                                        <outcome value='success'>
-                                                                                                            <block>
-                                                                                                                <set>
-                                                                                                                    <parameter name='prop.sdncRestApi.thirdpartySdnc.domain.url' value="`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
-                                                                                                                    <parameter name='prop.sdncRestApi.thirdpartySdnc.domain.user' value="`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
-                                                                                                                    <parameter name='prop.sdncRestApi.thirdpartySdnc.domain.password' value="`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />
-                                                                                                                    <!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->
-                                                                                                                    <!--<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />-->
-                                                                                                                    <!--<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />-->
-                                                                                                                    <!--<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />-->
-                                                                                                                    <!--<parameter name="format" value="json"/>-->
-                                                                                                                    <!--<parameter name="httpMethod" value="get"/>-->
-                                                                                                                    <!--<parameter name="responsePrefix" value="topology"/>-->
-                                                                                                                    <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->
-                                                                                                                    <!--<parameter name="trustStorePassword" value="adminadmin"/>-->
-                                                                                                                    <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->
-                                                                                                                    <!--<parameter name="keyStorePassword" value="adminadmin"/>-->
-                                                                                                                </set>
-                                                                                                            </block>
-                                                                                                        </outcome>
-                                                                                                        <outcome value='not-found'>
-                                                                                                            <return status='failure'>
-                                                                                                                <parameter name='ack-final' value='Y'/>
-                                                                                                                <parameter name="error-code" value="500" />
-                                                                                                                <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                                                                                            </return>
-                                                                                                        </outcome>
-                                                                                                        <outcome value='Other'>
-                                                                                                            <return status='failure'>
-                                                                                                                <parameter name='ack-final' value='Y'/>
-                                                                                                                <parameter name="error-code" value="500" />
-                                                                                                                <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                                                                                            </return>
-                                                                                                        </outcome>
-                                                                                                    </get-resource>
-                                                                                                    <break/>
-                                                                                                </block>
-                                                                                            </outcome>
-                                                                                        </switch>
-                                                                                    </for>
-                                                                                </block>
-                                                                            </outcome>
-                                                                            <outcome value='not-found'>
-                                                                                <return status='failure'>
-                                                                                    <parameter name='ack-final' value='Y'/>
-                                                                                    <parameter name="error-code" value="500" />
-                                                                                    <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                                                                </return>
-                                                                            </outcome>
-                                                                            <outcome value='Other'>
-                                                                                <return status='failure'>
-                                                                                    <parameter name='ack-final' value='Y'/>
-                                                                                    <parameter name="error-code" value="500" />
-                                                                                    <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
-                                                                                </return>
-                                                                            </outcome>
-                                                                        </get-resource>
-                                                                        <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                                                            <!--<parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-otn-src-domain-creation.templatefile`" />-->
-                                                                            <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-te:te/tunnels/tunnel=' + $tmp.aai.vpn-binding.vpn-name`" />
-                                                                            <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domain.user`" />
-                                                                            <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domain.password`" />
-                                                                            <parameter name="format" value="json"/>
-                                                                            <parameter name="httpMethod" value="delete"/>
-                                                                            <parameter name="responsePrefix" value="otn-oof"/>
-                                                                            <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
-                                                                            <parameter name="trustStorePassword" value="adminadmin"/>
-                                                                            <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
-                                                                            <parameter name="keyStorePassword" value="adminadmin"/>
-                                                                            <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
-                                                                            <outcome value='failure'>
-                                                                                <return status='failure'>
-                                                                                    <parameter name='ack-final' value='Y'/>
-                                                                                    <parameter name="error-code" value="500" />
-                                                                                    <parameter name="error-message" value="Error executing delete OTN tunnel rest api" />
-                                                                                </return>
-                                                                            </outcome>
-                                                                            <outcome value='success'>
-                                                                                <block atomic="true"></block>
-                                                                            </outcome>
-                                                                        </execute>
-                                                                        <switch test='`$tmp.aai.connectivity.etht-svc-name`'>
-                                                                            <outcome value='Other'>
+                                                                                                                          pfx='tmp.aai.domain.esr-thirdparty-sdnc' local-only='false' >
+                                                                                                                <outcome value='success'>
+                                                                                                                    <block>
+                                                                                                                        <set>
+                                                                                                                            <parameter name='prop.sdncRestApi.thirdpartySdnc.domain.url' value="`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`" />
+                                                                                                                            <parameter name='prop.sdncRestApi.thirdpartySdnc.domain.user' value="`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`" />
+                                                                                                                            <parameter name='prop.sdncRestApi.thirdpartySdnc.domain.password' value="`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`" />
+                                                                                                                            <!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->
+                                                                                                                            <!--<parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`" />-->
+                                                                                                                            <!--<parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.user`" />-->
+                                                                                                                            <!--<parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.password`" />-->
+                                                                                                                            <!--<parameter name="format" value="json"/>-->
+                                                                                                                            <!--<parameter name="httpMethod" value="get"/>-->
+                                                                                                                            <!--<parameter name="responsePrefix" value="topology"/>-->
+                                                                                                                            <!--<parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>-->
+                                                                                                                            <!--<parameter name="trustStorePassword" value="adminadmin"/>-->
+                                                                                                                            <!--<parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>-->
+                                                                                                                            <!--<parameter name="keyStorePassword" value="adminadmin"/>-->
+                                                                                                                        </set>
+                                                                                                                    </block>
+                                                                                                                </outcome>
+                                                                                                                <outcome value='not-found'>
+                                                                                                                    <return status='failure'>
+                                                                                                                        <parameter name='ack-final' value='Y'/>
+                                                                                                                        <parameter name="error-code" value="500" />
+                                                                                                                        <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                                    </return>
+                                                                                                                </outcome>
+                                                                                                                <outcome value='Other'>
+                                                                                                                    <return status='failure'>
+                                                                                                                        <parameter name='ack-final' value='Y'/>
+                                                                                                                        <parameter name="error-code" value="500" />
+                                                                                                                        <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                                                    </return>
+                                                                                                                </outcome>
+                                                                                                            </get-resource>
+                                                                                                            <break/>
+                                                                                                        </block>
+                                                                                                    </outcome>
+                                                                                                </switch>
+                                                                                            </for>
+                                                                                        </block>
+                                                                                    </outcome>
+                                                                                    <outcome value='not-found'>
+                                                                                        <return status='failure'>
+                                                                                            <parameter name='ack-final' value='Y'/>
+                                                                                            <parameter name="error-code" value="500" />
+                                                                                            <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                        </return>
+                                                                                    </outcome>
+                                                                                    <outcome value='Other'>
+                                                                                        <return status='failure'>
+                                                                                            <parameter name='ack-final' value='Y'/>
+                                                                                            <parameter name="error-code" value="500" />
+                                                                                            <parameter name="error-message" value="`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`" />
+                                                                                        </return>
+                                                                                    </outcome>
+                                                                                </get-resource>
                                                                                 <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
-                                                                                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.aai.connectivity.etht-svc-name`" />
-                                                                                    <!--<parameter name="restapiUrl" value="`$prop.restapi.connection-oof-url`" />-->
-                                                                                    <!--<parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`" />-->
+                                                                                    <!--<parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-otn-src-domain-creation.templatefile`" />-->
+                                                                                    <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-te:te/tunnels/tunnel=' + $tmp.aai.vpn-binding.vpn-name`" />
                                                                                     <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domain.user`" />
                                                                                     <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domain.password`" />
                                                                                     <parameter name="format" value="json"/>
                                                                                     <parameter name="httpMethod" value="delete"/>
-                                                                                    <parameter name='dirPath' value="/opt/onap/sdnc/restconfapi/yang" />
-                                                                                    <parameter name="responsePrefix" value="vpn-result"/>
+                                                                                    <parameter name="responsePrefix" value="otn-oof"/>
                                                                                     <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
                                                                                     <parameter name="trustStorePassword" value="adminadmin"/>
                                                                                     <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
                                                                                     <parameter name="keyStorePassword" value="adminadmin"/>
+                                                                                    <parameter name='customHttpHeaders' value="`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`" />
                                                                                     <outcome value='failure'>
                                                                                         <return status='failure'>
                                                                                             <parameter name='ack-final' value='Y'/>
                                                                                             <parameter name="error-code" value="500" />
-                                                                                            <parameter name="error-message" value="Error executing delete ethernet service rest api" />
+                                                                                            <parameter name="error-message" value="Error executing delete OTN tunnel rest api" />
                                                                                         </return>
                                                                                     </outcome>
                                                                                     <outcome value='success'>
                                                                                         <block atomic="true"></block>
                                                                                     </outcome>
                                                                                 </execute>
-                                                                            </outcome>
-                                                                            <outcome value=''></outcome>
-                                                                        </switch>
-                                                                        <delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
-                                                                                key='vpn-binding.vpn-id = $tmp.aai.vpn-binding.vpn-id' ></delete>
-                                                                    </block>
-                                                                </outcome>
-                                                                <outcome value='not-found'>
-                                                                    <return status='failure'>
-                                                                        <parameter name='ack-final' value='Y'/>
-                                                                        <parameter name="error-code" value="500" />
-                                                                        <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
-                                                                    </return>
-                                                                </outcome>
-                                                                <outcome value='failure'>
-                                                                    <return status='failure'>
-                                                                        <parameter name='error-code' value='' />
-                                                                        <parameter name='error-message' value='' />
-                                                                    </return>
-                                                                </outcome>
-                                                            </get-resource>
-                                                        </block>
-                                                    </outcome>
-                                                    <outcome value='uni'>
-                                                        <block atomic="true">
-                                                            <delete 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'></delete>
-                                                        </block>
-                                                    </outcome>
-                                                </switch>
-                                            </for>
-                                            <delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
-                                                    key='connectivity.connectivity-id = $tmp.aai.connectivity.connectivity-id'></delete>
-                                        </block>
-                                    </outcome>
-                                    <outcome value='not-found'>
-                                        <return status='failure'>
-                                            <parameter name='ack-final' value='Y'/>
-                                            <parameter name="error-code" value="500" />
-                                            <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
-                                        </return>
-                                    </outcome>
-                                    <outcome value='failure'>
-                                        <return status='failure'>
-                                            <parameter name='error-code' value='' />
-                                            <parameter name='error-message' value='' />
-                                        </return>
+                                                                                <switch test='`$tmp.aai.connectivity.etht-svc-name`'>
+                                                                                    <outcome value='Other'>
+                                                                                        <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
+                                                                                            <parameter name="restapiUrl" value="`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.aai.connectivity.etht-svc-name`" />
+                                                                                            <!--<parameter name="restapiUrl" value="`$prop.restapi.connection-oof-url`" />-->
+                                                                                            <!--<parameter name="templateFileName" value="`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`" />-->
+                                                                                            <parameter name="restapiUser" value="`$prop.sdncRestApi.thirdpartySdnc.domain.user`" />
+                                                                                            <parameter name="restapiPassword" value="`$prop.sdncRestApi.thirdpartySdnc.domain.password`" />
+                                                                                            <parameter name="format" value="json"/>
+                                                                                            <parameter name="httpMethod" value="delete"/>
+                                                                                            <parameter name='dirPath' value="/opt/onap/sdnc/restconfapi/yang" />
+                                                                                            <parameter name="responsePrefix" value="vpn-result"/>
+                                                                                            <parameter name="trustStoreFileName" value="/opt/onap/sdnc/data/stores/truststore.onap.client.jks"/>
+                                                                                            <parameter name="trustStorePassword" value="adminadmin"/>
+                                                                                            <parameter name="keyStoreFileName" value="/opt/onap/sdnc/data/stores/sdnc.p12"/>
+                                                                                            <parameter name="keyStorePassword" value="adminadmin"/>
+                                                                                            <outcome value='failure'>
+                                                                                                <return status='failure'>
+                                                                                                    <parameter name='ack-final' value='Y'/>
+                                                                                                    <parameter name="error-code" value="500" />
+                                                                                                    <parameter name="error-message" value="Error executing delete ethernet service rest api" />
+                                                                                                </return>
+                                                                                            </outcome>
+                                                                                            <outcome value='success'>
+                                                                                                <block atomic="true"></block>
+                                                                                            </outcome>
+                                                                                        </execute>
+                                                                                    </outcome>
+                                                                                    <outcome value=''></outcome>
+                                                                                </switch>
+                                                                                <delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
+                                                                                        key='vpn-binding.vpn-id = $tmp.aai.vpn-binding.vpn-id' ></delete>
+                                                                            </block>
+                                                                        </outcome>
+                                                                        <outcome value='not-found'>
+                                                                            <return status='failure'>
+                                                                                <parameter name='ack-final' value='Y'/>
+                                                                                <parameter name="error-code" value="500" />
+                                                                                <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
+                                                                            </return>
+                                                                        </outcome>
+                                                                        <outcome value='failure'>
+                                                                            <return status='failure'>
+                                                                                <parameter name='error-code' value='' />
+                                                                                <parameter name='error-message' value='' />
+                                                                            </return>
+                                                                        </outcome>
+                                                                    </get-resource>
+                                                                </block>
+                                                            </outcome>
+                                                            <outcome value='uni'>
+                                                                <block atomic="true">
+                                                                    <delete 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'></delete>
+                                                                </block>
+                                                            </outcome>
+                                                        </switch>
+                                                    </for>
+                                                    <delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
+                                                            key='connectivity.connectivity-id = $tmp.aai.connectivity.connectivity-id'></delete>
+                                                </block>
+                                            </outcome>
+                                            <outcome value='not-found'>
+                                                <return status='failure'>
+                                                    <parameter name='ack-final' value='Y'/>
+                                                    <parameter name="error-code" value="500" />
+                                                    <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
+                                                </return>
+                                            </outcome>
+                                            <outcome value='failure'>
+                                                <return status='failure'>
+                                                    <parameter name='error-code' value='' />
+                                                    <parameter name='error-message' value='' />
+                                                </return>
+                                            </outcome>
+                                        </get-resource>
                                     </outcome>
-                                </get-resource>
-                            </outcome>
-                        </switch>
-                    </for>
+                                </switch>
+                            </for>
+                        </outcome>
+                    </switch>
                 </outcome>
                 <outcome value='not-found'>
                     <return status='failure'>
diff --git a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-helper-find-ROOT-conn.xml b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-helper-find-ROOT-conn.xml
index 71bc7c1f..bb86aacf 100644
--- a/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-helper-find-ROOT-conn.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-helper-find-ROOT-conn.xml
@@ -18,16 +18,22 @@
                     <block atomic="true">
                         <for index='helprconnidx' start='0' end='`$tmp.aai.helper-root-all-connectivities.connectivity_length`' >
                             <block atomic='true'>
-                                <switch test="`$tmp.aai.helper-root-all-connectivities.connectivity[$helprconnidx].color-aware == $tmp.ROOT.uni-p-interface-long`">
-                                    <outcome value='true'>
-                                        <block atomic='true'>
-                                            <set>
-                                                <parameter name='found-root-connectivity' value="true" />
-                                            </set>
-                                            <set>
-                                                <parameter name='tmp.aai.ROOT.connectivity.' value="`$tmp.aai.helper-root-all-connectivities.connectivity[$helprconnidx].`" />
-                                            </set>
-                                            <break/>
+                                <switch test="`$tmp.aai.helper-root-all-connectivities.connectivity[$helprconnidx].vpn-type`">
+                                    <outcome value='root'>
+                                        <block>
+                                            <switch test="`$tmp.aai.helper-root-all-connectivities.connectivity[$helprconnidx].color-aware == $tmp.ROOT.uni-p-interface-long`">
+                                                <outcome value='true'>
+                                                    <block atomic='true'>
+                                                        <set>
+                                                            <parameter name='found-root-connectivity' value="true" />
+                                                        </set>
+                                                        <set>
+                                                            <parameter name='tmp.aai.ROOT.connectivity.' value="`$tmp.aai.helper-root-all-connectivities.connectivity[$helprconnidx].`" />
+                                                        </set>
+                                                        <break/>
+                                                    </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-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 7bdae76f..6c46a403 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
@@ -33,6 +33,16 @@
                         <outcome value='false'></outcome>
                         <outcome value='true'>
                             <block>
+                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                              resource="pnfs"
+                                              key="selflink = 'https://aai.onap:8443/aai/v24/network/pnfs?depth=0'"
+                                              local-only="false"
+                                              pfx="ccsdkTopopnfs" ></get-resource>
+                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                              resource="logical-links"
+                                              key="selflink = 'https://aai.onap:8443/aai/v24/network/logical-links?depth=0'"
+                                              local-only="false"
+                                              pfx="ccsdkTopologicalLinks" ></get-resource>
                                 <set>
                                     <parameter name='tmp.arr' value='' />
                                     <parameter name='tmp.arridx' value='0' />
@@ -43,9 +53,15 @@
                                     <!--<parameter name='tmp.slicevpns_length' value='0' />-->
                                     <!--<parameter name='tmp.slicevpnuuids' value='' />-->
                                     <!--<parameter name='tmp.slicevpnuuids.' value='' />-->
-                                    <parameter name='bwModified' value='false' />
                                 </set>
                                 <for index='aridx' start='0' end='`$tmp.aai.service-instance.allotted-resources.allotted-resource_length`' >
+                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
+                                        <parameter name="ctx-destination" value="prop.ethernet-service-name"/>
+                                    </execute>
+                                    <set>
+                                        <!--<parameter name='prop.ethernet-service-name' value="`$tmp.aai.logical-link.link-name`" />-->
+                                        <parameter name='prop.ethernet-service-name' value="`$tmp.aai.logical-link.link-id`" />
+                                    </set>
                                     <set>
                                         <parameter name='allotted-resource-id' value="`$tmp.aai.service-instance.allotted-resources.allotted-resource[$aridx].id`" />
                                     </set>
@@ -148,102 +164,1624 @@
                                                                                 </outcome>
                                                                             </switch>
                                                                         </for>
-                                                                        <block atomic='true'>
-                                                                            <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'>
-                                                                                        <block atomic="true">
-                                                                                            <set>
-                                                                                                <parameter name='tmp.aai.connectivity.' value='' />
-                                                                                            </set>
-                                                                                            <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'>
-                                                                                                    <block atomic="true">
-                                                                                                        <switch test='`$tmp.aai.connectivity.bandwidth-profile-name == $gfp`'>
-                                                                                                            <outcome value='true'></outcome>
-                                                                                                            <outcome value='false'>
-                                                                                                                <block atomic="true">
-                                                                                                                    <set>
-                                                                                                                        <parameter name='bwModified' value="true" />
-                                                                                                                    </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='success'>
+                                                                        <for index='idx' start='0' end='`$tmp.aai.allotted-resource.relationship-list.relationship_length`' >
+                                                                            <switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>
+                                                                                <outcome value='logical-link'>
+                                                                                    <block atomic="true">
+                                                                                        <set>
+                                                                                            <parameter name='logical-link-name' value="`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].relationship-data[0].relationship-value`" />
+                                                                                        </set>
+                                                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                      resource="logical-link"
+                                                                                                      key='logical-link.link-name = $logical-link-name'
+                                                                                                      local-only="false"
+                                                                                                      force="true" pfx="tmp.aai.logical-link">
+                                                                                            <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>
+                                                                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
+                                                                                                        <parameter name="ctx-destination" value="prop.otn-tunnel-name"/>
+                                                                                                    </execute>
+                                                                                                    <set>
+                                                                                                        <!--<parameter name='prop.ethernet-service-name' value="`$tmp.aai.logical-link.link-name`" />-->
+                                                                                                        <parameter name='prop.ethernet-service-name' value="`$tmp.aai.logical-link.link-id`" />
+                                                                                                    </set>
+                                                                                                    <set>
+                                                                                                        <parameter name='network-route-one' value="`$tmp.aai.logical-link.link-name`" />
+                                                                                                    </set>
+                                                                                                    <set>
+                                                                                                        <parameter name='network-route-two' value="`$tmp.aai.logical-link.link-name2`" />
+                                                                                                    </set>
+                                                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                  resource="network-route"
+                                                                                                                  key='network-route.route-id = $network-route-one'
+                                                                                                                  local-only="false"
+                                                                                                                  force="true" pfx="tmp.aai.network-route-one">
+                                                                                                        <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">
+                                                                                                                <switch test='`$tmp.aai.network-route-one.type`'>
+                                                                                                                    <outcome value='ROOT'>
+                                                                                                                        <block>
+                                                                                                                            <set>
+                                                                                                                                <parameter name='tmp.aai.network-route-ROOT.' value="`$tmp.aai.network-route-one.`" />
+                                                                                                                            </set>
+                                                                                                                            <set>
+                                                                                                                                <parameter name='tmp.aai.network-route-B.' value="`$tmp.aai.network-route-one.`" />
+                                                                                                                            </set>
+                                                                                                                        </block>
+                                                                                                                    </outcome>
+                                                                                                                    <outcome value='LEAF'>
+                                                                                                                        <block>
+                                                                                                                            <set>
+                                                                                                                                <parameter name='tmp.aai.network-route-LEAF.' value="`$tmp.aai.network-route-one.`" />
+                                                                                                                            </set>
+                                                                                                                            <set>
+                                                                                                                                <parameter name='tmp.aai.network-route-A.' value="`$tmp.aai.network-route-one.`" />
+                                                                                                                            </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-two'
+                                                                                                                  local-only="false"
+                                                                                                                  force="true" pfx="tmp.aai.network-route-two">
+                                                                                                        <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">
+                                                                                                                <switch test='`$tmp.aai.network-route-two.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>
+                                                                                                                </switch>
+                                                                                                            </block>
+                                                                                                        </outcome>
+                                                                                                    </get-resource>
+                                                                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
+                                                                                                        <parameter name="original_string" value='`$tmp.aai.network-route-A.next-hop`'/>
+                                                                                                        <!--<parameter name="regex" value="[^-]+$"/>-->
+                                                                                                        <parameter name="regex" value="[-]+"/>
+                                                                                                        <parameter name="ctx_memory_result_key" value="param-prefix-domainA-pnfName"/>
+                                                                                                        <outcome value='success'>
+                                                                                                            <block atomic="true">
+                                                                                                                <set>
+                                                                                                                    <parameter name='tmp.src.domainA.pnf-name' value="`$param-prefix-domainA-pnfName[0] + '-' +
+                                                   $param-prefix-domainA-pnfName[1] + '-' +
+                                                   $param-prefix-domainA-pnfName[2] + '-' +
+                                                   $param-prefix-domainA-pnfName[3] + '-' +
+                                                   $param-prefix-domainA-pnfName[4] + '-' +
+                                                   $param-prefix-domainA-pnfName[5] + '-' +
+                                                   $param-prefix-domainA-pnfName[6] + '-' +
+                                                   $param-prefix-domainA-pnfName[7] + '-' +
+                                                   $param-prefix-domainA-pnfName[8]`" />
+                                                                                                                </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>
+                                                                                                                                    <outcome value='network-resource'>
+                                                                                                                                        <block atomic="true">
+                                                                                                                                            <set>
+                                                                                                                                                <parameter name='tmp.domainA.eth-network-id' value="`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].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'>
+                                                                                                            <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="p-interface"
+                                                                                                                  key="pnf.pnf-name = $tmp.src.domainA.pnf-name
+	        AND p-interface.interface-name = $tmp.aai.network-route-A.next-hop"
+                                                                                                                  local-only="false"
+                                                                                                                  pfx="tmp.aai.network-route-A.p-interface-src" >
+                                                                                                        <!--<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-A.p-interface-src.interface-name`'/>
+                                                                                                                    <!--<parameter name="regex" value="[^-]+$"/>-->
+                                                                                                                    <parameter name="regex" value="[-]+"/>
+                                                                                                                    <parameter name="ctx_memory_result_key" value="param-prefix-domainA"/>
+                                                                                                                    <outcome value='success'>
+                                                                                                                        <block atomic="true">
+                                                                                                                            <set>
+                                                                                                                                <parameter name='tmp.src.ltpId' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />
+                                                                                                                            </set>
+                                                                                                                            <set>
+                                                                                                                                <parameter name='tmp.src.pnf-name' value='`$param-prefix-domainA[$param-prefix-domainA_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='pividx' start='0' end='`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship_length`' >
+                                                                                                                    <switch test='`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship[$pividx].related-to`'>
+                                                                                                                        <outcome value='tunnel-termination-point'>
+                                                                                                                            <block atomic="true">
+                                                                                                                                <set>
+                                                                                                                                    <parameter name='tmp.source.ttp-id' value="`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship[$pividx].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.source.ttp-id
+		AND depth = '0'"
+                                                                                                                                              pfx='tmp.aai.source-ttp' local-only='false' >
+                                                                                                                                    <outcome value='success'>
+                                                                                                                                        <block atomic="true">
+                                                                                                                                            <set>
+                                                                                                                                                <parameter name='source.tunnel-tp-id' value="`$tmp.aai.source-ttp.tunnel-tp-id`" />
+                                                                                                                                            </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.l3vpn.pe1_id`" />
+                                                                                                            </return>
+                                                                                                        </outcome>
+                                                                                                        <outcome value='failure'>
+                                                                                                            <return status='failure'>
+                                                                                                                <parameter name='error-code' value='' />
+                                                                                                                <parameter name='error-message' value='' />
+                                                                                                            </return>
+                                                                                                        </outcome>
+                                                                                                    </get-resource>
+                                                                                                    <set>
+                                                                                                        <parameter name='tmp.LEAF.pnf-name-long' value="`$param-prefix-domainA-pnfName[0] + '-' +
+                                                   $param-prefix-domainA-pnfName[1] + '-' +
+                                                   $param-prefix-domainA-pnfName[2] + '-' +
+                                                   $param-prefix-domainA-pnfName[3] + '-' +
+                                                   $param-prefix-domainA-pnfName[4] + '-' +
+                                                   $param-prefix-domainA-pnfName[5] + '-' +
+                                                   $param-prefix-domainA-pnfName[6] + '-' +
+                                                   $param-prefix-domainA-pnfName[7] + '-' +
+                                                   $param-prefix-domainA-pnfName[8]`" />
+                                                                                                        <!--<parameter name='tmp.LEAF.pnf-name-short' value="`$param-prefix-domainA-pnfName[8]`" />-->
+                                                                                                        <parameter name='tmp.LEAF.pnf-name-short' value="`$tmp.src.pnf-name`" />
+                                                                                                        <parameter name='tmp.LEAF.uni-p-interface-long' value="`$tmp.aai.network-route-A.next-hop`" />
+                                                                                                        <parameter name='tmp.LEAF.uni-tp-id' value="`$tmp.src.ltpId`" />
+                                                                                                    </set>
+                                                                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >
+                                                                                                        <parameter name="original_string" value='`$tmp.aai.network-route-B.next-hop`'/>
+                                                                                                        <!--<parameter name="regex" value="[^-]+$"/>-->
+                                                                                                        <parameter name="regex" value="[-]+"/>
+                                                                                                        <parameter name="ctx_memory_result_key" value="param-prefix-domainB-pnfName"/>
+                                                                                                        <outcome value='success'>
+                                                                                                            <block atomic="true">
+                                                                                                                <set>
+                                                                                                                    <parameter name='tmp.dst.domainB.pnf-name' 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] + '-' +
+                                                   $param-prefix-domainB-pnfName[6] + '-' +
+                                                   $param-prefix-domainB-pnfName[7] + '-' +
+                                                   $param-prefix-domainB-pnfName[8]`" />
+                                                                                                                </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>
+                                                                                                                                    <outcome value='network-resource'>
+                                                                                                                                        <block atomic="true">
+                                                                                                                                            <set>
+                                                                                                                                                <parameter name='tmp.domainB.eth-network-id' value="`$tmp.aai.destination-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'>
+                                                                                                            <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="p-interface"
+                                                                                                                  key="pnf.pnf-name = $tmp.dst.domainB.pnf-name
+	        AND p-interface.interface-name = $tmp.aai.network-route-B.next-hop"
+                                                                                                                  local-only="false"
+                                                                                                                  pfx="tmp.aai.network-route-B.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-B.p-interface-dst.interface-name`'/>
+                                                                                                                    <!--<parameter name="regex" value="[^-]+$"/>-->
+                                                                                                                    <parameter name="regex" value="[-]+"/>
+                                                                                                                    <parameter name="ctx_memory_result_key" value="param-prefix-domainB"/>
+                                                                                                                    <outcome value='success'>
+                                                                                                                        <block atomic="true">
+                                                                                                                            <set>
+                                                                                                                                <parameter name='tmp.dst.ltpId' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />
+                                                                                                                            </set>
+                                                                                                                            <set>
+                                                                                                                                <parameter name='tmp.dst.pnf-name' value='`$param-prefix-domainB[$param-prefix-domainB_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-B.p-interface-dst.relationship-list.relationship_length`' >
+                                                                                                                    <switch test='`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship[$dividx].related-to`'>
+                                                                                                                        <outcome value='tunnel-termination-point'>
+                                                                                                                            <block atomic="true">
+                                                                                                                                <set>
+                                                                                                                                    <parameter name='tmp.destination.ttp-id' value="`$tmp.aai.network-route-B.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.ttp-id
+		AND depth = '0'"
+                                                                                                                                              pfx='tmp.aai.destination-ttp' local-only='false' >
+                                                                                                                                    <outcome value='success'>
+                                                                                                                                        <block atomic="true">
+                                                                                                                                            <set>
+                                                                                                                                                <parameter name='destination.tunnel-tp-id' value="`$tmp.aai.destination-ttp.tunnel-tp-id`" />
+                                                                                                                                            </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.l3vpn.pe1_id`" />
+                                                                                                            </return>
+                                                                                                        </outcome>
+                                                                                                        <outcome value='failure'>
+                                                                                                            <return status='failure'>
+                                                                                                                <parameter name='error-code' value='' />
+                                                                                                                <parameter name='error-message' value='' />
+                                                                                                            </return>
+                                                                                                        </outcome>
+                                                                                                    </get-resource>
+                                                                                                    <set>
+                                                                                                        <parameter name='tmp.ROOT.pnf-name-long' 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] + '-' +
+                                                   $param-prefix-domainB-pnfName[6] + '-' +
+                                                   $param-prefix-domainB-pnfName[7] + '-' +
+                                                   $param-prefix-domainB-pnfName[8]`" />
+                                                                                                        <!--<parameter name='tmp.ROOT.pnf-name-short' value="`$param-prefix-domainB-pnfName[8]`" />-->
+                                                                                                        <parameter name='tmp.ROOT.pnf-name-short' value="`$tmp.dst.pnf-name`" />
+                                                                                                        <parameter name='tmp.ROOT.uni-p-interface-long' value="`$tmp.aai.network-route-B.next-hop`" />
+                                                                                                        <parameter name='tmp.ROOT.uni-tp-id' value="`$tmp.dst.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'>
+                                                                                                            <block atomic='true'>
+                                                                                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
+                                                                                                                    <parameter name="ctx-destination" value="uuid.connectivity-domainA-uuid"/>
+                                                                                                                </execute>
+                                                                                                                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
+                                                                                                                      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>
+                                                                                                                    <parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />
+                                                                                                                    <parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />
+                                                                                                                    <parameter name='operational-status' value='Created' />
+                                                                                                                    <parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />
+                                                                                                                    <parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />
+                                                                                                                    <parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />
+                                                                                                                    <parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />
+                                                                                                                    <parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />
+                                                                                                                    <parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />
+                                                                                                                    <parameter name='vpn-type' value='leaf' />
+                                                                                                                    <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/' + $uuid.connectivity-domainA-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-domainA-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='uni'
+                                                                                                                      key='uni.id = $tmp.LEAF.uni-p-interface-long'>
+                                                                                                                    <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='data-source' value='`$gfp`' />
+                                                                                                                </save>
+                                                                                                                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list'
+                                                                                                                      key='connectivity.connectivity-id = $uuid.connectivity-domainA-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.LEAF.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.LEAF.uni-p-interface-long`" />
+                                                                                                                </save>
+                                                                                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
+                                                                                                                    <parameter name="ctx-destination" value="prop.connectivity-domainB-uuid"/>
+                                                                                                                </execute>
+                                                                                                                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
+                                                                                                                      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid'>
+                                                                                                                    <parameter name='connectivity-id' value='`$prop.connectivity-domainB-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-domainB[$param-prefix-domainB_length -9]`' />
+                                                                                                                    <parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />
+                                                                                                                    <parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />
+                                                                                                                    <parameter name='access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />
+                                                                                                                    <parameter name='access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />
+                                                                                                                    <parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />
+                                                                                                                    <parameter name='color-aware' value='`$tmp.ROOT.uni-p-interface-long`' />
+                                                                                                                    <parameter name='vpn-type' value='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-domainB-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-domainB-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='uni'
+                                                                                                                      key='uni.id = $tmp.ROOT.uni-p-interface-long'>
+                                                                                                                    <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='data-source' value='`$gfp`' />
+                                                                                                                </save>
+                                                                                                                <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.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.ROOT.uni-p-interface-long`" />
+                                                                                                                </save>
+                                                                                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
+                                                                                                                    <parameter name="ctx-destination" value="prop.connectivity-middle-man-uuid"/>
+                                                                                                                </execute>
+                                                                                                                <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
+                                                                                                                      key='connectivity.connectivity-id = $prop.connectivity-middle-man-uuid'>
+                                                                                                                    <parameter name='connectivity-id' value='`$prop.connectivity-middle-man-uuid`' />
+                                                                                                                    <parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />
+                                                                                                                    <parameter name='operational-status' value='Created' />
+                                                                                                                    <!--The followings are not needed for the middle-man-connectivity-->
+                                                                                                                    <!--<parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />-->
+                                                                                                                    <!--<parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />-->
+                                                                                                                    <!--<parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />-->
+                                                                                                                    <!--<parameter name='access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />-->
+                                                                                                                    <!--<parameter name='access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />-->
+                                                                                                                    <parameter name='cvlan' value='`$tmp.aai.network-route-B.logical-interface-id`' />
+                                                                                                                    <parameter name='color-aware' value='`$tmp.ROOT.uni-p-interface-long`' />
+                                                                                                                    <parameter name='vpn-type' value='mdsc' />
+                                                                                                                    <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-middle-man-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-middle-man-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>
+                                                                                                                <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                              resource="connectivity"
+                                                                                                                              key="connectivity.connectivity-id = $prop.connectivity-middle-man-uuid"
+                                                                                                                              local-only="false"
+                                                                                                                              pfx="middle-man-conn" >
+                                                                                                                    <outcome value='success'>
+                                                                                                                        <block atomic='true'></block>
+                                                                                                                    </outcome>
+                                                                                                                    <outcome value='not-found'>
+                                                                                                                        <return status='failure'>
+                                                                                                                            <parameter name='ack-final' value='Y'/>
+                                                                                                                            <parameter name="error-code" value="500" />
+                                                                                                                            <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
+                                                                                                                        </return>
+                                                                                                                    </outcome>
+                                                                                                                    <outcome value='failure'>
+                                                                                                                        <return status='failure'>
+                                                                                                                            <parameter name='error-code' value='' />
+                                                                                                                            <parameter name='error-message' value='' />
+                                                                                                                        </return>
+                                                                                                                    </outcome>
+                                                                                                                </get-resource>
+                                                                                                                <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.LEAF.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.LEAF.uni-p-interface-long`" />
+                                                                                                                </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="uni" />
+                                                                                                                    <parameter name="relationship-list.relationship[0].related-link" value="`'/network/unis/uni/' + $tmp.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.ROOT.uni-p-interface-long`" />
+                                                                                                                </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-domainA-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-domainA-uuid`" />
+                                                                                                                </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/' + $prop.connectivity-domainB-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-domainB-uuid`" />
+                                                                                                                </save>
+                                                                                                                <call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-F1' mode='sync' ></call>
+                                                                                                            </block>
+                                                                                                        </outcome>
+                                                                                                        <outcome value='true'>
+                                                                                                            <block>
+                                                                                                                <exists plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' key='uni.id = $tmp.LEAF.uni-p-interface-long'>
+                                                                                                                    <outcome value='true'>
+                                                                                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                                      resource="uni"
+                                                                                                                                      key="uni.id = $tmp.LEAF.uni-p-interface-long"
+                                                                                                                                      local-only="false"
+                                                                                                                                      pfx="tmp.aai.leafuni" >
+                                                                                                                            <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'>
+                                                                                                                                <switch test='`$tmp.aai.leafuni.data-source == $gfp`'>
+                                                                                                                                    <outcome value='true'></outcome>
+                                                                                                                                    <outcome value='false'>
+                                                                                                                                        <block atomic="true">
+                                                                                                                                            <set>
+                                                                                                                                                <parameter name='bwModified' value="true" />
+                                                                                                                                            </set>
+                                                                                                                                            <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni'
+                                                                                                                                                    key='uni.id = $tmp.LEAF.uni-p-interface-long'>
+                                                                                                                                                <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='data-source' value='`$gfp`' />
+                                                                                                                                            </update>
+                                                                                                                                            <switch test='`$tmp.aai.leafuni.data-source > $gfp`'>
+                                                                                                                                                <outcome value='false'>
+                                                                                                                                                    <block>
+                                                                                                                                                        <set>
+                                                                                                                                                            <parameter name='tmp.delta' value='`$gfp - $tmp.aai.leafuni.data-source`' />
+                                                                                                                                                            <parameter name='tmp.realdelta' value='`$gfp - $tmp.aai.leafuni.data-source`' />
+                                                                                                                                                            <parameter name='tmp.isBwIncreased' value='true' />
+                                                                                                                                                        </set>
+                                                                                                                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                                                                      resource="uni"
+                                                                                                                                                                      key="uni.id = $tmp.ROOT.uni-p-interface-long"
+                                                                                                                                                                      local-only="false"
+                                                                                                                                                                      pfx="tmp.aai.rootuni" >
+                                                                                                                                                            <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.rootuni.data-source + $tmp.delta`' />
+                                                                                                                                                                    </set>
+                                                                                                                                                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni'
+                                                                                                                                                                            key='uni.id = $tmp.ROOT.uni-p-interface-long'>
+                                                                                                                                                                        <parameter name='id' value='`$tmp.ROOT.uni-p-interface-long`' />
+                                                                                                                                                                        <parameter name='data-source' value='`$tmp.newbw`' />
+                                                                                                                                                                    </update>
+                                                                                                                                                                </block>
+                                                                                                                                                            </outcome>
+                                                                                                                                                        </get-resource>
+                                                                                                                                                    </block>
+                                                                                                                                                </outcome>
+                                                                                                                                                <outcome value='true'>
+                                                                                                                                                    <block>
+                                                                                                                                                        <set>
+                                                                                                                                                            <parameter name='tmp.delta' value='`$tmp.aai.leafuni.data-source - $gfp`' />
+                                                                                                                                                            <parameter name='tmp.realdelta' value='`$gfp - $tmp.aai.leafuni.data-source`' />
+                                                                                                                                                            <parameter name='tmp.isBwIncreased' value='false' />
+                                                                                                                                                        </set>
+                                                                                                                                                        <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                                                                      resource="uni"
+                                                                                                                                                                      key="uni.id = $tmp.ROOT.uni-p-interface-long"
+                                                                                                                                                                      local-only="false"
+                                                                                                                                                                      pfx="tmp.aai.rootuni" >
+                                                                                                                                                            <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.rootuni.data-source - $tmp.delta`' />
+                                                                                                                                                                    </set>
+                                                                                                                                                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni'
+                                                                                                                                                                            key='uni.id = $tmp.ROOT.uni-p-interface-long'>
+                                                                                                                                                                        <parameter name='id' value='`$tmp.ROOT.uni-p-interface-long`' />
+                                                                                                                                                                        <parameter name='data-source' value='`$tmp.newbw`' />
+                                                                                                                                                                    </update>
+                                                                                                                                                                </block>
+                                                                                                                                                            </outcome>
+                                                                                                                                                        </get-resource>
+                                                                                                                                                    </block>
+                                                                                                                                                </outcome>
+                                                                                                                                            </switch>
                                                                                                                                             <block atomic="true">
-                                                                                                                                                <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
-                                                                                                                                                        key='vpn-binding.vpn-id = $tmp.aai.vpn-binding.vpn-id' >
-                                                                                                                                                    <parameter name='vpn-id' value='`$tmp.aai.vpn-binding.vpn-id`' />
-                                                                                                                                                    <parameter name='vpn-name' value='`$tmp.aai.vpn-binding.vpn-name`' />
-                                                                                                                                                    <parameter name='route-distinguisher' value='`$gfp`' />
-                                                                                                                                                    <parameter name='operational-status' value='Modified' />
-                                                                                                                                                </update>
-                                                                                                                                                <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='Modified' />
-                                                                                                                                                    <parameter name='bandwidth-profile-name' value='`$gfp`' />
-                                                                                                                                                    <parameter name='cir' value='`$gfp *1000000`' />
-                                                                                                                                                    <parameter name='eir' value='`$gfp *1000000`' />
-                                                                                                                                                </update>
+                                                                                                                                                <block>
+                                                                                                                                                    <set>
+                                                                                                                                                        <parameter name='allNetworksList.' value='' />
+                                                                                                                                                    </set>
+                                                                                                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                                                                  resource="network-resources"
+                                                                                                                                                                  key="selflink = 'https://aai.onap:8443/aai/v24/network/network-resources?depth=0'"
+                                                                                                                                                                  local-only="false"
+                                                                                                                                                                  pfx="allNetworksList" >
+                                                                                                                                                        <outcome value='success'></outcome>
+                                                                                                                                                        <outcome value='Other'></outcome>
+                                                                                                                                                        <outcome value='not-found'></outcome>
+                                                                                                                                                    </get-resource>
+                                                                                                                                                    <for index='netwidx' start='0' end='`$allNetworksList.network-resource_length`' >
+                                                                                                                                                        <switch test='`$allNetworksList.network-resource[$netwidx].provider-id == $param-prefix-domainA-pnfName[2]`'>
+                                                                                                                                                            <outcome value='true'>
+                                                                                                                                                                <switch test='`$allNetworksList.network-resource[$netwidx].te-topo-id != $param-prefix-domainA-pnfName[6]`'>
+                                                                                                                                                                    <outcome value='true'>
+                                                                                                                                                                        <set>
+                                                                                                                                                                            <parameter name='otnTopoIdSrc' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />
+                                                                                                                                                                        </set>
+                                                                                                                                                                    </outcome>
+                                                                                                                                                                </switch>
+                                                                                                                                                            </outcome>
+                                                                                                                                                        </switch>
+                                                                                                                                                    </for>
+                                                                                                                                                    <set>
+                                                                                                                                                        <parameter name='tmp.pce-src-node.' value='' />
+                                                                                                                                                    </set>
+                                                                                                                                                    <set>
+                                                                                                                                                        <!--<parameter name='tmp.pce-src-node' value="`$param-prefix-domainA-pnfName[0] + '-' +-->
+                                                                                                                                                        <!--                                                   $param-prefix-domainA-pnfName[1] + '-' +-->
+                                                                                                                                                        <!--                                                   $param-prefix-domainA-pnfName[2] + '-' +-->
+                                                                                                                                                        <!--                                                   $param-prefix-domainA-pnfName[3] + '-' +-->
+                                                                                                                                                        <!--                                                   $param-prefix-domainA-pnfName[4] + '-' +-->
+                                                                                                                                                        <!--                                                   $param-prefix-domainA-pnfName[5] + '-' +-->
+                                                                                                                                                        <!--                                                   1 + '-' +-->
+                                                                                                                                                        <!--                                                   $param-prefix-domainA-pnfName[7] + '-' +-->
+                                                                                                                                                        <!--                                                   $param-prefix-domainA-pnfName[8]`" />-->
+                                                                                                                                                        <parameter name='tmp.pce-src-node' value="`$param-prefix-domainA-pnfName[0] + '-' +
+                                                   $param-prefix-domainA-pnfName[1] + '-' +
+                                                   $param-prefix-domainA-pnfName[2] + '-' +
+                                                   $param-prefix-domainA-pnfName[3] + '-' +
+                                                   $param-prefix-domainA-pnfName[4] + '-' +
+                                                   $param-prefix-domainA-pnfName[5] + '-' +
+                                                   $otnTopoIdSrc + '-' +
+                                                   $param-prefix-domainA-pnfName[7] + '-' +
+                                                   $param-prefix-domainA-pnfName[8]`" />
+                                                                                                                                                    </set>
+                                                                                                                                                    <set>
+                                                                                                                                                        <!--<parameter name='tmp.srcTtpOtnLayer' value="`$tmp.pce-src-node + '-' + -->
+                                                                                                                                                        <!--                                             $param-prefix-domainA[$param-prefix-domainA_length -2] + '-' +-->
+                                                                                                                                                        <!--                                             $tmp.source.ttp-id`" />-->
+                                                                                                                                                        <parameter name='tmp.srcTtpOtnLayer' value="`$tmp.pce-src-node`" />
+                                                                                                                                                    </set>
+                                                                                                                                                    <call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-find-maximum-used-tpn' mode='sync' ></call>
+                                                                                                                                                </block>
+                                                                                                                                                <set>
+                                                                                                                                                    <parameter name='tmp.current-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />
+                                                                                                                                                    <parameter name='tmp.current-cvlan-id' value='`$tmp.aai.network-route-A.logical-interface-id`' />
+                                                                                                                                                    <!--<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />-->
+                                                                                                                                                    <!--<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />-->
+                                                                                                                                                    <!--<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />-->
+                                                                                                                                                    <!--<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />-->
+                                                                                                                                                    <!--<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />-->
+                                                                                                                                                    <!--<parameter name='cvlan' 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>
+                                                                                                                                                <switch test="`$found-connectivity`">
+                                                                                                                                                    <outcome value='false'>
+                                                                                                                                                        <return status='failure'>
+                                                                                                                                                            <parameter name='ack-final' value='Y'/>
+                                                                                                                                                            <parameter name="error-code" value="500" />
+                                                                                                                                                            <parameter name="error-message" value="LEAF CONN DOES NOT EXIST BUT IT SHOULD BE." />
+                                                                                                                                                        </return>
+                                                                                                                                                    </outcome>
+                                                                                                                                                    <outcome value='true'>
+                                                                                                                                                        <block atomic='true'>
+                                                                                                                                                            <for silentFailure='true' index='cridx' start='0' end='`$tmp.the-connectivity.relationship-list.relationship_length`' >
+                                                                                                                                                                <switch test='`$tmp.the-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.the-connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value"
+                                                                                                                                                                                          local-only="false"
+                                                                                                                                                                                          pfx="tmp.aai.vpn-binding" >
+                                                                                                                                                                                <outcome value='success'>
+                                                                                                                                                                                    <block atomic='true'>
+                                                                                                                                                                                        <switch test="`$tmp.aai.vpn-binding.ops-note == $tmp.srcTtpOtnLayer `">
+                                                                                                                                                                                            <outcome value='true'>
+                                                                                                                                                                                                <switch test="`$tmp.isBwIncreased`">
+                                                                                                                                                                                                    <outcome value='true'>
+                                                                                                                                                                                                        <block atomic='true'>
+                                                                                                                                                                                                            <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
+                                                                                                                                                                                                                    key='vpn-binding.vpn-id = $tmp.aai.vpn-binding.vpn-id' >
+                                                                                                                                                                                                                <parameter name='vpn-id' value='`$tmp.aai.vpn-binding.vpn-id`' />
+                                                                                                                                                                                                                <parameter name='vpn-name' value='`$tmp.aai.vpn-binding.vpn-name`' />
+                                                                                                                                                                                                                <parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />
+                                                                                                                                                                                                                <parameter name='route-distinguisher' value='`$tmp.aai.vpn-binding.route-distinguisher + $tmp.delta`' />
+                                                                                                                                                                                                                <parameter name='operational-status' value='Modified' />
+                                                                                                                                                                                                            </update>
+                                                                                                                                                                                                            <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
+                                                                                                                                                                                                                    key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id'>
+                                                                                                                                                                                                                <parameter name='connectivity-id' value='`$tmp.the-connectivity.connectivity-id`' />
+                                                                                                                                                                                                                <parameter name='operational-status' value='Modified' />
+                                                                                                                                                                                                                <!--<parameter name='bandwidth-profile-name' value='`$gfp`' />-->
+                                                                                                                                                                                                                <!--<parameter name='cir' value='`$gfp *1000000`' />-->
+                                                                                                                                                                                                                <!--<parameter name='eir' value='`$gfp *1000000`' />-->
+                                                                                                                                                                                                            </update>
+                                                                                                                                                                                                        </block>
+                                                                                                                                                                                                    </outcome>
+                                                                                                                                                                                                    <outcome value='false'>
+                                                                                                                                                                                                        <block atomic='true'>
+                                                                                                                                                                                                            <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
+                                                                                                                                                                                                                    key='vpn-binding.vpn-id = $tmp.aai.vpn-binding.vpn-id' >
+                                                                                                                                                                                                                <parameter name='vpn-id' value='`$tmp.aai.vpn-binding.vpn-id`' />
+                                                                                                                                                                                                                <parameter name='vpn-name' value='`$tmp.aai.vpn-binding.vpn-name`' />
+                                                                                                                                                                                                                <parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />
+                                                                                                                                                                                                                <parameter name='route-distinguisher' value='`$tmp.aai.vpn-binding.route-distinguisher - $tmp.delta`' />
+                                                                                                                                                                                                                <parameter name='operational-status' value='Modified' />
+                                                                                                                                                                                                            </update>
+                                                                                                                                                                                                            <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
+                                                                                                                                                                                                                    key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id'>
+                                                                                                                                                                                                                <parameter name='connectivity-id' value='`$tmp.the-connectivity.connectivity-id`' />
+                                                                                                                                                                                                                <parameter name='operational-status' value='Modified' />
+                                                                                                                                                                                                                <!--<parameter name='bandwidth-profile-name' value='`$gfp`' />-->
+                                                                                                                                                                                                                <!--<parameter name='cir' value='`$gfp *1000000`' />-->
+                                                                                                                                                                                                                <!--<parameter name='eir' value='`$gfp *1000000`' />-->
+                                                                                                                                                                                                            </update>
+                                                                                                                                                                                                        </block>
+                                                                                                                                                                                                    </outcome>
+                                                                                                                                                                                                </switch>
+                                                                                                                                                                                            </outcome>
+                                                                                                                                                                                            <outcome value='false'></outcome>
+                                                                                                                                                                                        </switch>
+                                                                                                                                                                                    </block>
+                                                                                                                                                                                </outcome>
+                                                                                                                                                                                <outcome value='not-found'>
+                                                                                                                                                                                    <return status='failure'>
+                                                                                                                                                                                        <parameter name='ack-final' value='Y'/>
+                                                                                                                                                                                        <parameter name="error-code" value="500" />
+                                                                                                                                                                                        <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
+                                                                                                                                                                                    </return>
+                                                                                                                                                                                </outcome>
+                                                                                                                                                                                <outcome value='failure'>
+                                                                                                                                                                                    <return status='failure'>
+                                                                                                                                                                                        <parameter name='error-code' value='' />
+                                                                                                                                                                                        <parameter name='error-message' value='' />
+                                                                                                                                                                                    </return>
+                                                                                                                                                                                </outcome>
+                                                                                                                                                                            </get-resource>
+                                                                                                                                                                        </block>
+                                                                                                                                                                    </outcome>
+                                                                                                                                                                </switch>
+                                                                                                                                                            </for>
+                                                                                                                                                        </block>
+                                                                                                                                                    </outcome>
+                                                                                                                                                </switch>
+                                                                                                                                                <call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-ROOT-conn' mode='sync' ></call>
+                                                                                                                                                <switch test="`$found-root-connectivity`">
+                                                                                                                                                    <outcome value='true'>
+                                                                                                                                                        <block atomic='true'>
+                                                                                                                                                            <for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.ROOT.connectivity.relationship-list.relationship_length`' >
+                                                                                                                                                                <switch test='`$tmp.aai.ROOT.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.ROOT.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value"
+                                                                                                                                                                                          local-only="false"
+                                                                                                                                                                                          pfx="tmp.aai.vpn-binding" >
+                                                                                                                                                                                <outcome value='success'>
+                                                                                                                                                                                    <block atomic="true">
+                                                                                                                                                                                        <block atomic='true'>
+                                                                                                                                                                                            <switch test="`$tmp.aai.vpn-binding.ops-note == $tmp.srcTtpOtnLayer `">
+                                                                                                                                                                                                <outcome value='true'>
+                                                                                                                                                                                                    <switch test="`$tmp.isBwIncreased`">
+                                                                                                                                                                                                        <outcome value='true'>
+                                                                                                                                                                                                            <block atomic='true'>
+                                                                                                                                                                                                                <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
+                                                                                                                                                                                                                        key='vpn-binding.vpn-id = $tmp.aai.vpn-binding.vpn-id' >
+                                                                                                                                                                                                                    <parameter name='vpn-id' value='`$tmp.aai.vpn-binding.vpn-id`' />
+                                                                                                                                                                                                                    <parameter name='vpn-name' value='`$tmp.aai.vpn-binding.vpn-name`' />
+                                                                                                                                                                                                                    <parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />
+                                                                                                                                                                                                                    <parameter name='route-distinguisher' value='`$tmp.aai.vpn-binding.route-distinguisher + $tmp.delta`' />
+                                                                                                                                                                                                                    <parameter name='operational-status' value='Modified' />
+                                                                                                                                                                                                                </update>
+                                                                                                                                                                                                                <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
+                                                                                                                                                                                                                        key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id'>
+                                                                                                                                                                                                                    <parameter name='connectivity-id' value='`$tmp.the-connectivity.connectivity-id`' />
+                                                                                                                                                                                                                    <parameter name='operational-status' value='Modified' />
+                                                                                                                                                                                                                    <!--<parameter name='bandwidth-profile-name' value='`$gfp`' />-->
+                                                                                                                                                                                                                    <!--<parameter name='cir' value='`$gfp *1000000`' />-->
+                                                                                                                                                                                                                    <!--<parameter name='eir' value='`$gfp *1000000`' />-->
+                                                                                                                                                                                                                </update>
+                                                                                                                                                                                                            </block>
+                                                                                                                                                                                                        </outcome>
+                                                                                                                                                                                                        <outcome value='false'>
+                                                                                                                                                                                                            <block atomic='true'>
+                                                                                                                                                                                                                <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
+                                                                                                                                                                                                                        key='vpn-binding.vpn-id = $tmp.aai.vpn-binding.vpn-id' >
+                                                                                                                                                                                                                    <parameter name='vpn-id' value='`$tmp.aai.vpn-binding.vpn-id`' />
+                                                                                                                                                                                                                    <parameter name='vpn-name' value='`$tmp.aai.vpn-binding.vpn-name`' />
+                                                                                                                                                                                                                    <parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />
+                                                                                                                                                                                                                    <parameter name='route-distinguisher' value='`$tmp.aai.vpn-binding.route-distinguisher - $tmp.delta`' />
+                                                                                                                                                                                                                    <parameter name='operational-status' value='Modified' />
+                                                                                                                                                                                                                </update>
+                                                                                                                                                                                                                <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
+                                                                                                                                                                                                                        key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id'>
+                                                                                                                                                                                                                    <parameter name='connectivity-id' value='`$tmp.the-connectivity.connectivity-id`' />
+                                                                                                                                                                                                                    <parameter name='operational-status' value='Modified' />
+                                                                                                                                                                                                                    <!--<parameter name='bandwidth-profile-name' value='`$gfp`' />-->
+                                                                                                                                                                                                                    <!--<parameter name='cir' value='`$gfp *1000000`' />-->
+                                                                                                                                                                                                                    <!--<parameter name='eir' value='`$gfp *1000000`' />-->
+                                                                                                                                                                                                                </update>
+                                                                                                                                                                                                            </block>
+                                                                                                                                                                                                        </outcome>
+                                                                                                                                                                                                    </switch>
+                                                                                                                                                                                                </outcome>
+                                                                                                                                                                                                <outcome value='false'></outcome>
+                                                                                                                                                                                            </switch>
+                                                                                                                                                                                        </block>
+                                                                                                                                                                                    </block>
+                                                                                                                                                                                </outcome>
+                                                                                                                                                                                <outcome value='not-found'>
+                                                                                                                                                                                    <return status='failure'>
+                                                                                                                                                                                        <parameter name='ack-final' value='Y'/>
+                                                                                                                                                                                        <parameter name="error-code" value="500" />
+                                                                                                                                                                                        <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
+                                                                                                                                                                                    </return>
+                                                                                                                                                                                </outcome>
+                                                                                                                                                                                <outcome value='failure'>
+                                                                                                                                                                                    <return status='failure'>
+                                                                                                                                                                                        <parameter name='error-code' value='' />
+                                                                                                                                                                                        <parameter name='error-message' value='' />
+                                                                                                                                                                                    </return>
+                                                                                                                                                                                </outcome>
+                                                                                                                                                                            </get-resource>
+                                                                                                                                                                        </block>
+                                                                                                                                                                    </outcome>
+                                                                                                                                                                </switch>
+                                                                                                                                                            </for>
+                                                                                                                                                        </block>
+                                                                                                                                                    </outcome>
+                                                                                                                                                    <outcome value='false'>
+                                                                                                                                                        <return status='failure'>
+                                                                                                                                                            <parameter name='error-code' value='' />
+                                                                                                                                                            <parameter name='error-message' value='Root Connectivity was not found but it should have been!' />
+                                                                                                                                                        </return>
+                                                                                                                                                    </outcome>
+                                                                                                                                                </switch>
                                                                                                                                             </block>
-                                                                                                                                        </outcome>
-                                                                                                                                        <outcome value='not-found'>
-                                                                                                                                            <return status='failure'>
-                                                                                                                                                <parameter name='ack-final' value='Y'/>
-                                                                                                                                                <parameter name="error-code" value="500" />
-                                                                                                                                                <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
-                                                                                                                                            </return>
-                                                                                                                                        </outcome>
-                                                                                                                                        <outcome value='failure'>
-                                                                                                                                            <return status='failure'>
-                                                                                                                                                <parameter name='error-code' value='' />
-                                                                                                                                                <parameter name='error-message' value='' />
-                                                                                                                                            </return>
-                                                                                                                                        </outcome>
-                                                                                                                                    </get-resource>
-                                                                                                                                </block>
+                                                                                                                                        </block>
+                                                                                                                                    </outcome>
+                                                                                                                                </switch>
                                                                                                                             </outcome>
-                                                                                                                        </switch>
-                                                                                                                    </for>
-                                                                                                                </block>
-                                                                                                            </outcome>
-                                                                                                        </switch>
-                                                                                                    </block>
-                                                                                                </outcome>
-                                                                                                <outcome value='not-found'>
-                                                                                                    <return status='failure'>
-                                                                                                        <parameter name='ack-final' value='Y'/>
-                                                                                                        <parameter name="error-code" value="500" />
-                                                                                                        <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
-                                                                                                    </return>
-                                                                                                </outcome>
-                                                                                                <outcome value='failure'>
-                                                                                                    <return status='failure'>
-                                                                                                        <parameter name='error-code' value='' />
-                                                                                                        <parameter name='error-message' value='' />
-                                                                                                    </return>
-                                                                                                </outcome>
-                                                                                            </get-resource>
-                                                                                        </block>
-                                                                                    </outcome>
-                                                                                </switch>
-                                                                            </for>
-                                                                            <call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-F1-activate' mode='sync' ></call>
-                                                                        </block>
+                                                                                                                        </get-resource>
+                                                                                                                    </outcome>
+                                                                                                                    <outcome value='false'>
+                                                                                                                        <block atomic='true'>
+                                                                                                                            <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                                          resource="uni"
+                                                                                                                                          key="uni.id = $tmp.ROOT.uni-p-interface-long"
+                                                                                                                                          local-only="false"
+                                                                                                                                          pfx="tmp.aai.rootuni" >
+                                                                                                                                <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.rootuni.data-source + $gfp`' />
+                                                                                                                                        </set>
+                                                                                                                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni'
+                                                                                                                                                key='uni.id = $tmp.ROOT.uni-p-interface-long'>
+                                                                                                                                            <parameter name='id' value='`$tmp.ROOT.uni-p-interface-long`' />
+                                                                                                                                            <parameter name='data-source' value='`$tmp.newbw`' />
+                                                                                                                                        </update>
+                                                                                                                                    </block>
+                                                                                                                                </outcome>
+                                                                                                                            </get-resource>
+                                                                                                                            <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/' + $middle-man-conn.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="`$middle-man-conn.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>
+                                                                                                                            <set>
+                                                                                                                                <parameter name='tmp.current-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />
+                                                                                                                                <parameter name='tmp.current-cvlan-id' value='`$tmp.aai.network-route-A.logical-interface-id`' />
+                                                                                                                                <!--<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />-->
+                                                                                                                                <!--<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />-->
+                                                                                                                                <!--<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />-->
+                                                                                                                                <!--<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />-->
+                                                                                                                                <!--<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />-->
+                                                                                                                                <!--<parameter name='cvlan' 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>
+                                                                                                                            <switch test='`$no-pce-call`'>
+                                                                                                                                <outcome value='false'>
+                                                                                                                                    <block atomic='true'>
+                                                                                                                                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni'
+                                                                                                                                              key='uni.id = $tmp.LEAF.uni-p-interface-long'>
+                                                                                                                                            <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='data-source' value='`$gfp`' />
+                                                                                                                                        </save>
+                                                                                                                                        <switch test="`$found-connectivity`">
+                                                                                                                                            <outcome value='false'>
+                                                                                                                                                <block atomic='true'>
+                                                                                                                                                    <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
+                                                                                                                                                        <parameter name="ctx-destination" value="uuid.connectivity-domainA-uuid"/>
+                                                                                                                                                    </execute>
+                                                                                                                                                    <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
+                                                                                                                                                          key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>
+                                                                                                                                                        <parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />
+                                                                                                                                                        <parameter name='etht-svc-name' value='`$middle-man-conn.etht-svc-name`' />
+                                                                                                                                                        <parameter name='operational-status' value='Created' />
+                                                                                                                                                        <parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />
+                                                                                                                                                        <parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />
+                                                                                                                                                        <parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />
+                                                                                                                                                        <parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />
+                                                                                                                                                        <parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />
+                                                                                                                                                        <parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />
+                                                                                                                                                        <parameter name='vpn-type' value='leaf' />
+                                                                                                                                                        <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/' + $uuid.connectivity-domainA-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-domainA-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 = $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-domainA-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-domainA-uuid`" />
+                                                                                                                                                    </save>
+                                                                                                                                                </block>
+                                                                                                                                            </outcome>
+                                                                                                                                            <outcome value='true'>
+                                                                                                                                                <block atomic='true'>
+                                                                                                                                                    <set>
+                                                                                                                                                        <parameter name='uuid.connectivity-domainA-uuid' value="`$tmp.the-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.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 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 = $uuid.connectivity-domainA-uuid'>
+                                                                                                                                                        <parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />
+                                                                                                                                                        <parameter name='operational-status' value='Modified' />
+                                                                                                                                                    </update>
+                                                                                                                                                </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">
+                                                                                                                                            <parameter name="relationship-list.relationship[0].related-to" value="uni" />
+                                                                                                                                            <parameter name="relationship-list.relationship[0].related-link" value="`'/network/unis/uni/' + $tmp.LEAF.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.LEAF.uni-p-interface-long`" />
+                                                                                                                                        </save>
+                                                                                                                                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list'
+                                                                                                                                              key='connectivity.connectivity-id = $uuid.connectivity-domainA-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.LEAF.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.LEAF.uni-p-interface-long`" />
+                                                                                                                                        </save>
+                                                                                                                                        <call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-ROOT-conn' mode='sync' ></call>
+                                                                                                                                        <switch test="`$found-root-connectivity`">
+                                                                                                                                            <outcome value='true'>
+                                                                                                                                                <block atomic='true'>
+                                                                                                                                                    <set>
+                                                                                                                                                        <!--<parameter name='prop.connectivity-domainB-uuid' value="`$tmp.ROOT.uni-p-interface-long`" />-->
+                                                                                                                                                        <!--OR-->
+                                                                                                                                                        <parameter name='prop.connectivity-domainB-uuid' value="`$tmp.aai.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.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.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-domainB-uuid'>
+                                                                                                                                                        <parameter name='connectivity-id' value='`$prop.connectivity-domainB-uuid`' />
+                                                                                                                                                        <parameter name='operational-status' value='Modified' />
+                                                                                                                                                    </update>
+                                                                                                                                                </block>
+                                                                                                                                            </outcome>
+                                                                                                                                            <outcome value='false'>
+                                                                                                                                                <return status='failure'>
+                                                                                                                                                    <parameter name='error-code' value='' />
+                                                                                                                                                    <parameter name='error-message' value='Root Connectivity was not found' />
+                                                                                                                                                </return>
+                                                                                                                                            </outcome>
+                                                                                                                                        </switch>
+                                                                                                                                        <call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-F1' mode='sync' ></call>
+                                                                                                                                    </block>
+                                                                                                                                </outcome>
+                                                                                                                                <outcome value='true'>
+                                                                                                                                    <block atomic='true'>
+                                                                                                                                        <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni'
+                                                                                                                                              key='uni.id = $tmp.LEAF.uni-p-interface-long'>
+                                                                                                                                            <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='data-source' value='`$gfp`' />
+                                                                                                                                        </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="uni" />
+                                                                                                                                            <parameter name="relationship-list.relationship[0].related-link" value="`'/network/unis/uni/' + $tmp.LEAF.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.LEAF.uni-p-interface-long`" />
+                                                                                                                                        </save>
+                                                                                                                                        <set>
+                                                                                                                                            <parameter name='tmp.current-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />
+                                                                                                                                            <parameter name='tmp.current-cvlan-id' value='`$tmp.aai.network-route-A.logical-interface-id`' />
+                                                                                                                                            <!--<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />-->
+                                                                                                                                            <!--<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />-->
+                                                                                                                                            <!--<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />-->
+                                                                                                                                            <!--<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />-->
+                                                                                                                                            <!--<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />-->
+                                                                                                                                            <!--<parameter name='cvlan' 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>
+                                                                                                                                        <switch test="`$found-connectivity`">
+                                                                                                                                            <outcome value='false'>
+                                                                                                                                                <return status='failure'>
+                                                                                                                                                    <parameter name='error-code' value='' />
+                                                                                                                                                    <parameter name='error-message' value='Connectivity should have been created' />
+                                                                                                                                                </return>
+                                                                                                                                            </outcome>
+                                                                                                                                            <outcome value='true'>
+                                                                                                                                                <block>
+                                                                                                                                                    <block>
+                                                                                                                                                        <call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-helper-find-ROOT-conn' mode='sync' ></call>
+                                                                                                                                                        <switch test="`$found-root-connectivity`">
+                                                                                                                                                            <outcome value='true'>
+                                                                                                                                                                <block atomic='true'>
+                                                                                                                                                                    <set>
+                                                                                                                                                                        <!--<parameter name='prop.connectivity-domainB-uuid' value="`$tmp.ROOT.uni-p-interface-long`" />-->
+                                                                                                                                                                        <!--OR-->
+                                                                                                                                                                        <parameter name='prop.connectivity-domainB-uuid' value="`$tmp.aai.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.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.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-domainB-uuid'>
+                                                                                                                                                                        <parameter name='connectivity-id' value='`$prop.connectivity-domainB-uuid`' />
+                                                                                                                                                                        <parameter name='operational-status' value='Modified' />
+                                                                                                                                                                    </update>
+                                                                                                                                                                </block>
+                                                                                                                                                            </outcome>
+                                                                                                                                                            <outcome value='false'>
+                                                                                                                                                                <return status='failure'>
+                                                                                                                                                                    <parameter name='error-code' value='' />
+                                                                                                                                                                    <parameter name='error-message' value='Root Connectivity was not found' />
+                                                                                                                                                                </return>
+                                                                                                                                                            </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'
+                                                                                                                                                          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.LEAF.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.LEAF.uni-p-interface-long`" />
+                                                                                                                                                    </save>
+                                                                                                                                                    <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
+                                                                                                                                                            key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id'>
+                                                                                                                                                        <parameter name='connectivity-id' value='`$tmp.the-connectivity.connectivity-id`' />
+                                                                                                                                                        <parameter name='operational-status' value='Modified' />
+                                                                                                                                                    </update>
+                                                                                                                                                    <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.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 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>
+                                                                                                                                                    <set>
+                                                                                                                                                        <parameter name='allNetworksList.' value='' />
+                                                                                                                                                    </set>
+                                                                                                                                                    <get-resource plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService"
+                                                                                                                                                                  resource="network-resources"
+                                                                                                                                                                  key="selflink = 'https://aai.onap:8443/aai/v24/network/network-resources?depth=0'"
+                                                                                                                                                                  local-only="false"
+                                                                                                                                                                  pfx="allNetworksList" >
+                                                                                                                                                        <outcome value='success'></outcome>
+                                                                                                                                                        <outcome value='Other'></outcome>
+                                                                                                                                                        <outcome value='not-found'></outcome>
+                                                                                                                                                    </get-resource>
+                                                                                                                                                    <for index='netwidx' start='0' end='`$allNetworksList.network-resource_length`' >
+                                                                                                                                                        <switch test='`$allNetworksList.network-resource[$netwidx].provider-id == $param-prefix-domainA-pnfName[2]`'>
+                                                                                                                                                            <outcome value='true'>
+                                                                                                                                                                <switch test='`$allNetworksList.network-resource[$netwidx].te-topo-id != $param-prefix-domainA-pnfName[6]`'>
+                                                                                                                                                                    <outcome value='true'>
+                                                                                                                                                                        <set>
+                                                                                                                                                                            <parameter name='otnTopoIdSrc' value='`$allNetworksList.network-resource[$netwidx].te-topo-id`' />
+                                                                                                                                                                        </set>
+                                                                                                                                                                    </outcome>
+                                                                                                                                                                </switch>
+                                                                                                                                                            </outcome>
+                                                                                                                                                        </switch>
+                                                                                                                                                    </for>
+                                                                                                                                                    <set>
+                                                                                                                                                        <parameter name='tmp.pce-src-node.' value='' />
+                                                                                                                                                    </set>
+                                                                                                                                                    <set>
+                                                                                                                                                        <!--<parameter name='tmp.pce-src-node' value="`$param-prefix-domainA-pnfName[0] + '-' +-->
+                                                                                                                                                        <!--                                                   $param-prefix-domainA-pnfName[1] + '-' +-->
+                                                                                                                                                        <!--                                                   $param-prefix-domainA-pnfName[2] + '-' +-->
+                                                                                                                                                        <!--                                                   $param-prefix-domainA-pnfName[3] + '-' +-->
+                                                                                                                                                        <!--                                                   $param-prefix-domainA-pnfName[4] + '-' +-->
+                                                                                                                                                        <!--                                                   $param-prefix-domainA-pnfName[5] + '-' +-->
+                                                                                                                                                        <!--                                                   1 + '-' +-->
+                                                                                                                                                        <!--                                                   $param-prefix-domainA-pnfName[7] + '-' +-->
+                                                                                                                                                        <!--                                                   $param-prefix-domainA-pnfName[8]`" />-->
+                                                                                                                                                        <parameter name='tmp.pce-src-node' value="`$param-prefix-domainA-pnfName[0] + '-' +
+                                                   $param-prefix-domainA-pnfName[1] + '-' +
+                                                   $param-prefix-domainA-pnfName[2] + '-' +
+                                                   $param-prefix-domainA-pnfName[3] + '-' +
+                                                   $param-prefix-domainA-pnfName[4] + '-' +
+                                                   $param-prefix-domainA-pnfName[5] + '-' +
+                                                   $otnTopoIdSrc + '-' +
+                                                   $param-prefix-domainA-pnfName[7] + '-' +
+                                                   $param-prefix-domainA-pnfName[8]`" />
+                                                                                                                                                    </set>
+                                                                                                                                                    <set>
+                                                                                                                                                        <!--<parameter name='tmp.srcTtpOtnLayer' value="`$tmp.pce-src-node + '-' + -->
+                                                                                                                                                        <!--                                             $param-prefix-domainA[$param-prefix-domainA_length -2] + '-' +-->
+                                                                                                                                                        <!--                                             $tmp.source.ttp-id`" />-->
+                                                                                                                                                        <parameter name='tmp.srcTtpOtnLayer' value="`$tmp.pce-src-node`" />
+                                                                                                                                                    </set>
+                                                                                                                                                    <call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-find-maximum-used-tpn' mode='sync' ></call>
+                                                                                                                                                    <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'>
+                                                                                                                                                                            <switch test="`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].ops-note == $tmp.srcTtpOtnLayer `">
+                                                                                                                                                                                <outcome value='true'>
+                                                                                                                                                                                    <block atomic='true'>
+                                                                                                                                                                                        <set>
+                                                                                                                                                                                            <parameter name='tmp.aai.the-vpn-binding.' value="" />
+                                                                                                                                                                                        </set>
+                                                                                                                                                                                        <set>
+                                                                                                                                                                                            <parameter name='tmp.aai.the-vpn-binding.' value="`$tmp.aai.all-vpn-bindings.vpn-binding[$vpnbidx].`" />
+                                                                                                                                                                                        </set>
+                                                                                                                                                                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
+                                                                                                                                                                                                key='vpn-binding.vpn-id = $tmp.aai.the-vpn-binding.vpn-id' >
+                                                                                                                                                                                            <parameter name='vpn-id' value='`$tmp.aai.the-vpn-binding.vpn-id`' />
+                                                                                                                                                                                            <!--<parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />-->
+                                                                                                                                                                                            <parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />
+                                                                                                                                                                                            <parameter name='route-distinguisher' value='`$tmp.aai.the-vpn-binding.route-distinguisher + $gfp`' />
+                                                                                                                                                                                            <parameter name='operational-status' value='Modified' />
+                                                                                                                                                                                        </update>
+                                                                                                                                                                                    </block>
+                                                                                                                                                                                </outcome>
+                                                                                                                                                                                <outcome value='false'></outcome>
+                                                                                                                                                                            </switch>
+                                                                                                                                                                        </block>
+                                                                                                                                                                    </block>
+                                                                                                                                                                </for>
+                                                                                                                                                            </block>
+                                                                                                                                                        </outcome>
+                                                                                                                                                        <outcome value='not-found'>
+                                                                                                                                                            <return status='failure'>
+                                                                                                                                                                <parameter name='ack-final' value='Y'/>
+                                                                                                                                                                <parameter name="error-code" value="500" />
+                                                                                                                                                                <parameter name="error-message" value="`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`" />
+                                                                                                                                                            </return>
+                                                                                                                                                        </outcome>
+                                                                                                                                                        <outcome value='failure'>
+                                                                                                                                                            <return status='failure'>
+                                                                                                                                                                <parameter name='error-code' value='' />
+                                                                                                                                                                <parameter name='error-message' value='' />
+                                                                                                                                                            </return>
+                                                                                                                                                        </outcome>
+                                                                                                                                                    </get-resource>
+                                                                                                                                                </block>
+                                                                                                                                            </outcome>
+                                                                                                                                        </switch>
+                                                                                                                                    </block>
+                                                                                                                                </outcome>
+                                                                                                                            </switch>
+                                                                                                                        </block>
+                                                                                                                    </outcome>
+                                                                                                                </exists>
+                                                                                                            </block>
+                                                                                                        </outcome>
+                                                                                                    </switch>
+                                                                                                </block>
+                                                                                            </outcome>
+                                                                                        </get-resource>
+                                                                                    </block>
+                                                                                </outcome>
+                                                                            </switch>
+                                                                        </for>
                                                                     </block>
                                                                 </outcome>
                                                             </switch>
@@ -254,6 +1792,7 @@
                                         </outcome>
                                     </get-resource>
                                 </for>
+                                <call module='GENERIC-RESOURCE-API' rpc='cll-vnf-topology-operation-cll-F1-activate' mode='sync' ></call>
                             </block>
                         </outcome>
                     </switch>
-- 
cgit 1.2.3-korg