From f218265ea2889432eb1f0d1092b004247e839c3e Mon Sep 17 00:00:00 2001
From: Hesam Rahimi <hesam.rahimi@huawei.com>
Date: Tue, 7 Sep 2021 18:01:05 -0400
Subject: New DGs required for deletion and bandwidth modification of a given
 cloud leased-line (E-TREE) service.

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

Former-commit-id: 926d912ec35ecd30f5f1c32ca91da2758b018223
---
 ...URCE-API_cll-vnf-topology-operation-cll-F1.json | 1854 ++++++++++----------
 ...-API_cll-vnf-topology-operation-cll-delete.json | 1099 ++++++++++++
 ...-API_cll-vnf-topology-operation-cll-modify.json | 1627 +++++++++++++++++
 3 files changed, 3653 insertions(+), 927 deletions(-)
 create mode 100644 platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete.json
 create mode 100644 platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-modify.json

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

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 376401b0..7eb64480 100644
--- a/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1.json
+++ b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-F1.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "917062ba.849008",
+        "id": "66573054.d6959",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 218,
-        "y": 53,
-        "z": "a911d5ff.5ac84",
+        "x": 230,
+        "y": 62,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "1c89f912.b4a1a7"
+                "88fd1149.f833f"
             ]
         ]
     },
     {
-        "id": "1c89f912.b4a1a7",
+        "id": "88fd1149.f833f",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,2773 +22,2773 @@
         "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": 502.2856903076172,
-        "y": 114.23810863494873,
-        "z": "a911d5ff.5ac84",
+        "x": 514.2856903076172,
+        "y": 123.23810863494873,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "79c37e31.b46698"
+                "4c164ab.c48bfb4"
             ]
         ]
     },
     {
-        "id": "79c37e31.b46698",
+        "id": "4c164ab.c48bfb4",
         "type": "method",
         "name": "method cll-vnf-topology-operation-cll-F1",
         "xml": "<method rpc='cll-vnf-topology-operation-cll-F1' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 418.4285888671875,
-        "y": 192.00003051757812,
-        "z": "a911d5ff.5ac84",
+        "x": 430.4285888671875,
+        "y": 201.00003051757812,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "e40aa944.361218"
+                "e2c1e393.f72a2"
             ]
         ]
     },
     {
-        "id": "e40aa944.361218",
+        "id": "e2c1e393.f72a2",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 152.238037109375,
-        "y": 695.6666870117188,
-        "z": "a911d5ff.5ac84",
+        "x": 164.238037109375,
+        "y": 704.6666870117188,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "91449a53.15abc8",
-                "52206559.265cbc",
-                "dc5388ea.7452c",
-                "cd1cf50b.3447d",
-                "36cc6c32.a7a5bc",
-                "ef8123f7.a43b88",
-                "349f069b.2d098a"
+                "35872244.0dadfe",
+                "76353aba.1a1834",
+                "1a3db60a.42601a",
+                "cde65043.1c4f8",
+                "5f4f339e.018654",
+                "6f21b0a4.c1ba8",
+                "19956ea.f245091"
             ]
         ]
     },
     {
-        "id": "91449a53.15abc8",
+        "id": "35872244.0dadfe",
         "type": "set",
         "name": "set query_param",
         "xml": "<set>\n<parameter name='prop.ethsrvType' value='`$network-route-A`' />\n\n",
         "comments": "",
-        "x": 425,
-        "y": 650,
-        "z": "a911d5ff.5ac84",
+        "x": 437,
+        "y": 659,
+        "z": "4fb14ce0.40eb24",
         "wires": []
     },
     {
-        "id": "52206559.265cbc",
+        "id": "76353aba.1a1834",
         "type": "call",
         "name": "call GENERIC-RESOURCE-API:tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof",
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='tsli-vnf-topology-operation-get-otn-tunnel-path-from-oof' mode='sync' >\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 646,
-        "y": 718,
-        "z": "a911d5ff.5ac84",
+        "x": 658,
+        "y": 727,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             []
         ]
     },
     {
-        "id": "dc5388ea.7452c",
+        "id": "1a3db60a.42601a",
         "type": "execute",
         "name": "execute printContext",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='printContext' >\n    <parameter name=\"filename\" value=\"`$filenamemm`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 436,
-        "y": 764,
-        "z": "a911d5ff.5ac84",
+        "x": 448,
+        "y": 773,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             []
         ]
     },
     {
-        "id": "349f069b.2d098a",
+        "id": "19956ea.f245091",
         "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": 629,
-        "y": 828,
-        "z": "a911d5ff.5ac84",
+        "x": 641,
+        "y": 837,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             []
         ]
     },
     {
-        "id": "cd1cf50b.3447d",
+        "id": "cde65043.1c4f8",
         "type": "for",
         "name": "for vidx..tmp.otninfo_length[]",
         "xml": "<for index='otnidx' start='0' end='`$tmp.otninfo_length`' >",
         "comments": "",
         "outputs": 1,
-        "x": 456,
-        "y": 984,
-        "z": "a911d5ff.5ac84",
+        "x": 468,
+        "y": 993,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "4719cb7a.a9766c"
+                "53111f1b.5dbab"
             ]
         ]
     },
     {
-        "id": "4719cb7a.a9766c",
+        "id": "53111f1b.5dbab",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 725,
-        "y": 984,
-        "z": "a911d5ff.5ac84",
+        "x": 737,
+        "y": 993,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "ffc8e265.c8aca8",
-                "13f1d395.eb898c",
-                "b91b98db.dabfa",
-                "66797943.9e353",
-                "c2e19c98.abbc4",
-                "11040b46.8e035d",
-                "130409d7.ba1cfe",
-                "3e17d72f.d352d",
-                "1ea79a81.da9f1d",
-                "f0ca8ca2.d5c31"
+                "78857b79.cfe234",
+                "b3432980.49ee6",
+                "233e999f.144d9e",
+                "7a85fbed.abf844",
+                "715b7a53.d039d4",
+                "13d7f319.f10ffd",
+                "fe43d4e7.2e266",
+                "9673bbc9.e232d8",
+                "8c1ff0ec.d0238",
+                "84f3d24d.36c17"
             ]
         ]
     },
     {
-        "id": "ffc8e265.c8aca8",
+        "id": "78857b79.cfe234",
         "type": "execute",
         "name": "execute UUID generator for vpn-binding $otnidx",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.vpn-binding-otnidx-uuid\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1618,
-        "y": 798,
-        "z": "a911d5ff.5ac84",
+        "x": 1630,
+        "y": 807,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             []
         ]
     },
     {
-        "id": "13f1d395.eb898c",
+        "id": "b3432980.49ee6",
         "type": "switchNode",
         "name": "switch dstPort == NULL",
         "xml": "<switch test=\"`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id == ''`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1332,
-        "y": 888,
-        "z": "a911d5ff.5ac84",
+        "x": 1344,
+        "y": 897,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "467187d6.5cb93",
-                "dac264a6.6c03c8"
+                "fb6a4667.5dee4",
+                "8968ad13.112c48"
             ]
         ]
     },
     {
-        "id": "467187d6.5cb93",
+        "id": "fb6a4667.5dee4",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1698,
-        "y": 849,
-        "z": "a911d5ff.5ac84",
+        "x": 1710,
+        "y": 858,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "6cf7a6e6.d655a8"
+                "38cd80d0.a81b08"
             ]
         ]
     },
     {
-        "id": "dac264a6.6c03c8",
+        "id": "8968ad13.112c48",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1699,
-        "y": 895,
-        "z": "a911d5ff.5ac84",
+        "x": 1711,
+        "y": 904,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "5ca74bf6.9d33ac"
+                "12ac055c.676cf3"
             ]
         ]
     },
     {
-        "id": "6cf7a6e6.d655a8",
+        "id": "38cd80d0.a81b08",
         "type": "set",
         "name": "set access-provider-id and client-id",
         "xml": "<set>\n<parameter name='tmp.access-provider-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-provider-id`' />\n<parameter name='tmp.access-client-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-client-id`' />\n<parameter name='tmp.access-topology-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-topology-id`' />\n<parameter name='tmp.srcdstpnf-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />\n",
         "comments": "",
-        "x": 1912,
-        "y": 848,
-        "z": "a911d5ff.5ac84",
+        "x": 1924,
+        "y": 857,
+        "z": "4fb14ce0.40eb24",
         "wires": []
     },
     {
-        "id": "5ca74bf6.9d33ac",
+        "id": "12ac055c.676cf3",
         "type": "set",
         "name": "set access-provider-id and client-id",
         "xml": "<set>\n<parameter name='tmp.access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />\n<parameter name='tmp.access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />\n<parameter name='tmp.access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />\n<parameter name='tmp.srcdstpnf-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />\n",
         "comments": "",
-        "x": 1910,
-        "y": 893,
-        "z": "a911d5ff.5ac84",
+        "x": 1922,
+        "y": 902,
+        "z": "4fb14ce0.40eb24",
         "wires": []
     },
     {
-        "id": "b91b98db.dabfa",
+        "id": "233e999f.144d9e",
         "type": "set",
         "name": "set srcdstpnf-name",
         "xml": "<set>\n<parameter name='tmp.srcdstpnf-name' value=\"`'networkId-providerId-' + \n                                             $tmp.access-provider-id + '-clientId-' +\n                                             $tmp.access-client-id + '-topologyId-' + \n                                             $tmp.access-topology-id + '-nodeId-' + \n                                             $tmp.srcdstpnf-id`\" />\n\n",
         "comments": "",
-        "x": 1508,
-        "y": 962,
-        "z": "a911d5ff.5ac84",
+        "x": 1520,
+        "y": 971,
+        "z": "4fb14ce0.40eb24",
         "wires": []
     },
     {
-        "id": "66797943.9e353",
+        "id": "7a85fbed.abf844",
         "type": "get-resource",
         "name": "get-resource tmp.srcdstpnf-name",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.srcdstpnf-name\"\n        pfx='tmp.aai.srcdst-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 1552,
-        "y": 1010,
-        "z": "a911d5ff.5ac84",
+        "x": 1564,
+        "y": 1019,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "2fed2218.d10326",
-                "6a522d09.043e1c",
-                "4f95b3dd.ef9534"
+                "85cf2b2f.efe2d8",
+                "40c18c0.1c43574",
+                "e3b12e57.7afb78"
             ]
         ]
     },
     {
-        "id": "2fed2218.d10326",
+        "id": "85cf2b2f.efe2d8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1764.5,
-        "y": 957,
-        "z": "a911d5ff.5ac84",
+        "x": 1776.5,
+        "y": 966,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "66f51b5e.6158fc"
+                "7b23fddb.009994"
             ]
         ]
     },
     {
-        "id": "6a522d09.043e1c",
+        "id": "40c18c0.1c43574",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1776.5,
-        "y": 1007,
-        "z": "a911d5ff.5ac84",
+        "x": 1788.5,
+        "y": 1016,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "8e681ebe.696e48"
+                "317c3552.8ea652"
             ]
         ]
     },
     {
-        "id": "4f95b3dd.ef9534",
+        "id": "e3b12e57.7afb78",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1767.5,
-        "y": 1062,
-        "z": "a911d5ff.5ac84",
+        "x": 1779.5,
+        "y": 1071,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "6977d582.14091c"
+                "c0e357e5.8168d8"
             ]
         ]
     },
     {
-        "id": "6977d582.14091c",
+        "id": "c0e357e5.8168d8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 1912.5,
-        "y": 1061,
-        "z": "a911d5ff.5ac84",
+        "x": 1924.5,
+        "y": 1070,
+        "z": "4fb14ce0.40eb24",
         "wires": []
     },
     {
-        "id": "8e681ebe.696e48",
+        "id": "317c3552.8ea652",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 1923.5,
-        "y": 1004,
-        "z": "a911d5ff.5ac84",
+        "x": 1935.5,
+        "y": 1013,
+        "z": "4fb14ce0.40eb24",
         "wires": []
     },
     {
-        "id": "66f51b5e.6158fc",
+        "id": "7b23fddb.009994",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1889.8824462890625,
-        "y": 950.6556701660156,
-        "z": "a911d5ff.5ac84",
+        "x": 1901.8824462890625,
+        "y": 959.6556701660156,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "3a1d3f10.5d9028"
+                "f3d54fb4.5c0a1"
             ]
         ]
     },
     {
-        "id": "3a1d3f10.5d9028",
+        "id": "f3d54fb4.5c0a1",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.srcdst-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2051,
-        "y": 965,
-        "z": "a911d5ff.5ac84",
+        "x": 2063,
+        "y": 974,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "c1512230.2580e"
+                "763118b6.61e2b8"
             ]
         ]
     },
     {
-        "id": "c1512230.2580e",
+        "id": "763118b6.61e2b8",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.srcdst-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2246,
-        "y": 965,
-        "z": "a911d5ff.5ac84",
+        "x": 2258,
+        "y": 974,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "b1b8c338.420ea"
+                "45a9ec7c.a92c4c"
             ]
         ]
     },
     {
-        "id": "fd7930d3.be8638",
+        "id": "6fd0244b.f38ce4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2626,
-        "y": 961,
-        "z": "a911d5ff.5ac84",
+        "x": 2638,
+        "y": 970,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "ac1612ad.b61828",
-                "27939c6a.4866bc"
+                "e527c2f.df2fcc",
+                "56d60802.89ee28"
             ]
         ]
     },
     {
-        "id": "27939c6a.4866bc",
+        "id": "56d60802.89ee28",
         "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": 2834,
-        "y": 968,
-        "z": "a911d5ff.5ac84",
+        "x": 2846,
+        "y": 977,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "b52d7285.57757",
-                "3657321a.c3ba86",
-                "c044af78.310578"
+                "b854345d.faf84",
+                "437ea2b.b00f35c",
+                "fed3318a.a11e3"
             ]
         ]
     },
     {
-        "id": "ac1612ad.b61828",
+        "id": "e527c2f.df2fcc",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domainG id",
         "xml": "<set>\n<parameter name='tmp.domainG.esr-thirdparty-id' value=\"`$tmp.aai.srcdst-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 2864,
-        "y": 916,
-        "z": "a911d5ff.5ac84",
+        "x": 2876,
+        "y": 925,
+        "z": "4fb14ce0.40eb24",
         "wires": []
     },
     {
-        "id": "b52d7285.57757",
+        "id": "b854345d.faf84",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3044,
-        "y": 959,
-        "z": "a911d5ff.5ac84",
+        "x": 3056,
+        "y": 968,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "cbaaba15.349bc8"
+                "918d39ea.cf7f2"
             ]
         ]
     },
     {
-        "id": "3657321a.c3ba86",
+        "id": "437ea2b.b00f35c",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3036,
-        "y": 1014,
-        "z": "a911d5ff.5ac84",
+        "x": 3048,
+        "y": 1023,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "f52e6392.eb1be8"
+                "1afabba1.4179cc"
             ]
         ]
     },
     {
-        "id": "c044af78.310578",
+        "id": "fed3318a.a11e3",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3041,
-        "y": 1071,
-        "z": "a911d5ff.5ac84",
+        "x": 3053,
+        "y": 1080,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "7b6a4d1e.bd1e74"
+                "e095e0e5.375ba"
             ]
         ]
     },
     {
-        "id": "7b6a4d1e.bd1e74",
+        "id": "e095e0e5.375ba",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 3193,
-        "y": 1072,
-        "z": "a911d5ff.5ac84",
+        "x": 3205,
+        "y": 1081,
+        "z": "4fb14ce0.40eb24",
         "wires": []
     },
     {
-        "id": "f52e6392.eb1be8",
+        "id": "1afabba1.4179cc",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 3204,
-        "y": 1017,
-        "z": "a911d5ff.5ac84",
+        "x": 3216,
+        "y": 1026,
+        "z": "4fb14ce0.40eb24",
         "wires": []
     },
     {
-        "id": "cbaaba15.349bc8",
+        "id": "918d39ea.cf7f2",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3188.38232421875,
-        "y": 956.6556701660156,
-        "z": "a911d5ff.5ac84",
+        "x": 3200.38232421875,
+        "y": 965.6556701660156,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "37241585.bf56ba"
+                "47a021ef.066c88"
             ]
         ]
     },
     {
-        "id": "b1b8c338.420ea",
+        "id": "45a9ec7c.a92c4c",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2449,
-        "y": 969,
-        "z": "a911d5ff.5ac84",
+        "x": 2461,
+        "y": 978,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "fd7930d3.be8638"
+                "6fd0244b.f38ce4"
             ]
         ]
     },
     {
-        "id": "37241585.bf56ba",
+        "id": "47a021ef.066c88",
         "type": "set",
         "name": "set controller domainA data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.url' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.user' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.password' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
         "comments": "",
-        "x": 3403,
-        "y": 953,
-        "z": "a911d5ff.5ac84",
+        "x": 3415,
+        "y": 962,
+        "z": "4fb14ce0.40eb24",
         "wires": []
     },
     {
-        "id": "5bdba13b.1ae3d",
+        "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": 1562,
-        "y": 2859,
-        "z": "a911d5ff.5ac84",
+        "x": 1574,
+        "y": 2868,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "2982a228.f40e1e"
+                "871b9e34.870768"
             ]
         ]
     },
     {
-        "id": "e79aedfa.249",
+        "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": 2134.5,
-        "y": 2963,
-        "z": "a911d5ff.5ac84",
+        "x": 2146.5,
+        "y": 2972,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             []
         ]
     },
     {
-        "id": "2982a228.f40e1e",
+        "id": "871b9e34.870768",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1868,
-        "y": 2858,
-        "z": "a911d5ff.5ac84",
+        "x": 1880,
+        "y": 2867,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "3d256a26.ef6a26"
+                "ee92c990.60c9f"
             ]
         ]
     },
     {
-        "id": "3d256a26.ef6a26",
+        "id": "ee92c990.60c9f",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2077.5,
-        "y": 2858.25390625,
-        "z": "a911d5ff.5ac84",
+        "x": 2089.5,
+        "y": 2867.25390625,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             []
         ]
     },
     {
-        "id": "7e7c0247.8ba9f4",
+        "id": "702e0066.542168",
         "type": "switchNode",
         "name": "switch otnidx == 0",
         "xml": "<switch test='`$otnidx == 0`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1471,
-        "y": 2976,
-        "z": "a911d5ff.5ac84",
+        "x": 1483,
+        "y": 2985,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "2d5f380b.a9d4d8",
-                "4f3979ad.4a4e48"
+                "bb13d1a8.37e5",
+                "a19ebb79.79b868"
             ]
         ]
     },
     {
-        "id": "2d5f380b.a9d4d8",
+        "id": "bb13d1a8.37e5",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1654,
-        "y": 2976,
-        "z": "a911d5ff.5ac84",
+        "x": 1666,
+        "y": 2985,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "ffef74e0.d4b7c"
+                "62ae9cfb.3879bc"
             ]
         ]
     },
     {
-        "id": "4f3979ad.4a4e48",
+        "id": "a19ebb79.79b868",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1479,
-        "y": 3123,
-        "z": "a911d5ff.5ac84",
+        "x": 1491,
+        "y": 3132,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "a4296e1e.d8981"
+                "db504ec2.be40a8"
             ]
         ]
     },
     {
-        "id": "1a4f2a93.c11d2d",
+        "id": "d2ac9909.c7d83",
         "type": "switchNode",
         "name": "switch otnidx == last",
         "xml": "<switch test='`$otnidx == $tmp.otninfo_length - 1`'>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1820,
-        "y": 3204,
-        "z": "a911d5ff.5ac84",
+        "x": 1832,
+        "y": 3213,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "b3a20bdf.7738d8",
-                "b291bad0.bdbf18"
+                "f6ac8945.06d298",
+                "d0d3740b.46215"
             ]
         ]
     },
     {
-        "id": "b3a20bdf.7738d8",
+        "id": "f6ac8945.06d298",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1996,
-        "y": 3205,
-        "z": "a911d5ff.5ac84",
+        "x": 2008,
+        "y": 3214,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "6075d4e4.60740c"
+                "84c92d78.7984b8"
             ]
         ]
     },
     {
-        "id": "c49019c0.e84e08",
+        "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": 2059,
-        "y": 3020,
-        "z": "a911d5ff.5ac84",
+        "x": 2071,
+        "y": 3029,
+        "z": "4fb14ce0.40eb24",
         "wires": []
     },
     {
-        "id": "ffef74e0.d4b7c",
+        "id": "62ae9cfb.3879bc",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1795,
-        "y": 2966,
-        "z": "a911d5ff.5ac84",
+        "x": 1807,
+        "y": 2975,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "e79aedfa.249",
-                "c49019c0.e84e08",
-                "733089d7.e1acb"
+                "fd805b4d.1b0548",
+                "b93d4ed1.4609d8",
+                "ea374103.b6422"
             ]
         ]
     },
     {
-        "id": "5a6ce6ad.7fc7a",
+        "id": "11cd0588.41272a",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 2701,
-        "y": 3155,
-        "z": "a911d5ff.5ac84",
+        "x": 2713,
+        "y": 3164,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "424b4783.7d233"
+                "5ba25870.61d0e"
             ]
         ]
     },
     {
-        "id": "cc1f97b8.8c6ce8",
+        "id": "302e8991.9483b6",
         "type": "set",
         "name": "set",
         "xml": "<set>\n<parameter name='testingvalue' value='$tmp.otninfo_length -1' />\n",
         "comments": "",
-        "x": 1768,
-        "y": 3155,
-        "z": "a911d5ff.5ac84",
+        "x": 1780,
+        "y": 3164,
+        "z": "4fb14ce0.40eb24",
         "wires": []
     },
     {
-        "id": "a4296e1e.d8981",
+        "id": "db504ec2.be40a8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1603,
-        "y": 3130,
-        "z": "a911d5ff.5ac84",
+        "x": 1615,
+        "y": 3139,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "cc1f97b8.8c6ce8",
-                "1a4f2a93.c11d2d"
+                "302e8991.9483b6",
+                "d2ac9909.c7d83"
             ]
         ]
     },
     {
-        "id": "c2e19c98.abbc4",
+        "id": "715b7a53.d039d4",
         "type": "switchNode",
         "name": "switch dmnsidx == 0 (domainA)",
         "xml": "<switch test='`$otnidx == 0`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1522,
-        "y": 1179,
-        "z": "a911d5ff.5ac84",
+        "x": 1534,
+        "y": 1188,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "11383ee6.e1d7d9",
-                "6fa9ae0c.501d18"
+                "f53c2621.eb9438",
+                "1c719c21.ec9b04"
             ]
         ]
     },
     {
-        "id": "11383ee6.e1d7d9",
+        "id": "f53c2621.eb9438",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1723,
-        "y": 1177,
-        "z": "a911d5ff.5ac84",
+        "x": 1735,
+        "y": 1186,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "b4854ac4.e47338"
+                "39a7b2e1.a50fbe"
             ]
         ]
     },
     {
-        "id": "e2b0b006.cad94",
+        "id": "b0d2a923.51103",
         "type": "set",
         "name": "set pce-src-node",
         "xml": "<set>\n<parameter name='tmp.pce-src-node' value='`$tmp.srcdstpnf-name`' />",
         "comments": "",
-        "x": 2004,
-        "y": 1127,
-        "z": "a911d5ff.5ac84",
+        "x": 2016,
+        "y": 1136,
+        "z": "4fb14ce0.40eb24",
         "wires": []
     },
     {
-        "id": "5b58456d.2aa8c4",
+        "id": "c9652673.c83de8",
         "type": "switchNode",
         "name": "switch dmnsidx == last (domainB)",
         "xml": "<switch test='`$otnidx == $tmp.otninfo_length - 1`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1940,
-        "y": 1228,
-        "z": "a911d5ff.5ac84",
+        "x": 1952,
+        "y": 1237,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "7d1f463f.75db48",
-                "1703470e.535939"
+                "ab876b76.0d0a8",
+                "2a964a93.a3cb96"
             ]
         ]
     },
     {
-        "id": "7d1f463f.75db48",
+        "id": "ab876b76.0d0a8",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2170,
-        "y": 1224,
-        "z": "a911d5ff.5ac84",
+        "x": 2182,
+        "y": 1233,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "1c45c1ae.cc5246"
+                "62dd94dd.71b75c"
             ]
         ]
     },
     {
-        "id": "6fa9ae0c.501d18",
+        "id": "1c719c21.ec9b04",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1723,
-        "y": 1226,
-        "z": "a911d5ff.5ac84",
+        "x": 1735,
+        "y": 1235,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "5b58456d.2aa8c4"
+                "c9652673.c83de8"
             ]
         ]
     },
     {
-        "id": "1703470e.535939",
+        "id": "2a964a93.a3cb96",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2171,
-        "y": 1270,
-        "z": "a911d5ff.5ac84",
+        "x": 2183,
+        "y": 1279,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "9a461e80.88ba58"
+                "1f38645a.fd2454"
             ]
         ]
     },
     {
-        "id": "9a461e80.88ba58",
+        "id": "1f38645a.fd2454",
         "type": "set",
         "name": "set attachment_param domain G",
         "xml": "<set>\n<parameter name='tmp.domainG-src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />\n<parameter name='tmp.domainG-dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />",
         "comments": "",
-        "x": 2385,
-        "y": 1270,
-        "z": "a911d5ff.5ac84",
+        "x": 2397,
+        "y": 1279,
+        "z": "4fb14ce0.40eb24",
         "wires": []
     },
     {
-        "id": "d9594ef.146e23",
+        "id": "ada84f30.11bba8",
         "type": "set",
         "name": "set attachment_param domain A",
         "xml": "<set>\n<parameter name='tmp.domainG-src-access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='tmp.domainG-dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />",
         "comments": "",
-        "x": 2059,
-        "y": 1174,
-        "z": "a911d5ff.5ac84",
+        "x": 2071,
+        "y": 1183,
+        "z": "4fb14ce0.40eb24",
         "wires": []
     },
     {
-        "id": "b4854ac4.e47338",
+        "id": "39a7b2e1.a50fbe",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1847,
-        "y": 1168,
-        "z": "a911d5ff.5ac84",
+        "x": 1859,
+        "y": 1177,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "d9594ef.146e23"
+                "ada84f30.11bba8"
             ]
         ]
     },
     {
-        "id": "1c45c1ae.cc5246",
+        "id": "62dd94dd.71b75c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2303,
-        "y": 1200,
-        "z": "a911d5ff.5ac84",
+        "x": 2315,
+        "y": 1209,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "c5fb0dfd.a15ba"
+                "c86a8489.80e7c"
             ]
         ]
     },
     {
-        "id": "ca07a786.2d259",
+        "id": "dce0c80a.efad",
         "type": "set",
         "name": "set pce-src-node",
         "xml": "<set>\n<parameter name='tmp.pce-dst-node' value='`$tmp.srcdstpnf-name`' />",
         "comments": "",
-        "x": 2459,
-        "y": 1216,
-        "z": "a911d5ff.5ac84",
+        "x": 2471,
+        "y": 1225,
+        "z": "4fb14ce0.40eb24",
         "wires": []
     },
     {
-        "id": "c5fb0dfd.a15ba",
+        "id": "c86a8489.80e7c",
         "type": "set",
         "name": "set attachment_param domain B",
         "xml": "<set>\n<parameter name='tmp.domainG-src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />\n<parameter name='tmp.domainG-dst-access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />",
         "comments": "",
-        "x": 2507,
-        "y": 1168,
-        "z": "a911d5ff.5ac84",
+        "x": 2519,
+        "y": 1177,
+        "z": "4fb14ce0.40eb24",
         "wires": []
     },
     {
-        "id": "b291bad0.bdbf18",
+        "id": "d0d3740b.46215",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2024,
-        "y": 3471,
-        "z": "a911d5ff.5ac84",
+        "x": 2036,
+        "y": 3480,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "62a1848.f7c8bfc"
+                "822b4a87.c6d91"
             ]
         ]
     },
     {
-        "id": "ec243f0e.e78df8",
+        "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": 2499,
-        "y": 3456,
-        "z": "a911d5ff.5ac84",
+        "x": 2511,
+        "y": 3465,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             []
         ]
     },
     {
-        "id": "b5d0d456.d5e17",
+        "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": 2437,
-        "y": 3506,
-        "z": "a911d5ff.5ac84",
+        "x": 2449,
+        "y": 3515,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             []
         ]
     },
     {
-        "id": "1472c185.25ef66",
+        "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": 2574,
-        "y": 3605,
-        "z": "a911d5ff.5ac84",
+        "x": 2586,
+        "y": 3614,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             []
         ]
     },
     {
-        "id": "937a1753.6c2cd",
+        "id": "ba000585.cff088",
         "type": "comment",
         "name": "connectivity has not been created for middle domains, so we have to create one",
         "info": "",
         "comments": "",
-        "x": 2577,
-        "y": 3397,
-        "z": "a911d5ff.5ac84",
+        "x": 2589,
+        "y": 3406,
+        "z": "4fb14ce0.40eb24",
         "wires": []
     },
     {
-        "id": "3fb48dac.724cba",
+        "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": 2542,
-        "y": 3664,
-        "z": "a911d5ff.5ac84",
+        "x": 2554,
+        "y": 3673,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             []
         ]
     },
     {
-        "id": "62a1848.f7c8bfc",
+        "id": "822b4a87.c6d91",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 2181,
-        "y": 3472,
-        "z": "a911d5ff.5ac84",
+        "x": 2193,
+        "y": 3481,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "ec243f0e.e78df8",
-                "b5d0d456.d5e17",
-                "1472c185.25ef66",
-                "3fb48dac.724cba",
-                "d9f949c2.b1be88",
-                "d2c94e3.4db213"
+                "df45bcf4.ab6068",
+                "92ea7ec.b1b38",
+                "ab274de2.98aaf8",
+                "fe394c67.6a4738",
+                "b6a44371.9af948",
+                "c51d1d37.88a2f8"
             ]
         ]
     },
     {
-        "id": "d9f949c2.b1be88",
+        "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": 2456,
-        "y": 3724,
-        "z": "a911d5ff.5ac84",
+        "x": 2468,
+        "y": 3733,
+        "z": "4fb14ce0.40eb24",
         "wires": []
     },
     {
-        "id": "ef8123f7.a43b88",
+        "id": "6f21b0a4.c1ba8",
         "type": "set",
         "name": "unset parameters",
         "xml": "<set>\n<parameter name='domain-A.tunnel-tp-id' value='' />\n<parameter name='domain-A.node-id' value='' />\n<parameter name='domain-A.network-id' value=\"\" />\n<parameter name='domain-A.provider-id' value=\"\" />\n<parameter name='domain-A.client-id' value=\"\" />\n<parameter name='domain-A.te-topo-id' value=\"\" />\n<parameter name='domain-A.network-type' value=\"\" />\n<parameter name='domain-A.ltpId' value=\"\" />\n<parameter name='tmp.domain-A.network-id' value=\"\" />\n<parameter name='tmp.domain-A.ttp-id' value=\"\" />\n<parameter name='network-route-A' value=\"\" />\n<!--<parameter name='domain-A.' value=\"\" />-->\n\n<parameter name='request-id' value='' />\n<parameter name='otn-source-node' value='' />\n<parameter name='otn-dest-node' value='' />\n<parameter name='bw-odu' value=\"\" />\n<parameter name='src-ttp-id' value='' />\n<parameter name='dst-ttp-id' value='' />\n\n<parameter name='domain-B.tunnel-tp-id' value='' />\n<parameter name='domain-B.node-id' value='' />\n<parameter name='domain-B.network-id' value=\"\" />\n<parameter name='domain-B.provider-id' value=\"\" />\n<parameter name='domain-B.client-id' value=\"\" />\n<parameter name='domain-B.te-topo-id' value=\"\" />\n<parameter name='domain-B.network-type' value=\"\" />\n<parameter name='domain-B.ltpId' value=\"\" />\n<parameter name='tmp.domain-B.network-id' value=\"\" />\n<parameter name='tmp.domain-B.ttp-id' value=\"\" />\n<parameter name='network-route-B' value=\"\" />\n<!--<parameter name='domain-B.' value=\"\" />-->\n\n\n\n\n\n",
         "comments": "",
-        "x": 392,
-        "y": 2894,
-        "z": "a911d5ff.5ac84",
+        "x": 404,
+        "y": 2903,
+        "z": "4fb14ce0.40eb24",
         "wires": []
     },
     {
-        "id": "36cc6c32.a7a5bc",
+        "id": "5f4f339e.018654",
         "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": 433,
-        "y": 906,
-        "z": "a911d5ff.5ac84",
+        "x": 445,
+        "y": 915,
+        "z": "4fb14ce0.40eb24",
         "wires": []
     },
     {
-        "id": "424b4783.7d233",
+        "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": 3025,
-        "y": 3155,
-        "z": "a911d5ff.5ac84",
+        "x": 3037,
+        "y": 3164,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             []
         ]
     },
     {
-        "id": "733089d7.e1acb",
+        "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": 2139,
-        "y": 2911,
-        "z": "a911d5ff.5ac84",
+        "x": 2151,
+        "y": 2920,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             []
         ]
     },
     {
-        "id": "d2c94e3.4db213",
+        "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": 2538,
-        "y": 3551,
-        "z": "a911d5ff.5ac84",
+        "x": 2550,
+        "y": 3560,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             []
         ]
     },
     {
-        "id": "a7261999.9881d8",
+        "id": "6512efb1.123b28",
         "type": "switchNode",
         "name": "switch found-middle-man?",
         "xml": "<switch test='`$found-middle-man`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2357,
-        "y": 3155,
-        "z": "a911d5ff.5ac84",
+        "x": 2369,
+        "y": 3164,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "2bb32459.fcac64"
+                "4373daa0.a1c174"
             ]
         ]
     },
     {
-        "id": "2bb32459.fcac64",
+        "id": "4373daa0.a1c174",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2544,
-        "y": 3155,
-        "z": "a911d5ff.5ac84",
+        "x": 2556,
+        "y": 3164,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "5a6ce6ad.7fc7a"
+                "11cd0588.41272a"
             ]
         ]
     },
     {
-        "id": "6075d4e4.60740c",
+        "id": "84c92d78.7984b8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 2139,
-        "y": 3205,
-        "z": "a911d5ff.5ac84",
+        "x": 2151,
+        "y": 3214,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "7c7e82f.b5a9efc",
-                "383da81a.536a28",
-                "a7261999.9881d8"
+                "ef7c2251.5fe8a8",
+                "b19fce04.44ae8",
+                "6512efb1.123b28"
             ]
         ]
     },
     {
-        "id": "7c7e82f.b5a9efc",
+        "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": 2455,
-        "y": 3253,
-        "z": "a911d5ff.5ac84",
+        "x": 2467,
+        "y": 3262,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             []
         ]
     },
     {
-        "id": "383da81a.536a28",
+        "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": 2382,
-        "y": 3313,
-        "z": "a911d5ff.5ac84",
+        "x": 2394,
+        "y": 3322,
+        "z": "4fb14ce0.40eb24",
         "wires": []
     },
     {
-        "id": "cddff981.827d58",
+        "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": 443,
-        "y": 3913,
-        "z": "a911d5ff.5ac84",
+        "x": 455,
+        "y": 3922,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "2d49e0b.d9e87a",
-                "73d650d6.cd1c1",
-                "77ce79ba.222c68"
+                "24e9e35d.66377c",
+                "ba022563.b1ca78",
+                "e3577813.56f32"
             ]
         ]
     },
     {
-        "id": "2d49e0b.d9e87a",
+        "id": "24e9e35d.66377c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 631,
-        "y": 3926,
-        "z": "a911d5ff.5ac84",
+        "x": 643,
+        "y": 3935,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "886559d2.9d2008"
+                "b86628e9.5b571"
             ]
         ]
     },
     {
-        "id": "73d650d6.cd1c1",
+        "id": "ba022563.b1ca78",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 631.490966796875,
-        "y": 3971.5740356445312,
-        "z": "a911d5ff.5ac84",
+        "x": 643.490966796875,
+        "y": 3980.5740356445312,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "22427bb5.1c0494"
+                "dd8f81c4.9e7f98"
             ]
         ]
     },
     {
-        "id": "77ce79ba.222c68",
+        "id": "e3577813.56f32",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 629,
-        "y": 4015,
-        "z": "a911d5ff.5ac84",
+        "x": 641,
+        "y": 4024,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "8183af0e.979c3"
+                "7aca1801.7911a"
             ]
         ]
     },
     {
-        "id": "886559d2.9d2008",
+        "id": "b86628e9.5b571",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 804,
-        "y": 3924,
-        "z": "a911d5ff.5ac84",
+        "x": 816,
+        "y": 3933,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "5d380762.82e9"
+                "247b0f83.24d55"
             ]
         ]
     },
     {
-        "id": "22427bb5.1c0494",
+        "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": 794.0623779296875,
-        "y": 3971.8597717285156,
-        "z": "a911d5ff.5ac84",
+        "x": 806.0623779296875,
+        "y": 3980.8597717285156,
+        "z": "4fb14ce0.40eb24",
         "wires": []
     },
     {
-        "id": "8183af0e.979c3",
+        "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": 796,
-        "y": 4014,
-        "z": "a911d5ff.5ac84",
+        "x": 808,
+        "y": 4023,
+        "z": "4fb14ce0.40eb24",
         "wires": []
     },
     {
-        "id": "7aad5876.b17588",
+        "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": 432,
-        "y": 4104,
-        "z": "a911d5ff.5ac84",
+        "x": 444,
+        "y": 4113,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "d9d281f0.871208"
+                "5abd279e.a9bea8"
             ]
         ]
     },
     {
-        "id": "7032c836.ea98e",
+        "id": "42fde1a9.9a4a98",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1242,
-        "y": 4104,
-        "z": "a911d5ff.5ac84",
+        "x": 1254,
+        "y": 4113,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "bcf06c77.b9d56"
+                "bf9e1c4b.a2ce9"
             ]
         ]
     },
     {
-        "id": "d6fa6f89.c5ed98",
+        "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": 1014,
-        "y": 4104,
-        "z": "a911d5ff.5ac84",
+        "x": 1026,
+        "y": 4113,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "7032c836.ea98e"
+                "42fde1a9.9a4a98"
             ]
         ]
     },
     {
-        "id": "5d380762.82e9",
+        "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": 1033,
-        "y": 3925,
-        "z": "a911d5ff.5ac84",
+        "x": 1045,
+        "y": 3934,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "4b806fec.cf791"
+                "a4896672.ff36c8"
             ]
         ]
     },
     {
-        "id": "4b806fec.cf791",
+        "id": "a4896672.ff36c8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1248,
-        "y": 3926,
-        "z": "a911d5ff.5ac84",
+        "x": 1260,
+        "y": 3935,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "5269aed8.1067"
+                "f571db46.1bfcb"
             ]
         ]
     },
     {
-        "id": "bcf06c77.b9d56",
+        "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": 1495,
-        "y": 4102,
-        "z": "a911d5ff.5ac84",
+        "x": 1507,
+        "y": 4111,
+        "z": "4fb14ce0.40eb24",
         "wires": []
     },
     {
-        "id": "678bb9be.2e7528",
+        "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": 1080,
-        "y": 4210,
-        "z": "a911d5ff.5ac84",
+        "x": 1092,
+        "y": 4219,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "273fc863.468be8",
-                "6eaa45ca.9bba14"
+                "e89a613f.801198",
+                "c394a514.3653"
             ]
         ]
     },
     {
-        "id": "6eaa45ca.9bba14",
+        "id": "c394a514.3653",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1363,
-        "y": 4190,
-        "z": "a911d5ff.5ac84",
+        "x": 1375,
+        "y": 4199,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "562a3e0b.c715a8"
+                "ba5b687c.dd6a6"
             ]
         ]
     },
     {
-        "id": "273fc863.468be8",
+        "id": "e89a613f.801198",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1364.0002136230469,
-        "y": 4240.99990940094,
-        "z": "a911d5ff.5ac84",
+        "x": 1376.0002136230469,
+        "y": 4249.99990940094,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "3cb4038b.3f740c"
+                "b0106af6.430b1"
             ]
         ]
     },
     {
-        "id": "562a3e0b.c715a8",
+        "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": 1503.0002479553223,
-        "y": 4190.000000953674,
-        "z": "a911d5ff.5ac84",
+        "x": 1515.0002479553223,
+        "y": 4199.000000953674,
+        "z": "4fb14ce0.40eb24",
         "wires": []
     },
     {
-        "id": "3cb4038b.3f740c",
+        "id": "b0106af6.430b1",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1509.0272598266602,
-        "y": 4238.745394706726,
-        "z": "a911d5ff.5ac84",
+        "x": 1521.0272598266602,
+        "y": 4247.745394706726,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             []
         ]
     },
     {
-        "id": "d9d281f0.871208",
+        "id": "5abd279e.a9bea8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 664,
-        "y": 4102,
-        "z": "a911d5ff.5ac84",
+        "x": 676,
+        "y": 4111,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "d6fa6f89.c5ed98",
-                "678bb9be.2e7528"
+                "3cd4b283.9423f6",
+                "5df62aff.b0027c"
             ]
         ]
     },
     {
-        "id": "5269aed8.1067",
+        "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": 1492,
-        "y": 3925,
-        "z": "a911d5ff.5ac84",
+        "x": 1504,
+        "y": 3934,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "ff386dcd.32782",
-                "224e1e2e.4d20a2"
+                "10584e74.11a9e2",
+                "3270eb36.2e6c2c"
             ]
         ]
     },
     {
-        "id": "502add97.5e708c",
+        "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": 2134,
-        "y": 3871,
-        "z": "a911d5ff.5ac84",
+        "x": 2146,
+        "y": 3880,
+        "z": "4fb14ce0.40eb24",
         "wires": []
     },
     {
-        "id": "521605a6.12e2d4",
+        "id": "7855d996.5f07",
         "type": "switchNode",
         "name": "switch $tmp.arr_length != 0",
         "xml": "<switch test='`$tmp.arr_length != 0`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2167,
-        "y": 3926,
-        "z": "a911d5ff.5ac84",
+        "x": 2179,
+        "y": 3935,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "b6840948.dcaf28",
-                "16f9a591.80cc1a"
+                "be28c030.0047c",
+                "f9d12f18.1e0e1"
             ]
         ]
     },
     {
-        "id": "b6840948.dcaf28",
+        "id": "be28c030.0047c",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2363,
-        "y": 3896,
-        "z": "a911d5ff.5ac84",
+        "x": 2375,
+        "y": 3905,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "d20ee31a.4da818"
+                "cca5c1e0.c9e418"
             ]
         ]
     },
     {
-        "id": "16f9a591.80cc1a",
+        "id": "f9d12f18.1e0e1",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2364,
-        "y": 3967,
-        "z": "a911d5ff.5ac84",
+        "x": 2376,
+        "y": 3976,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "932a25a5.21db58"
+                "1c2a1c2d.eddd2c"
             ]
         ]
     },
     {
-        "id": "ff386dcd.32782",
+        "id": "10584e74.11a9e2",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1709,
-        "y": 3904,
-        "z": "a911d5ff.5ac84",
+        "x": 1721,
+        "y": 3913,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "fa5ee789.0417f8"
+                "66fe7551.116524"
             ]
         ]
     },
     {
-        "id": "224e1e2e.4d20a2",
+        "id": "3270eb36.2e6c2c",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1709,
-        "y": 3953,
-        "z": "a911d5ff.5ac84",
+        "x": 1721,
+        "y": 3962,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             []
         ]
     },
     {
-        "id": "fa5ee789.0417f8",
+        "id": "66fe7551.116524",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 1877,
-        "y": 3904,
-        "z": "a911d5ff.5ac84",
+        "x": 1889,
+        "y": 3913,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "502add97.5e708c",
-                "521605a6.12e2d4"
+                "cbeb21d2.528fb",
+                "7855d996.5f07"
             ]
         ]
     },
     {
-        "id": "d20ee31a.4da818",
+        "id": "cca5c1e0.c9e418",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 2514,
-        "y": 3894,
-        "z": "a911d5ff.5ac84",
+        "x": 2526,
+        "y": 3903,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "4f6df904.ee87c",
-                "66254394.195084"
+                "6021fe00.cf5b38",
+                "3ee35cda.cacc94"
             ]
         ]
     },
     {
-        "id": "932a25a5.21db58",
+        "id": "1c2a1c2d.eddd2c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 2516,
-        "y": 3967,
-        "z": "a911d5ff.5ac84",
+        "x": 2528,
+        "y": 3976,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "de1fa04c.85c2d",
-                "2aeb6e74.e24be2"
+                "b88403d3.b550c",
+                "df79ce65.0d4e"
             ]
         ]
     },
     {
-        "id": "4f6df904.ee87c",
+        "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": 2701,
-        "y": 3846,
-        "z": "a911d5ff.5ac84",
+        "x": 2713,
+        "y": 3855,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "e9ecc81b.49bbd"
+                "70402202.48ed14"
             ]
         ]
     },
     {
-        "id": "e9ecc81b.49bbd",
+        "id": "70402202.48ed14",
         "type": "switchNode",
         "name": "switch tmp.arr[$arridx] == $providerValue",
         "xml": "<switch test='`$tmp.arr[$arridx] == $providerValue`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2992,
-        "y": 3846,
-        "z": "a911d5ff.5ac84",
+        "x": 3004,
+        "y": 3855,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "42d5ed25.b49c94",
-                "c705b865.d0eb4"
+                "f629fdf.6a8538",
+                "a317d92b.3b0b18"
             ]
         ]
     },
     {
-        "id": "42d5ed25.b49c94",
+        "id": "f629fdf.6a8538",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3267,
-        "y": 3815,
-        "z": "a911d5ff.5ac84",
+        "x": 3279,
+        "y": 3824,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "5660632c.265cdc"
+                "a51325a8.b7388"
             ]
         ]
     },
     {
-        "id": "c705b865.d0eb4",
+        "id": "a317d92b.3b0b18",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3268,
-        "y": 3886,
-        "z": "a911d5ff.5ac84",
+        "x": 3280,
+        "y": 3895,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "a7a2aba3.cd08b8"
+                "9d65717e.a373d"
             ]
         ]
     },
     {
-        "id": "5660632c.265cdc",
+        "id": "a51325a8.b7388",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 3418,
-        "y": 3813,
-        "z": "a911d5ff.5ac84",
+        "x": 3430,
+        "y": 3822,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "99e18478.d4208",
-                "c48a358e.19c528",
-                "23bf4d27.c1b37a",
-                "85bd9e57.66c34",
-                "747fe7dc.036f4"
+                "3791e48.3b8af9c",
+                "a673fd66.c40df",
+                "86199d64.75edc8",
+                "51a35674.c610f8",
+                "445052f3.f38194"
             ]
         ]
     },
     {
-        "id": "de1fa04c.85c2d",
+        "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": 2771,
-        "y": 3960,
-        "z": "a911d5ff.5ac84",
+        "x": 2783,
+        "y": 3969,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             []
         ]
     },
     {
-        "id": "2aeb6e74.e24be2",
+        "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": 2699,
-        "y": 4007,
-        "z": "a911d5ff.5ac84",
+        "x": 2711,
+        "y": 4016,
+        "z": "4fb14ce0.40eb24",
         "wires": []
     },
     {
-        "id": "66254394.195084",
+        "id": "3ee35cda.cacc94",
         "type": "switchNode",
         "name": "switch found?",
         "xml": "<switch test='`$found`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2692,
-        "y": 3891,
-        "z": "a911d5ff.5ac84",
+        "x": 2704,
+        "y": 3900,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "6f0ec490.03677c",
-                "bc11802a.75d5c8"
+                "b2a6fca5.77cd68",
+                "c6caa4c6.b68ae"
             ]
         ]
     },
     {
-        "id": "6f0ec490.03677c",
+        "id": "b2a6fca5.77cd68",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2852,
-        "y": 3883,
-        "z": "a911d5ff.5ac84",
+        "x": 2864,
+        "y": 3892,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "843f963d.3c00d"
+                "697e3e96.9c5648"
             ]
         ]
     },
     {
-        "id": "bc11802a.75d5c8",
+        "id": "c6caa4c6.b68ae",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2850,
-        "y": 3920,
-        "z": "a911d5ff.5ac84",
+        "x": 2862,
+        "y": 3929,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "f82ccccf.a16c6"
+                "c8a03883.695728"
             ]
         ]
     },
     {
-        "id": "843f963d.3c00d",
+        "id": "697e3e96.9c5648",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2977,
-        "y": 3883,
-        "z": "a911d5ff.5ac84",
+        "x": 2989,
+        "y": 3892,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             []
         ]
     },
     {
-        "id": "dc11c549.4cf3f",
+        "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": 3284,
-        "y": 3941,
-        "z": "a911d5ff.5ac84",
+        "x": 3296,
+        "y": 3950,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             []
         ]
     },
     {
-        "id": "f82ccccf.a16c6",
+        "id": "c8a03883.695728",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 3010,
-        "y": 3928,
-        "z": "a911d5ff.5ac84",
+        "x": 3022,
+        "y": 3937,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "dc11c549.4cf3f",
-                "3879ac46.8861b4"
+                "7ed231c3.f2fd1",
+                "2d908152.4ff6a6"
             ]
         ]
     },
     {
-        "id": "3879ac46.8861b4",
+        "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": 3201,
-        "y": 3987,
-        "z": "a911d5ff.5ac84",
+        "x": 3213,
+        "y": 3996,
+        "z": "4fb14ce0.40eb24",
         "wires": []
     },
     {
-        "id": "a7a2aba3.cd08b8",
+        "id": "9d65717e.a373d",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3401,
-        "y": 3885,
-        "z": "a911d5ff.5ac84",
+        "x": 3413,
+        "y": 3894,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             []
         ]
     },
     {
-        "id": "99e18478.d4208",
+        "id": "3791e48.3b8af9c",
         "type": "set",
         "name": "set found to true",
         "xml": "<set>\n<parameter name='found' value='true' />\n\n\n",
         "comments": "",
-        "x": 3606,
-        "y": 3773,
-        "z": "a911d5ff.5ac84",
+        "x": 3618,
+        "y": 3782,
+        "z": "4fb14ce0.40eb24",
         "wires": []
     },
     {
-        "id": "c48a358e.19c528",
+        "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": 3678,
-        "y": 3818,
-        "z": "a911d5ff.5ac84",
+        "x": 3690,
+        "y": 3827,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             []
         ]
     },
     {
-        "id": "747fe7dc.036f4",
+        "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": 3593,
-        "y": 3945,
-        "z": "a911d5ff.5ac84",
+        "x": 3605,
+        "y": 3954,
+        "z": "4fb14ce0.40eb24",
         "wires": []
     },
     {
-        "id": "85bd9e57.66c34",
+        "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": 3614,
-        "y": 3881,
-        "z": "a911d5ff.5ac84",
+        "x": 3626,
+        "y": 3890,
+        "z": "4fb14ce0.40eb24",
         "wires": []
     },
     {
-        "id": "23bf4d27.c1b37a",
+        "id": "86199d64.75edc8",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 3572,
-        "y": 4012,
-        "z": "a911d5ff.5ac84",
+        "x": 3584,
+        "y": 4021,
+        "z": "4fb14ce0.40eb24",
         "wires": []
     },
     {
-        "id": "c99e01d1.0f1de8",
+        "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": 2352,
-        "y": 3202,
-        "z": "a911d5ff.5ac84",
+        "x": 2364,
+        "y": 3211,
+        "z": "4fb14ce0.40eb24",
         "wires": []
     },
     {
-        "id": "11040b46.8e035d",
+        "id": "13d7f319.f10ffd",
         "type": "set",
         "name": "set srcTtp+dstTtp pair",
         "xml": "<set>\n<parameter name='tmp.srcTtpdstTtpPair' value=\"`$tmp.otninfo[$otnidx].srcPort.src-tunnel-tp-id + ',' +\n                                               $tmp.otninfo[$otnidx].dstPort.dst-tunnel-tp-id`\" />\n\n\n",
         "comments": "",
-        "x": 1498,
-        "y": 1259,
-        "z": "a911d5ff.5ac84",
+        "x": 1510,
+        "y": 1268,
+        "z": "4fb14ce0.40eb24",
         "wires": []
     },
     {
-        "id": "3e17d72f.d352d",
+        "id": "9673bbc9.e232d8",
         "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": 1691,
-        "y": 1356,
-        "z": "a911d5ff.5ac84",
+        "x": 1703,
+        "y": 1365,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             []
         ]
     },
     {
-        "id": "130409d7.ba1cfe",
+        "id": "fe43d4e7.2e266",
         "type": "set",
         "name": "set current-provider-id and current-cvlan-id",
         "xml": "<set>\n<parameter name='tmp.current-provider-id' value='`$tmp.access-provider-id`' />\n<parameter name='tmp.current-cvlan-id' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n\n",
         "comments": "",
-        "x": 1562,
-        "y": 1310,
-        "z": "a911d5ff.5ac84",
+        "x": 1574,
+        "y": 1319,
+        "z": "4fb14ce0.40eb24",
         "wires": []
     },
     {
-        "id": "1ea79a81.da9f1d",
+        "id": "8c1ff0ec.d0238",
         "type": "switchNode",
         "name": "switch found-connectivity?",
         "xml": "\n<switch test=\"`$found-connectivity`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1371,
-        "y": 1511,
-        "z": "a911d5ff.5ac84",
+        "x": 1383,
+        "y": 1520,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "1956e28a.ad4365",
-                "404765c9.b1c294"
+                "43f2090.27bb178",
+                "78a0670.cf2d998"
             ]
         ]
     },
     {
-        "id": "1956e28a.ad4365",
+        "id": "43f2090.27bb178",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1657,
-        "y": 2330,
-        "z": "a911d5ff.5ac84",
+        "x": 1669,
+        "y": 2339,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "cd58f3fe.5b5bd"
+                "c80f5b2c.e8799"
             ]
         ]
     },
     {
-        "id": "e6504cf8.a4c5e",
+        "id": "340621d.c4a9c5e",
         "type": "comment",
         "name": "call string.contains to check if the cache has srcTtpdstTtpPair",
         "info": "if it had: then no new otn/vpn-binding is needed\n           ==> find the otn. ==>look into the relationships of this connectivity and find the one that has same srcTtp and dstTtp\n           ==> increase the bw\nif not, create a new vpn-binding, attach this vpn-binding into the founded connectivity, and attach it to the middle-man-conn as well.",
         "comments": "",
-        "x": 2083,
-        "y": 2275,
-        "z": "a911d5ff.5ac84",
+        "x": 2095,
+        "y": 2284,
+        "z": "4fb14ce0.40eb24",
         "wires": []
     },
     {
-        "id": "8c480e3.f82397",
+        "id": "b5382f7e.2bd898",
         "type": "comment",
         "name": "create a new connectivity",
         "info": "(this should not be for LEAF side or ROOT side, otherwise error)\n\ncreate a new vpn-binding (done here)\ncreate a new connectivity (done below)\nadd srcTtpdstTtpPair into the cache in this connectivity\nattach the vpn-binding into the connectivity relationship\nattach this connectivity into the middle man\nattach this connectivity into the service-instance",
         "comments": "",
-        "x": 1894,
-        "y": 1487,
-        "z": "a911d5ff.5ac84",
+        "x": 1906,
+        "y": 1496,
+        "z": "4fb14ce0.40eb24",
         "wires": []
     },
     {
-        "id": "b5847157.d9e138",
+        "id": "be6ceee2.825c9",
         "type": "save",
         "name": "save vpn-binding otnIdx resource (aka. OTN) in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid' >\n<parameter name='vpn-id' value='`$prop.vpn-binding-otnidx-uuid`' />\n<parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />\n<!--<parameter name='customer-vpn-id' value='`($idx + 1) * 10`' />-->\n<!--<parameter name='customer-vpn-id' value='`($maxtpn + $gfp)`' />-->\n<parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />\n<!--<parameter name='access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->\n<parameter name='access-provider-id' value='`$tmp.access-provider-id`' />\n<!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->\n<parameter name='access-client-id' value='`$tmp.access-client-id`' />\n<!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->\n<parameter name='access-topology-id' value='`$tmp.access-topology-id`' />\n<!--<parameter name='src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->\n<parameter name='src-access-node-id' value='`$tmp.domainG-src-access-node-id`' />\n<parameter name='src-access-ltp-id' value='`$tmp.otninfo[$otnidx].srcPort.src-tunnel-tp-id`' />\n<!--<parameter name='dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />-->\n<parameter name='dst-access-node-id' value='`$tmp.domainG-dst-access-node-id`' />\n<parameter name='dst-access-ltp-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-tunnel-tp-id`' />\n<parameter name='route-distinguisher' value='`$gfp`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n\n\n<parameter name='vpn-region' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.url`' />\n<parameter name='vpn-description' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.user`' />\n<parameter name='vpn-platform' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.password`' />\n\n<!-- The following line is in lieu of vpn-binding.slice-id (new attribute in latest AAI) -->\n<!--<parameter name='ops-note' value='`$tmp.aai.service-instance.service-instance-id`' />-->\n<parameter name='slice-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='ops-note' value='`$tmp.srcTtpOtnLayer`' />\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 1997,
-        "y": 1523,
-        "z": "a911d5ff.5ac84",
+        "x": 2009,
+        "y": 1532,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "dff931e6.5a9578"
+                "cf21392c.4841d8"
             ]
         ]
     },
     {
-        "id": "dff931e6.5a9578",
+        "id": "cf21392c.4841d8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2285,
-        "y": 1524,
-        "z": "a911d5ff.5ac84",
+        "x": 2297,
+        "y": 1533,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "bf3d635b.09f94"
+                "7f292268.acccbc"
             ]
         ]
     },
     {
-        "id": "bf3d635b.09f94",
+        "id": "7f292268.acccbc",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2468.5,
-        "y": 1522.25390625,
-        "z": "a911d5ff.5ac84",
+        "x": 2480.5,
+        "y": 1531.25390625,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             []
         ]
     },
     {
-        "id": "6cbdac8a.378604",
+        "id": "16c5a50f.2f8633",
         "type": "execute",
         "name": "execute string.contains srcTtpdstTtpPair",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='contains' >\n<parameter name=\"source\" value='`$tmp.the-connectivity.coupling-flag`'/>\n<parameter name=\"target\" value=\"`$tmp.srcTtpdstTtpPair`\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2071,
-        "y": 2327,
-        "z": "a911d5ff.5ac84",
+        "x": 2083,
+        "y": 2336,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "1b949e6d.080772",
-                "e453c4d5.ba435"
+                "452b77d1.b4f2a8",
+                "b1806606.25c148"
             ]
         ]
     },
     {
-        "id": "1b949e6d.080772",
+        "id": "452b77d1.b4f2a8",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2244,
-        "y": 2175,
-        "z": "a911d5ff.5ac84",
+        "x": 2256,
+        "y": 2184,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             []
         ]
     },
     {
-        "id": "e453c4d5.ba435",
+        "id": "b1806606.25c148",
         "type": "outcomeFalse",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2276,
-        "y": 2434,
-        "z": "a911d5ff.5ac84",
+        "x": 2288,
+        "y": 2443,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "80b2f89e.8a165"
+                "28b98f8a.d66ba8"
             ]
         ]
     },
     {
-        "id": "7dc11394.4d1084",
+        "id": "65dfad8a.1bcc14",
         "type": "save",
         "name": "save vpn-binding otnIdx resource (aka. OTN) in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid' >\n<parameter name='vpn-id' value='`$prop.vpn-binding-otnidx-uuid`' />\n<parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />\n<!--<parameter name='customer-vpn-id' value='`($idx + 1) * 10`' />-->\n<!--<parameter name='customer-vpn-id' value='`($maxtpn + $gfp)`' />-->\n<parameter name='customer-vpn-id' value='`$newToBeUsedMaxtpn`' />\n<!--<parameter name='access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->\n<parameter name='access-provider-id' value='`$tmp.access-provider-id`' />\n<!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->\n<parameter name='access-client-id' value='`$tmp.access-client-id`' />\n<!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->\n<parameter name='access-topology-id' value='`$tmp.access-topology-id`' />\n<!--<parameter name='src-access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->\n<parameter name='src-access-node-id' value='`$tmp.domainG-src-access-node-id`' />\n<parameter name='src-access-ltp-id' value='`$tmp.otninfo[$otnidx].srcPort.src-tunnel-tp-id`' />\n<!--<parameter name='dst-access-node-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-node-id`' />-->\n<parameter name='dst-access-node-id' value='`$tmp.domainG-dst-access-node-id`' />\n<parameter name='dst-access-ltp-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-tunnel-tp-id`' />\n<parameter name='route-distinguisher' value='`$gfp`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n\n\n<parameter name='vpn-region' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.url`' />\n<parameter name='vpn-description' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.user`' />\n<parameter name='vpn-platform' value='`$prop.sdncRestApi.thirdpartySdnc.domainG.password`' />\n\n<!-- The following line is in lieu of vpn-binding.slice-id (new attribute in latest AAI) -->\n<!--<parameter name='ops-note' value='`$tmp.aai.service-instance.service-instance-id`' />-->\n<parameter name='slice-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='ops-note' value='`$tmp.srcTtpOtnLayer`' />\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2683,
-        "y": 1965,
-        "z": "a911d5ff.5ac84",
+        "x": 2695,
+        "y": 1974,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "22dcb38b.c85a54"
+                "685af2d8.b662dc"
             ]
         ]
     },
     {
-        "id": "22dcb38b.c85a54",
+        "id": "685af2d8.b662dc",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2987,
-        "y": 1962,
-        "z": "a911d5ff.5ac84",
+        "x": 2999,
+        "y": 1971,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "708eeb6a.f5aefc"
+                "edef5d31.f27bb8"
             ]
         ]
     },
     {
-        "id": "708eeb6a.f5aefc",
+        "id": "edef5d31.f27bb8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3137.5,
-        "y": 1969.25390625,
-        "z": "a911d5ff.5ac84",
+        "x": 3149.5,
+        "y": 1978.25390625,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             []
         ]
     },
     {
-        "id": "74407b46.6458d4",
+        "id": "fca1e078.90281",
         "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": 1977,
-        "y": 1578,
-        "z": "a911d5ff.5ac84",
+        "x": 1989,
+        "y": 1587,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             []
         ]
     },
     {
-        "id": "3919fe25.6022b2",
+        "id": "84e90fcb.be7ce",
         "type": "save",
         "name": "save connectivity resource in AAI",
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-otnidx-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-otnidx-uuid`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<!--<parameter name='access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->\n<!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->\n<!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->\n<!--<parameter name='access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->\n<!--<parameter name='access-ltp-id' value='``' />-->\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n\n<parameter name='coupling-flag' value='`$srcTtpdstTtpPair`' />\n\n<!--<parameter name='bandwidth-profile-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='vpn-type' value='dummy' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<!--<parameter name='cbs' value='`$prop.sotn.cbs`' />-->\n<!--<parameter name='ebs' value='`$prop.sotn.ebs`' />-->\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-otnidx-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-otnidx-uuid`' />\n<!--<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />-->\n<parameter name='operational-status' value='Created' />\n<!--<parameter name='access-provider-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-provider-id`' />-->\n<!--<parameter name='access-client-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-client-id`' />-->\n<!--<parameter name='access-topology-id' value='`$tmp.otninfo[$otnidx].dstPort.dst-access-topology-id`' />-->\n<!--<parameter name='access-node-id' value='`$tmp.otninfo[$otnidx].srcPort.src-access-node-id`' />-->\n<!--<parameter name='access-ltp-id' value='``' />-->\n<parameter name='cvlan' value='`$tmp.aai.network-route-A.logical-interface-id`' />\n\n<parameter name='coupling-flag' value='`$srcTtpdstTtpPair`' />\n\n<!--<parameter name='bandwidth-profile-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='bandwidth-profile-name' value='`$gfp`' />\n<parameter name='vpn-type' value='dummy' />\n<parameter name='cir' value='`$gfp *1000000`' />\n<parameter name='eir' value='`$gfp *1000000`' />\n<!--<parameter name='cbs' value='`$prop.sotn.cbs`' />-->\n<!--<parameter name='ebs' value='`$prop.sotn.ebs`' />-->\n<!--<parameter name='color-aware' value='`$prop.sotn.colorAware`' />-->\n\n<!--<parameter name='etht-svc-name' value='`$prop.sotn.etht-svc-name`' />-->\n<parameter name='model-customization-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-customization-uuid`' />\n<parameter name='model-invariant-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-invariant-uuid`' />\n<parameter name='model-version-id' value='`$network-topology-operation-input.network-information.onap-model-information.model-uuid`' />\n<parameter name='connectivity-selflink' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $network-topology-operation-input.service-information.service-instance-id  + '/service-data/networks/network/'  + $prop.sotn.network-id  + '/network-data/'` \" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 1915,
-        "y": 1628,
-        "z": "a911d5ff.5ac84",
+        "x": 1927,
+        "y": 1637,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             []
         ]
     },
     {
-        "id": "7aa6415.034e74",
+        "id": "548a399a.3a9a1",
         "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": 2016,
-        "y": 1673,
-        "z": "a911d5ff.5ac84",
+        "x": 2028,
+        "y": 1682,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             []
         ]
     },
     {
-        "id": "e6bc04b6.f68c7",
+        "id": "ea27a84e.a57e98",
         "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": 2052,
-        "y": 1727,
-        "z": "a911d5ff.5ac84",
+        "x": 2064,
+        "y": 1736,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             []
         ]
     },
     {
-        "id": "b2ea866b.5e679",
+        "id": "688a1580.c26934",
         "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": 2020,
-        "y": 1786,
-        "z": "a911d5ff.5ac84",
+        "x": 2032,
+        "y": 1795,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             []
         ]
     },
     {
-        "id": "e878616a.51fa2",
+        "id": "ab8e2668.029e08",
         "type": "comment",
         "name": "find middle-man's eth-srv-name",
         "info": "",
         "comments": "",
-        "x": 1478,
-        "y": 1402,
-        "z": "a911d5ff.5ac84",
+        "x": 1490,
+        "y": 1411,
+        "z": "4fb14ce0.40eb24",
         "wires": []
     },
     {
-        "id": "f0ca8ca2.d5c31",
+        "id": "84f3d24d.36c17",
         "type": "set",
         "name": "set prop.ethernet-service-name",
         "xml": "<set>\n<parameter name='prop.ethernet-service-name' value='`$middle-man-conn.etht-svc-name`' />\n\n",
         "comments": "",
-        "x": 1500,
-        "y": 1446,
-        "z": "a911d5ff.5ac84",
+        "x": 1512,
+        "y": 1455,
+        "z": "4fb14ce0.40eb24",
         "wires": []
     },
     {
-        "id": "55a4c230.fd03fc",
+        "id": "ae53151f.a2887",
         "type": "save",
         "name": "save middle-man-conn relationship to tmp.the-connectivity, in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity:relationship-list' \n      key='connectivity.connectivity-id = $middle-man-conn.connectivity-id' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $tmp.the-connectivity.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.the-connectivity.connectivity-id`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 2707,
-        "y": 2182,
-        "z": "a911d5ff.5ac84",
+        "x": 2719,
+        "y": 2191,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             []
         ]
     },
     {
-        "id": "8a76ccc1.2cd108",
+        "id": "4e7cd680.120818",
         "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": 2738,
-        "y": 2221,
-        "z": "a911d5ff.5ac84",
+        "x": 2750,
+        "y": 2230,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             []
         ]
     },
     {
-        "id": "1837f35e.96c455",
+        "id": "ecdbcb6.a92d738",
         "type": "save",
         "name": "save tmp.the-connectivity relationship to vpn-binding-otnidx, in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-otnidx-uuid' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $tmp.the-connectivity.connectivity-id`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$tmp.the-connectivity.connectivity-id`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 2709,
-        "y": 2294,
-        "z": "a911d5ff.5ac84",
+        "x": 2721,
+        "y": 2303,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             []
         ]
     },
     {
-        "id": "f94cb118.7c3c88",
+        "id": "82dff351.eb0b18",
         "type": "comment",
         "name": "update the founded connectivity to have a new coupling-flag",
         "info": "",
         "comments": "",
-        "x": 2679,
-        "y": 2010,
-        "z": "a911d5ff.5ac84",
+        "x": 2691,
+        "y": 2019,
+        "z": "4fb14ce0.40eb24",
         "wires": []
     },
     {
-        "id": "12e95810.e72c78",
+        "id": "4af074ca.bd591c",
         "type": "set",
         "name": "set newFlag",
         "xml": "<set>\n<parameter name='tmp.newFlag' value=\"`$tmp.the-connectivity.coupling-flag + '-' +\n                                               $tmp.srcTtpdstTtpPair`\" />\n\n\n",
         "comments": "",
-        "x": 2565,
-        "y": 2049,
-        "z": "a911d5ff.5ac84",
+        "x": 2577,
+        "y": 2058,
+        "z": "4fb14ce0.40eb24",
         "wires": []
     },
     {
-        "id": "33021018.a90398",
+        "id": "5e632476.eb799c",
         "type": "save",
         "name": "update connectivity resource in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.the-connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.the-connectivity.connectivity-id`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Modified' />\n<parameter name='coupling-flag' value='`$tmp.newFlag`' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 2629,
-        "y": 2094,
-        "z": "a911d5ff.5ac84",
+        "x": 2641,
+        "y": 2103,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             []
         ]
     },
     {
-        "id": "75b8be3d.85a8b8",
+        "id": "6b3b57c6.7c8f5",
         "type": "comment",
         "name": "the following two relationships should have already been there; if not => error",
         "info": "",
         "comments": "",
-        "x": 2721,
-        "y": 2144,
-        "z": "a911d5ff.5ac84",
+        "x": 2733,
+        "y": 2153,
+        "z": "4fb14ce0.40eb24",
         "wires": []
     },
     {
-        "id": "158258b6.b1e20f",
+        "id": "453ea410.800c04",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1707,
-        "y": 1511,
-        "z": "a911d5ff.5ac84",
+        "x": 1719,
+        "y": 1520,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "b5847157.d9e138",
-                "74407b46.6458d4",
-                "3919fe25.6022b2",
-                "7aa6415.034e74",
-                "e6bc04b6.f68c7",
-                "b2ea866b.5e679"
+                "be6ceee2.825c9",
+                "fca1e078.90281",
+                "84e90fcb.be7ce",
+                "548a399a.3a9a1",
+                "ea27a84e.a57e98",
+                "688a1580.c26934"
             ]
         ]
     },
     {
-        "id": "404765c9.b1c294",
+        "id": "78a0670.cf2d998",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1569,
-        "y": 1507,
-        "z": "a911d5ff.5ac84",
+        "x": 1581,
+        "y": 1516,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "158258b6.b1e20f"
+                "453ea410.800c04"
             ]
         ]
     },
     {
-        "id": "cd58f3fe.5b5bd",
+        "id": "c80f5b2c.e8799",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic='true'>",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 2367,
-        "y": 1974,
-        "z": "a911d5ff.5ac84",
+        "x": 2379,
+        "y": 1983,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "7dc11394.4d1084",
-                "12e95810.e72c78",
-                "33021018.a90398",
-                "1837f35e.96c455"
+                "65dfad8a.1bcc14",
+                "4af074ca.bd591c",
+                "5e632476.eb799c",
+                "ecdbcb6.a92d738"
             ]
         ]
     },
     {
-        "id": "af6449ff.709108",
+        "id": "f5aa86ab.3de758",
         "type": "comment",
         "name": "loop through the relationships of this founded connectivity, then",
         "info": "then find the vpn-binding that has same src ttp and dst ttp as this one",
         "comments": "",
-        "x": 2372,
-        "y": 2399,
-        "z": "a911d5ff.5ac84",
+        "x": 2384,
+        "y": 2408,
+        "z": "4fb14ce0.40eb24",
         "wires": []
     },
     {
-        "id": "e1d6f3c3.08e8e8",
+        "id": "8608bc09.df0608",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='tcridx' start='0' end='`$tmp.the-connectivity.relationship-list.relationship_length`' >\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2714,
-        "y": 2435,
-        "z": "a911d5ff.5ac84",
+        "x": 2726,
+        "y": 2444,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "32ed93c7.c50234"
+                "5d08ac03.36d834"
             ]
         ]
     },
     {
-        "id": "32ed93c7.c50234",
+        "id": "5d08ac03.36d834",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.the-connectivity.relationship-list.relationship[$tcridx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2926,
-        "y": 2433,
-        "z": "a911d5ff.5ac84",
+        "x": 2938,
+        "y": 2442,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "6fea52d2.2a0434"
+                "d7fbd393.802b28"
             ]
         ]
     },
     {
-        "id": "6fea52d2.2a0434",
+        "id": "d7fbd393.802b28",
         "type": "outcome",
         "name": "vpn-binding",
         "xml": "<outcome value='vpn-binding'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3110,
-        "y": 2431,
-        "z": "a911d5ff.5ac84",
+        "x": 3122,
+        "y": 2440,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "37563c96.a6fb74"
+                "7b17a25c.8a3ecc"
             ]
         ]
     },
     {
-        "id": "37563c96.a6fb74",
+        "id": "7b17a25c.8a3ecc",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3289,
-        "y": 2436,
-        "z": "a911d5ff.5ac84",
+        "x": 3301,
+        "y": 2445,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "91050f7b.03c5c",
-                "30dac6e0.2f0b42"
+                "404536aa.fd072",
+                "ebe21a38.772d1"
             ]
         ]
     },
     {
-        "id": "30dac6e0.2f0b42",
+        "id": "ebe21a38.772d1",
         "type": "set",
         "name": "unset tmp.aai.vpn-binding",
         "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value='' />\n",
         "comments": "",
-        "x": 3506,
-        "y": 2367,
-        "z": "a911d5ff.5ac84",
+        "x": 3518,
+        "y": 2376,
+        "z": "4fb14ce0.40eb24",
         "wires": []
     },
     {
-        "id": "91050f7b.03c5c",
+        "id": "404536aa.fd072",
         "type": "save",
         "name": "get vpn-binding from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-binding\"\n\t    key=\"vpn-binding.vpn-id = $tmp.the-connectivity.relationship-list.relationship[$tcridx].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.vpn-binding\" >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3499,
-        "y": 2453,
-        "z": "a911d5ff.5ac84",
+        "x": 3511,
+        "y": 2462,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "f42d3c95.007658",
-                "d20958c8.44b1d",
-                "dc1061ac.3194b8"
+                "82eb023b.8b6878",
+                "3917c696.d9cc82",
+                "ad895865.ea3bc8"
             ]
         ]
     },
     {
-        "id": "d20958c8.44b1d",
+        "id": "3917c696.d9cc82",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3712.490966796875,
-        "y": 2437.5740356445312,
-        "z": "a911d5ff.5ac84",
+        "x": 3724.490966796875,
+        "y": 2446.5740356445312,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "266b5e5.4c2c022"
+                "33dd47ac.b200d"
             ]
         ]
     },
     {
-        "id": "266b5e5.4c2c022",
+        "id": "33dd47ac.b200d",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 3875.0625,
-        "y": 2436.8597412109375,
-        "z": "a911d5ff.5ac84",
+        "x": 3887.0625,
+        "y": 2445.8597412109375,
+        "z": "4fb14ce0.40eb24",
         "wires": []
     },
     {
-        "id": "ce39d5ca.3eb7",
+        "id": "49f1ea3b.eabc34",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3876,
-        "y": 2482,
-        "z": "a911d5ff.5ac84",
+        "x": 3888,
+        "y": 2491,
+        "z": "4fb14ce0.40eb24",
         "wires": []
     },
     {
-        "id": "dc1061ac.3194b8",
+        "id": "ad895865.ea3bc8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3708,
-        "y": 2482,
-        "z": "a911d5ff.5ac84",
+        "x": 3720,
+        "y": 2491,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "ce39d5ca.3eb7"
+                "49f1ea3b.eabc34"
             ]
         ]
     },
     {
-        "id": "f42d3c95.007658",
+        "id": "82eb023b.8b6878",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3710,
-        "y": 2542,
-        "z": "a911d5ff.5ac84",
+        "x": 3722,
+        "y": 2551,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "2eba9c97.d9e8d4"
+                "cb43f8c5.5d2f9"
             ]
         ]
     },
     {
-        "id": "2eba9c97.d9e8d4",
+        "id": "cb43f8c5.5d2f9",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3879,
-        "y": 2541,
-        "z": "a911d5ff.5ac84",
+        "x": 3891,
+        "y": 2550,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "7126e3c.be80d9c"
+                "b8d3290b.70429"
             ]
         ]
     },
     {
-        "id": "80b2f89e.8a165",
+        "id": "28b98f8a.d66ba8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2503,
-        "y": 2433,
-        "z": "a911d5ff.5ac84",
+        "x": 2515,
+        "y": 2442,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "e1d6f3c3.08e8e8",
-                "13b057e7.5ede5",
-                "8583f674.cce2c"
+                "8608bc09.df0608",
+                "57ababe0.ec3414",
+                "52276af3.2f9a4c"
             ]
         ]
     },
     {
-        "id": "7126e3c.be80d9c",
+        "id": "b8d3290b.70429",
         "type": "switchNode",
         "name": "switch srcTtp",
         "xml": "<switch test='`$tmp.aai.vpn-binding.src-access-ltp-id == $tmp.otninfo[$otnidx].srcPort.src-tunnel-tp-id`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4078,
-        "y": 2542,
-        "z": "a911d5ff.5ac84",
+        "x": 4090,
+        "y": 2551,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "379157c3.0db038"
+                "4ce3e8eb.f24da8"
             ]
         ]
     },
     {
-        "id": "379157c3.0db038",
+        "id": "4ce3e8eb.f24da8",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4241,
-        "y": 2540,
-        "z": "a911d5ff.5ac84",
+        "x": 4253,
+        "y": 2549,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "45526f50.00e348"
+                "18f785cc.cf347a"
             ]
         ]
     },
     {
-        "id": "45526f50.00e348",
+        "id": "18f785cc.cf347a",
         "type": "switchNode",
         "name": "switch dstTtp",
         "xml": "<switch test='`$tmp.aai.vpn-binding.dst-access-ltp-id == $tmp.otninfo[$otnidx].dstPort.dst-tunnel-tp-id`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4422,
-        "y": 2540,
-        "z": "a911d5ff.5ac84",
+        "x": 4434,
+        "y": 2549,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "2e6d0f9b.a0852"
+                "988f1cd5.aa027"
             ]
         ]
     },
     {
-        "id": "2e6d0f9b.a0852",
+        "id": "988f1cd5.aa027",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4585,
-        "y": 2538,
-        "z": "a911d5ff.5ac84",
+        "x": 4597,
+        "y": 2547,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "6b6a34b7.0f115c"
+                "9caa890d.344aa8"
             ]
         ]
     },
     {
-        "id": "22e286e0.93668a",
+        "id": "dd1b26b2.35eef",
         "type": "set",
         "name": "set tmp.the-vpn-binding",
         "xml": "<set>\n<parameter name='tmp.the-vpn-binding.' value='`$tmp.aai.vpn-binding.`' />\n",
         "comments": "",
-        "x": 4942,
-        "y": 2545,
-        "z": "a911d5ff.5ac84",
+        "x": 4954,
+        "y": 2554,
+        "z": "4fb14ce0.40eb24",
         "wires": []
     },
     {
-        "id": "6b6a34b7.0f115c",
+        "id": "9caa890d.344aa8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4724,
-        "y": 2537,
-        "z": "a911d5ff.5ac84",
+        "x": 4736,
+        "y": 2546,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             [
-                "22e286e0.93668a",
-                "db1e7b85.850cb8"
+                "dd1b26b2.35eef",
+                "69c80295.f3b48c"
             ]
         ]
     },
     {
-        "id": "db1e7b85.850cb8",
+        "id": "69c80295.f3b48c",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 4888,
-        "y": 2589,
-        "z": "a911d5ff.5ac84",
+        "x": 4900,
+        "y": 2598,
+        "z": "4fb14ce0.40eb24",
         "wires": []
     },
     {
-        "id": "13b057e7.5ede5",
+        "id": "57ababe0.ec3414",
         "type": "set",
         "name": "unset tmp.the-vpn-binding",
         "xml": "<set>\n<parameter name='tmp.the-vpn-binding.' value='' />\n",
         "comments": "",
-        "x": 2724,
-        "y": 2396,
-        "z": "a911d5ff.5ac84",
+        "x": 2736,
+        "y": 2405,
+        "z": "4fb14ce0.40eb24",
         "wires": []
     },
     {
-        "id": "8d0325f2.b257c",
+        "id": "b81a7ea3.f58288",
         "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": 2813,
-        "y": 2570,
-        "z": "a911d5ff.5ac84",
+        "x": 2825,
+        "y": 2579,
+        "z": "4fb14ce0.40eb24",
         "wires": []
     },
     {
-        "id": "8583f674.cce2c",
+        "id": "52276af3.2f9a4c",
         "type": "save",
         "name": "update vpn-binding otnIdx resource (aka. OTN) in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.the-vpn-binding.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.the-vpn-binding.vpn-id`' />\n<!--<parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />-->\n<!--<parameter name='customer-vpn-id' value='`($maxtpn + $gfp)`' />-->\n<parameter name='customer-vpn-id' value='`($tmp.the-vpn-binding.customer-vpn-id + $gfp)`' />\n\n<parameter name='route-distinguisher' value='`$gfp`' />\n<parameter name='operational-status' value='Modified' />\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2783,
-        "y": 2630,
-        "z": "a911d5ff.5ac84",
+        "x": 2795,
+        "y": 2639,
+        "z": "4fb14ce0.40eb24",
         "wires": [
             []
         ]
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
new file mode 100644
index 00000000..5fb89455
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-delete.json
@@ -0,0 +1,1099 @@
+[
+    {
+        "id": "931a69bb.dae57",
+        "type": "dgstart",
+        "name": "DGSTART",
+        "outputs": 1,
+        "x": 158,
+        "y": 111,
+        "z": "de2a2b68.0a5d7",
+        "wires": [
+            [
+                "631f62d5.74088c"
+            ]
+        ]
+    },
+    {
+        "id": "631f62d5.74088c",
+        "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": 289.2856903076172,
+        "y": 160.23810863494873,
+        "z": "de2a2b68.0a5d7",
+        "wires": [
+            [
+                "b7a67e25.a3d65"
+            ]
+        ]
+    },
+    {
+        "id": "b7a67e25.a3d65",
+        "type": "method",
+        "name": "method cll-vnf-topology-operation-cll-delete",
+        "xml": "<method rpc='cll-vnf-topology-operation-cll-delete' mode='sync'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 292.4286193847656,
+        "y": 245.00003242492676,
+        "z": "de2a2b68.0a5d7",
+        "wires": [
+            [
+                "bcc86fda.38b13"
+            ]
+        ]
+    },
+    {
+        "id": "bcc86fda.38b13",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 442.238037109375,
+        "y": 374.6666564941406,
+        "z": "de2a2b68.0a5d7",
+        "wires": [
+            [
+                "f53defcd.3a7dd",
+                "c20e131e.73b7b",
+                "d160ef14.daae98"
+            ]
+        ]
+    },
+    {
+        "id": "f53defcd.3a7dd",
+        "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": 716.5716552734375,
+        "y": 641.59716796875,
+        "z": "de2a2b68.0a5d7",
+        "wires": []
+    },
+    {
+        "id": "c20e131e.73b7b",
+        "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": 768,
+        "y": 412,
+        "z": "de2a2b68.0a5d7",
+        "wires": [
+            [
+                "73ebc7bf.bf03e8",
+                "4161fc92.ab54b4",
+                "f0a5f72e.4756d"
+            ]
+        ]
+    },
+    {
+        "id": "73ebc7bf.bf03e8",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 987,
+        "y": 350,
+        "z": "de2a2b68.0a5d7",
+        "wires": [
+            [
+                "5b569a16.745f1c"
+            ]
+        ]
+    },
+    {
+        "id": "4161fc92.ab54b4",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 996.490966796875,
+        "y": 392.57403564453125,
+        "z": "de2a2b68.0a5d7",
+        "wires": [
+            [
+                "8782adc7.ab141"
+            ]
+        ]
+    },
+    {
+        "id": "f0a5f72e.4756d",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 985,
+        "y": 439,
+        "z": "de2a2b68.0a5d7",
+        "wires": [
+            [
+                "ecf8d005.e02b48"
+            ]
+        ]
+    },
+    {
+        "id": "8782adc7.ab141",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 1150.0623779296875,
+        "y": 395.8597717285156,
+        "z": "de2a2b68.0a5d7",
+        "wires": []
+    },
+    {
+        "id": "ecf8d005.e02b48",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+        "comments": "",
+        "x": 1154,
+        "y": 440,
+        "z": "de2a2b68.0a5d7",
+        "wires": []
+    },
+    {
+        "id": "5b569a16.745f1c",
+        "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": 1184,
+        "y": 346,
+        "z": "de2a2b68.0a5d7",
+        "wires": [
+            [
+                "25ca27fd.dbc988"
+            ]
+        ]
+    },
+    {
+        "id": "25ca27fd.dbc988",
+        "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": 1407.33349609375,
+        "y": 345.99993896484375,
+        "z": "de2a2b68.0a5d7",
+        "wires": [
+            [
+                "f6a0c4df.5c0238"
+            ]
+        ]
+    },
+    {
+        "id": "f6a0c4df.5c0238",
+        "type": "outcome",
+        "name": "connectivity",
+        "xml": "<outcome value='connectivity'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1587.0001220703125,
+        "y": 346.0000305175781,
+        "z": "de2a2b68.0a5d7",
+        "wires": [
+            [
+                "b1afa8c.9d08258"
+            ]
+        ]
+    },
+    {
+        "id": "d160ef14.daae98",
+        "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": 734,
+        "y": 360,
+        "z": "de2a2b68.0a5d7",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "b1afa8c.9d08258",
+        "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": 1787,
+        "y": 346,
+        "z": "de2a2b68.0a5d7",
+        "wires": [
+            [
+                "c3a2010c.f5d48",
+                "fb144142.e9ac68",
+                "ba20a9b3.14be2"
+            ]
+        ]
+    },
+    {
+        "id": "c3a2010c.f5d48",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1958,
+        "y": 299,
+        "z": "de2a2b68.0a5d7",
+        "wires": [
+            [
+                "9386fbbc.1d2048"
+            ]
+        ]
+    },
+    {
+        "id": "fb144142.e9ac68",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2039.490966796875,
+        "y": 1139.5740356445312,
+        "z": "de2a2b68.0a5d7",
+        "wires": [
+            [
+                "9e1c850d.74d728"
+            ]
+        ]
+    },
+    {
+        "id": "ba20a9b3.14be2",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2037,
+        "y": 1183,
+        "z": "de2a2b68.0a5d7",
+        "wires": [
+            [
+                "c9b57000.53acb8"
+            ]
+        ]
+    },
+    {
+        "id": "9e1c850d.74d728",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 2202.0623779296875,
+        "y": 1139.8597717285156,
+        "z": "de2a2b68.0a5d7",
+        "wires": []
+    },
+    {
+        "id": "c9b57000.53acb8",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+        "comments": "",
+        "x": 2206,
+        "y": 1184,
+        "z": "de2a2b68.0a5d7",
+        "wires": []
+    },
+    {
+        "id": "ad889722.664b08",
+        "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": 3062,
+        "y": 386,
+        "z": "de2a2b68.0a5d7",
+        "wires": [
+            [
+                "640b0e20.b1d3e",
+                "ce9c63b.0255a2",
+                "7ad6314d.3b89c8"
+            ]
+        ]
+    },
+    {
+        "id": "e28a48f8.db57f8",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 3439,
+        "y": 378,
+        "z": "de2a2b68.0a5d7",
+        "wires": [
+            [
+                "1c93c389.0c8c2c",
+                "c798ad9c.1234b",
+                "fd7fa756.f7d6e8",
+                "270a4545.e66b22",
+                "d4768fc2.d5865"
+            ]
+        ]
+    },
+    {
+        "id": "640b0e20.b1d3e",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3273,
+        "y": 388,
+        "z": "de2a2b68.0a5d7",
+        "wires": [
+            [
+                "e28a48f8.db57f8"
+            ]
+        ]
+    },
+    {
+        "id": "ce9c63b.0255a2",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3273.490966796875,
+        "y": 433.57403564453125,
+        "z": "de2a2b68.0a5d7",
+        "wires": [
+            [
+                "714cc291.22ce0c"
+            ]
+        ]
+    },
+    {
+        "id": "7ad6314d.3b89c8",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3271,
+        "y": 477,
+        "z": "de2a2b68.0a5d7",
+        "wires": [
+            [
+                "525b4279.2df8f4"
+            ]
+        ]
+    },
+    {
+        "id": "525b4279.2df8f4",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+        "comments": "",
+        "x": 3438,
+        "y": 476,
+        "z": "de2a2b68.0a5d7",
+        "wires": []
+    },
+    {
+        "id": "714cc291.22ce0c",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 3436.0623779296875,
+        "y": 433.8597717285156,
+        "z": "de2a2b68.0a5d7",
+        "wires": []
+    },
+    {
+        "id": "c57d1cb2.40bd38",
+        "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": 2261,
+        "y": 301,
+        "z": "de2a2b68.0a5d7",
+        "wires": [
+            [
+                "9dbcf55e.4925c8"
+            ]
+        ]
+    },
+    {
+        "id": "9dbcf55e.4925c8",
+        "type": "switchNode",
+        "name": "switch related-to",
+        "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2458,
+        "y": 315,
+        "z": "de2a2b68.0a5d7",
+        "wires": [
+            [
+                "b564f315.834a2",
+                "e7d69f06.780b38"
+            ]
+        ]
+    },
+    {
+        "id": "b564f315.834a2",
+        "type": "outcome",
+        "name": "vpn-binding",
+        "xml": "<outcome value='vpn-binding'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2626,
+        "y": 308,
+        "z": "de2a2b68.0a5d7",
+        "wires": [
+            [
+                "491489ec.617558"
+            ]
+        ]
+    },
+    {
+        "id": "491489ec.617558",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 2789,
+        "y": 308,
+        "z": "de2a2b68.0a5d7",
+        "wires": [
+            [
+                "ad889722.664b08"
+            ]
+        ]
+    },
+    {
+        "id": "1c93c389.0c8c2c",
+        "type": "set",
+        "name": "set pnf-name",
+        "xml": "<set>\n<parameter name='tmp.domain.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.vpn-binding.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.vpn-binding.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.vpn-binding.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.vpn-binding.src-access-node-id`\" />\n",
+        "comments": "",
+        "x": 3661,
+        "y": 96,
+        "z": "de2a2b68.0a5d7",
+        "wires": []
+    },
+    {
+        "id": "c798ad9c.1234b",
+        "type": "get-resource",
+        "name": "get-resource src pnf",
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.domain.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3687,
+        "y": 213,
+        "z": "de2a2b68.0a5d7",
+        "wires": [
+            [
+                "76dc6e0a.1ab268",
+                "826ceead.c2f69",
+                "d5b03fc8.b6e088"
+            ]
+        ]
+    },
+    {
+        "id": "76dc6e0a.1ab268",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3882.5001220703125,
+        "y": 165,
+        "z": "de2a2b68.0a5d7",
+        "wires": [
+            [
+                "feb1370b.46393"
+            ]
+        ]
+    },
+    {
+        "id": "826ceead.c2f69",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3874.5001220703125,
+        "y": 220,
+        "z": "de2a2b68.0a5d7",
+        "wires": [
+            [
+                "f38f34bb.7a9748"
+            ]
+        ]
+    },
+    {
+        "id": "feb1370b.46393",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 4026.8824462890625,
+        "y": 164.65567016601562,
+        "z": "de2a2b68.0a5d7",
+        "wires": [
+            [
+                "21f3a77a.346fa8"
+            ]
+        ]
+    },
+    {
+        "id": "21f3a77a.346fa8",
+        "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": 4211,
+        "y": 163,
+        "z": "de2a2b68.0a5d7",
+        "wires": [
+            [
+                "a51bf440.0c5b6"
+            ]
+        ]
+    },
+    {
+        "id": "a51bf440.0c5b6",
+        "type": "switchNode",
+        "name": "switch related-to",
+        "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4406,
+        "y": 163,
+        "z": "de2a2b68.0a5d7",
+        "wires": [
+            [
+                "34e2f8df.de6cf8"
+            ]
+        ]
+    },
+    {
+        "id": "d5b03fc8.b6e088",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3879.5001220703125,
+        "y": 277,
+        "z": "de2a2b68.0a5d7",
+        "wires": [
+            [
+                "8eb64fc1.c84cd"
+            ]
+        ]
+    },
+    {
+        "id": "8eb64fc1.c84cd",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return 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": 4031.5001220703125,
+        "y": 278,
+        "z": "de2a2b68.0a5d7",
+        "wires": []
+    },
+    {
+        "id": "f38f34bb.7a9748",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 4042.5001220703125,
+        "y": 221,
+        "z": "de2a2b68.0a5d7",
+        "wires": []
+    },
+    {
+        "id": "41c68962.37006",
+        "type": "execute",
+        "name": "get esr-thirdparty-sdnc",
+        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domain.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domain.esr-thirdparty-sdnc' local-only='false' >",
+        "comments": "",
+        "outputs": 1,
+        "x": 4994,
+        "y": 180,
+        "z": "de2a2b68.0a5d7",
+        "wires": [
+            [
+                "b0076b13.2e399",
+                "f818e30c.1ed2d",
+                "cd5ca056.adec1"
+            ]
+        ]
+    },
+    {
+        "id": "fb2612bc.a6aea8",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 4788,
+        "y": 167,
+        "z": "de2a2b68.0a5d7",
+        "wires": [
+            [
+                "a86d0a2.d48def8",
+                "41c68962.37006",
+                "3b61ff6d.8dced"
+            ]
+        ]
+    },
+    {
+        "id": "a86d0a2.d48def8",
+        "type": "set",
+        "name": "set esr-thirdparty-sdnc domain id",
+        "xml": "<set>\n<parameter name='tmp.domain.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
+        "comments": "",
+        "x": 5024,
+        "y": 128,
+        "z": "de2a2b68.0a5d7",
+        "wires": []
+    },
+    {
+        "id": "b0076b13.2e399",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5204,
+        "y": 171,
+        "z": "de2a2b68.0a5d7",
+        "wires": [
+            [
+                "9a62192a.51df38"
+            ]
+        ]
+    },
+    {
+        "id": "f818e30c.1ed2d",
+        "type": "not-found",
+        "name": "not-found",
+        "xml": "<outcome value='not-found'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5196,
+        "y": 226,
+        "z": "de2a2b68.0a5d7",
+        "wires": [
+            [
+                "cb7716d3.6ef01"
+            ]
+        ]
+    },
+    {
+        "id": "cd5ca056.adec1",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5201,
+        "y": 283,
+        "z": "de2a2b68.0a5d7",
+        "wires": [
+            [
+                "6a7cfa93.2ccb4c"
+            ]
+        ]
+    },
+    {
+        "id": "6a7cfa93.2ccb4c",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return 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": 5353,
+        "y": 284,
+        "z": "de2a2b68.0a5d7",
+        "wires": []
+    },
+    {
+        "id": "cb7716d3.6ef01",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 5364,
+        "y": 229,
+        "z": "de2a2b68.0a5d7",
+        "wires": []
+    },
+    {
+        "id": "9a62192a.51df38",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 5348.38232421875,
+        "y": 168.65567016601562,
+        "z": "de2a2b68.0a5d7",
+        "wires": [
+            [
+                "1e654428.bcfdbc"
+            ]
+        ]
+    },
+    {
+        "id": "34e2f8df.de6cf8",
+        "type": "outcome",
+        "name": "esr-thirdparty-sdnc",
+        "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4609,
+        "y": 167,
+        "z": "de2a2b68.0a5d7",
+        "wires": [
+            [
+                "fb2612bc.a6aea8"
+            ]
+        ]
+    },
+    {
+        "id": "1e654428.bcfdbc",
+        "type": "set",
+        "name": "set controller domain data",
+        "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.url' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.user' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.password' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
+        "comments": "",
+        "x": 5563,
+        "y": 165,
+        "z": "de2a2b68.0a5d7",
+        "wires": []
+    },
+    {
+        "id": "3b61ff6d.8dced",
+        "type": "break",
+        "name": "break",
+        "xml": "<break>\n",
+        "comments": "",
+        "x": 4944,
+        "y": 244,
+        "z": "de2a2b68.0a5d7",
+        "wires": []
+    },
+    {
+        "id": "10401b5c.b05865",
+        "type": "execute",
+        "name": "execute RestApiCallNode Delete ethernet Service without token",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.aai.connectivity.etht-svc-name`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<!--<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4322,
+        "y": 593,
+        "z": "de2a2b68.0a5d7",
+        "wires": [
+            [
+                "7f6c606d.64ab48",
+                "c3eb517a.b7781"
+            ]
+        ]
+    },
+    {
+        "id": "7f6c606d.64ab48",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4668.5,
+        "y": 586,
+        "z": "de2a2b68.0a5d7",
+        "wires": [
+            [
+                "8c5003e.5a8698"
+            ]
+        ]
+    },
+    {
+        "id": "c3eb517a.b7781",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4672.5,
+        "y": 626,
+        "z": "de2a2b68.0a5d7",
+        "wires": [
+            [
+                "19571e12.890ec2"
+            ]
+        ]
+    },
+    {
+        "id": "19571e12.890ec2",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 4830,
+        "y": 626,
+        "z": "de2a2b68.0a5d7",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "8c5003e.5a8698",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing delete ethernet service rest api\" />\n",
+        "comments": "",
+        "x": 4826.5,
+        "y": 586,
+        "z": "de2a2b68.0a5d7",
+        "wires": []
+    },
+    {
+        "id": "fd7fa756.f7d6e8",
+        "type": "execute",
+        "name": "execute RestApiCallNode Delete OTN tunnel with token",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<!--<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-otn-src-domain-creation.templatefile`\" />-->\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-te:te/tunnels/tunnel=' + $tmp.aai.vpn-binding.vpn-name`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
+        "comments": "",
+        "outputs": 1,
+        "x": 3790,
+        "y": 480,
+        "z": "de2a2b68.0a5d7",
+        "wires": [
+            [
+                "7d0f2c32.be1c14",
+                "d337892f.188d2"
+            ]
+        ]
+    },
+    {
+        "id": "7d0f2c32.be1c14",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4122.5,
+        "y": 450,
+        "z": "de2a2b68.0a5d7",
+        "wires": [
+            [
+                "bcce4236.8aab4"
+            ]
+        ]
+    },
+    {
+        "id": "d337892f.188d2",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4127.5,
+        "y": 515,
+        "z": "de2a2b68.0a5d7",
+        "wires": [
+            [
+                "fe33b47b.c7292"
+            ]
+        ]
+    },
+    {
+        "id": "bcce4236.8aab4",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing delete OTN tunnel rest api\" />\n",
+        "comments": "",
+        "x": 4298.5,
+        "y": 450,
+        "z": "de2a2b68.0a5d7",
+        "wires": []
+    },
+    {
+        "id": "fe33b47b.c7292",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "comments": "",
+        "outputs": 1,
+        "x": 4294,
+        "y": 515,
+        "z": "de2a2b68.0a5d7",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "270a4545.e66b22",
+        "type": "switchNode",
+        "name": "switch connectivity has ethernet service",
+        "xml": "<switch test='`$tmp.aai.connectivity.etht-svc-name`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3728,
+        "y": 615,
+        "z": "de2a2b68.0a5d7",
+        "wires": [
+            [
+                "9b17a7a2.876",
+                "67f91d39.722cb4"
+            ]
+        ]
+    },
+    {
+        "id": "67f91d39.722cb4",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3981,
+        "y": 593,
+        "z": "de2a2b68.0a5d7",
+        "wires": [
+            [
+                "10401b5c.b05865"
+            ]
+        ]
+    },
+    {
+        "id": "9b17a7a2.876",
+        "type": "outcome",
+        "name": "Null",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3981,
+        "y": 649,
+        "z": "de2a2b68.0a5d7",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "9c7846e0.04a7f",
+        "type": "save",
+        "name": "delete connectivity resource in AAI",
+        "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.connectivity.connectivity-id'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2277,
+        "y": 1030,
+        "z": "de2a2b68.0a5d7",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "d4768fc2.d5865",
+        "type": "save",
+        "name": "delete vpn-binding resource in AAI",
+        "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-binding.vpn-id' >\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3709,
+        "y": 731,
+        "z": "de2a2b68.0a5d7",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "e7d69f06.780b38",
+        "type": "outcome",
+        "name": "uni",
+        "xml": "<outcome value='uni'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2642,
+        "y": 710,
+        "z": "de2a2b68.0a5d7",
+        "wires": [
+            [
+                "f282643f.862928"
+            ]
+        ]
+    },
+    {
+        "id": "f282643f.862928",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 2805,
+        "y": 710,
+        "z": "de2a2b68.0a5d7",
+        "wires": [
+            [
+                "7484e145.9ae3a8"
+            ]
+        ]
+    },
+    {
+        "id": "7484e145.9ae3a8",
+        "type": "save",
+        "name": "delete uni resource in AAI",
+        "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='uni' \n      key='uni.id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3048,
+        "y": 710,
+        "z": "de2a2b68.0a5d7",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "9386fbbc.1d2048",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 2087,
+        "y": 299,
+        "z": "de2a2b68.0a5d7",
+        "wires": [
+            [
+                "c57d1cb2.40bd38",
+                "9c7846e0.04a7f"
+            ]
+        ]
+    }
+]
\ 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
new file mode 100644
index 00000000..8f287f3f
--- /dev/null
+++ b/platform-logic/generic-resource-api/src/main/json/cloud_leased_line/GENERIC-RESOURCE-API_cll-vnf-topology-operation-cll-modify.json
@@ -0,0 +1,1627 @@
+[
+    {
+        "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": [
+            []
+        ]
+    }
+]
\ No newline at end of file
-- 
cgit 1.2.3-korg