From aa034c1b736770008aea1865febbe229aabce3db Mon Sep 17 00:00:00 2001
From: Hesam Rahimi <hesam.rahimi@huawei.com>
Date: Thu, 10 Dec 2020 22:27:04 +0000
Subject: [PATCH] Use same name for OTN Tunnels and Ethernet Services in both
 domains.

Issue-ID: SDNC-1431
Change-Id: I5cc4d3c503d3b3e16e1223a50df654d19478b8cc
Signed-off-by: Hesam Rahimi <hesam.rahimi@huawei.com>
---
 ...nf-topology-operation-trans-slice-activate.json |  952 +++++-----
 ...nf-topology-operation-trans-slice-allocate.json | 1922 ++++++++++----------
 ...vnf-topology-operation-trans-slice-activate.xml |   12 +-
 ...vnf-topology-operation-trans-slice-allocate.xml |   12 +-
 .../src/main/json/ts-ethernet-service.json         |    5 +-
 5 files changed, 1475 insertions(+), 1428 deletions(-)

diff --git a/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-activate.json b/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-activate.json
index a1b68a69..5d150f6b 100644
--- a/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-activate.json
+++ b/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-activate.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "d5615e24.a00ab8",
+        "id": "d9508d21.fa5b3",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 156,
-        "y": 95,
+        "x": 144,
+        "y": 116,
         "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "90741178.637a68"
+                "cae32381.bce9d"
             ]
         ]
     },
     {
-        "id": "90741178.637a68",
+        "id": "cae32381.bce9d",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,1740 +22,1740 @@
         "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": 287.2856903076172,
-        "y": 144.23810863494873,
+        "x": 275.2856903076172,
+        "y": 165.23810863494873,
         "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "e9aee376.235818"
+                "82cfa8a0.a91dc"
             ]
         ]
     },
     {
-        "id": "e9aee376.235818",
+        "id": "82cfa8a0.a91dc",
         "type": "method",
         "name": "method tsli-vnf-topology-operation-trans-slice-activate",
         "xml": "<method rpc='tsli-vnf-topology-operation-trans-slice-activate' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 290.4286193847656,
-        "y": 229.00003242492676,
+        "x": 278.4286193847656,
+        "y": 250.00003242492676,
         "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "9c8b5d20.5b6ef8"
+                "f6fef19d.8fc9f8"
             ]
         ]
     },
     {
-        "id": "9c8b5d20.5b6ef8",
+        "id": "f6fef19d.8fc9f8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 440.238037109375,
-        "y": 358.6666564941406,
+        "x": 428.238037109375,
+        "y": 379.6666564941406,
         "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "f1c1dc9b.59851",
-                "40fee6aa.417918",
-                "a3f28ac6.d30ed8"
+                "c70167ce.7f9118",
+                "6aca196e.a4377",
+                "e86e6571.913898"
             ]
         ]
     },
     {
-        "id": "f1c1dc9b.59851",
+        "id": "c70167ce.7f9118",
         "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": 708.5716552734375,
-        "y": 745.59716796875,
+        "x": 696.5716552734375,
+        "y": 766.59716796875,
         "z": "8a9c455f.82beb8",
         "wires": []
     },
     {
-        "id": "e4fd4d94.2b8ec8",
+        "id": "d841551.d686928",
         "type": "comment",
         "name": "new for TransportSlicing",
         "info": "",
         "comments": "",
-        "x": 740,
-        "y": 420,
+        "x": 728,
+        "y": 441,
         "z": "8a9c455f.82beb8",
         "wires": []
     },
     {
-        "id": "40fee6aa.417918",
+        "id": "6aca196e.a4377",
         "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": 760,
-        "y": 516,
+        "x": 748,
+        "y": 537,
         "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "15f2cda7.88709a",
-                "187b249d.3c85cb",
-                "c12e657e.e2c7f8"
+                "8dfdefd.d3d4d9",
+                "f6a9e3a5.f26778",
+                "6cad2633.e5f528"
             ]
         ]
     },
     {
-        "id": "15f2cda7.88709a",
+        "id": "8dfdefd.d3d4d9",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 979,
-        "y": 454,
+        "x": 967,
+        "y": 475,
         "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "56c6117d.ed7bc"
+                "f2dd8538.5d3378"
             ]
         ]
     },
     {
-        "id": "187b249d.3c85cb",
+        "id": "f6a9e3a5.f26778",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 988.490966796875,
-        "y": 496.57403564453125,
+        "x": 976.490966796875,
+        "y": 517.5740356445312,
         "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "dd3e3cac.482ca8"
+                "59b21b6f.e70b7c"
             ]
         ]
     },
     {
-        "id": "c12e657e.e2c7f8",
+        "id": "6cad2633.e5f528",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 977,
-        "y": 543,
+        "x": 965,
+        "y": 564,
         "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "d7bbbdd4.b85c7"
+                "95c7d05e.93c3e"
             ]
         ]
     },
     {
-        "id": "dd3e3cac.482ca8",
+        "id": "59b21b6f.e70b7c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 1142.0623779296875,
-        "y": 499.8597717285156,
+        "x": 1130.0623779296875,
+        "y": 520.8597717285156,
         "z": "8a9c455f.82beb8",
         "wires": []
     },
     {
-        "id": "d7bbbdd4.b85c7",
+        "id": "95c7d05e.93c3e",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 1146,
-        "y": 544,
+        "x": 1134,
+        "y": 565,
         "z": "8a9c455f.82beb8",
         "wires": []
     },
     {
-        "id": "56c6117d.ed7bc",
+        "id": "f2dd8538.5d3378",
         "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": 1176,
-        "y": 450,
+        "x": 1164,
+        "y": 471,
         "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "68f0da0a.13a494"
+                "94e5618.e7d282"
             ]
         ]
     },
     {
-        "id": "68f0da0a.13a494",
+        "id": "94e5618.e7d282",
         "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": 1399.33349609375,
-        "y": 449.99993896484375,
+        "x": 1387.33349609375,
+        "y": 470.99993896484375,
         "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "a37a9810.801788"
+                "32140056.199ae"
             ]
         ]
     },
     {
-        "id": "a37a9810.801788",
+        "id": "32140056.199ae",
         "type": "outcome",
         "name": "connectivity",
         "xml": "<outcome value='connectivity'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1600.0001335144043,
-        "y": 451.00002098083496,
+        "x": 1588.0001335144043,
+        "y": 472.00002098083496,
         "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "2d3714db.b7aad4"
+                "9174febc.b8b998"
             ]
         ]
     },
     {
-        "id": "3d56fd4f.8da4ea",
+        "id": "25e7d332.a761fc",
         "type": "set",
         "name": "set attachment_param for OTN A",
         "xml": "<set>\n<parameter name='src-node-id' value='`$tmp.aai.vpn-bindingA.src-access-node-id`' />\n<parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingA.dst-access-node-id`' />\n<parameter name='dst-tpn-id' value='1' />\n<parameter name='dst-ttp-id' value='`$tmp.aai.vpn-bindingA.dst-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='otn-tunnel-name-src-domain' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n<parameter name='client-id' value='`$tmp.aai.vpn-bindingA.access-client-id`' />\n<parameter name='provider-id' value='`$tmp.aai.vpn-bindingA.access-provider-id`' />\n<parameter name='topology-id' value='`$tmp.aai.vpn-bindingA.access-topology-id`' />\n",
         "comments": "",
-        "x": 3861,
-        "y": 170,
+        "x": 3849,
+        "y": 191,
         "z": "8a9c455f.82beb8",
         "wires": []
     },
     {
-        "id": "119d7057.187e9",
+        "id": "fee47d9.4382e",
         "type": "execute",
         "name": "execute RestApiCallNode Create OTN tunnel with token",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-otn-src-domain-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-te:te'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 3942,
-        "y": 485,
+        "x": 3930,
+        "y": 506,
         "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "a078109.a1f9bf",
-                "c205f5c4.0bdb88"
+                "445402d7.16a9f4",
+                "d34714f7.10a51"
             ]
         ]
     },
     {
-        "id": "a078109.a1f9bf",
+        "id": "445402d7.16a9f4",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4251.5,
-        "y": 454,
+        "x": 4239.5,
+        "y": 475,
         "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "3b38ca16.a7fb4e"
+                "69fb5a0d.27a12c"
             ]
         ]
     },
     {
-        "id": "c205f5c4.0bdb88",
+        "id": "d34714f7.10a51",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4256.5,
-        "y": 519,
+        "x": 4244.5,
+        "y": 540,
         "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "176e9242.258856"
+                "f0eccde.2c0533"
             ]
         ]
     },
     {
-        "id": "3b38ca16.a7fb4e",
+        "id": "69fb5a0d.27a12c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create OTN tunnel rest api\" />\n",
         "comments": "",
-        "x": 4427.5,
-        "y": 454,
+        "x": 4415.5,
+        "y": 475,
         "z": "8a9c455f.82beb8",
         "wires": []
     },
     {
-        "id": "176e9242.258856",
+        "id": "f0eccde.2c0533",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4423,
-        "y": 519,
+        "x": 4411,
+        "y": 540,
         "z": "8a9c455f.82beb8",
         "wires": [
             []
         ]
     },
     {
-        "id": "ab834e.f483fcb",
+        "id": "a96cdedb.06ef48",
         "type": "set",
         "name": "set sotn_value",
-        "xml": "<set>\n<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.connectivity-id`' />\n<parameter name='provider-id' value='`$tmp.aai.connectivityA.access-provider-id`' />\n<parameter name='client-id' value='`$tmp.aai.connectivityA.access-client-id`' />\n<parameter name='topology-id' value='`$tmp.aai.connectivityA.access-topology-id`' />\n<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityA.connectivity-id`' />\n<parameter name='index-number' value='0' />\n<parameter name='eth-node-id' value='`$tmp.aai.connectivityA.access-node-id`' />\n<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityA.access-ltp-id`' />\n",
+        "xml": "<set>\n<!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->\n<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.etht-svc-name`' />\n<parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />\n<parameter name='provider-id' value='`$tmp.aai.connectivityA.access-provider-id`' />\n<parameter name='client-id' value='`$tmp.aai.connectivityA.access-client-id`' />\n<parameter name='topology-id' value='`$tmp.aai.connectivityA.access-topology-id`' />\n<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityA.connectivity-id`' />\n<parameter name='index-number' value='0' />\n<parameter name='eth-node-id' value='`$tmp.aai.connectivityA.access-node-id`' />\n<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityA.access-ltp-id`' />\n<parameter name='CIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />\n<parameter name='EIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />\n",
         "comments": "",
-        "x": 3808.5,
-        "y": 673,
+        "x": 3796.5,
+        "y": 694,
         "z": "8a9c455f.82beb8",
         "wires": []
     },
     {
-        "id": "c9d60073.e2df48",
+        "id": "616c98c7.f82ea8",
         "type": "execute",
         "name": "execute RestApiCallNode Create ethernet Service without token",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-ethernet-service.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3962.5,
-        "y": 721,
+        "x": 3950.5,
+        "y": 742,
         "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "1e624148.f51b17",
-                "9b38443d.36a338"
+                "eef8ae3.fdd1a5",
+                "8f2e62b6.e98788"
             ]
         ]
     },
     {
-        "id": "1e624148.f51b17",
+        "id": "eef8ae3.fdd1a5",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4308,
-        "y": 702,
+        "x": 4296,
+        "y": 723,
         "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "20712318.8d32fc"
+                "f08a069b.6042c8"
             ]
         ]
     },
     {
-        "id": "9b38443d.36a338",
+        "id": "8f2e62b6.e98788",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4312,
-        "y": 742,
+        "x": 4300,
+        "y": 763,
         "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "a4fdbce9.b1c4"
+                "b227b2c.229c1d"
             ]
         ]
     },
     {
-        "id": "20712318.8d32fc",
+        "id": "f08a069b.6042c8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create ethernet service rest api\" />\n",
         "comments": "",
-        "x": 4466,
-        "y": 702,
+        "x": 4454,
+        "y": 723,
         "z": "8a9c455f.82beb8",
         "wires": []
     },
     {
-        "id": "a4fdbce9.b1c4",
+        "id": "b227b2c.229c1d",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4469.5,
-        "y": 742,
+        "x": 4457.5,
+        "y": 763,
         "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "f9579fb7.928158",
-                "b5483433.ff3288"
+                "2af71c81.1e5aec",
+                "5fe9896d.3d8e98"
             ]
         ]
     },
     {
-        "id": "320ccbea.c02274",
+        "id": "c5970f4b.9679a8",
         "type": "comment",
         "name": "TODO: FIXME:",
         "info": "put proper values based on connectivity resource retrieved from AAI",
         "comments": "",
-        "x": 3806,
-        "y": 629,
+        "x": 3794,
+        "y": 650,
         "z": "8a9c455f.82beb8",
         "wires": []
     },
     {
-        "id": "f9579fb7.928158",
+        "id": "2af71c81.1e5aec",
         "type": "save",
         "name": "update vpn-binding A resource (aka. OTN domainA) in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingA.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-bindingA.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-bindingA.vpn-id`' />\n\n<parameter name='operational-status' value='Activated' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 4800,
-        "y": 707,
+        "x": 4788,
+        "y": 728,
         "z": "8a9c455f.82beb8",
         "wires": [
             []
         ]
     },
     {
-        "id": "d3281524.0d8478",
+        "id": "48dd1ec4.51cb4",
         "type": "comment",
         "name": "TODO: FIXME",
         "info": "use proper vpn-binding id and connectivity id\n\nAlso, does CCSDK support \"update\" operation for vpn-binding and connectivity?",
         "comments": "",
-        "x": 4664,
-        "y": 666,
+        "x": 4652,
+        "y": 687,
         "z": "8a9c455f.82beb8",
         "wires": []
     },
     {
-        "id": "b5483433.ff3288",
+        "id": "5fe9896d.3d8e98",
         "type": "save",
         "name": "update connectivity resource in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.connectivityA.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.connectivityA.connectivity-id`' />\n<parameter name='operational-status' value='Activated' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 4727,
-        "y": 753,
+        "x": 4715,
+        "y": 774,
         "z": "8a9c455f.82beb8",
         "wires": [
             []
         ]
     },
     {
-        "id": "5074df67.2ba988",
+        "id": "75d6c996.11aeb",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.src.domainA.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.vpn-bindingA.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.vpn-bindingA.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.vpn-bindingA.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.vpn-bindingA.src-access-node-id`\" />\n",
         "comments": "",
-        "x": 3799,
-        "y": 218,
+        "x": 3787,
+        "y": 239,
         "z": "8a9c455f.82beb8",
         "wires": []
     },
     {
-        "id": "9fd13730.014208",
+        "id": "c824ab5b.360f6",
         "type": "get-resource",
         "name": "get-resource src pnf",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.src.domainA.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 3825,
-        "y": 335,
+        "x": 3813,
+        "y": 356,
         "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "e11a5ea7.685f28",
-                "6cb0b7a8.80c24",
-                "a90c44f8.bdb148"
+                "19cd8085.d8fca7",
+                "ff1311fc.28b29",
+                "929f1027.4a5828"
             ]
         ]
     },
     {
-        "id": "e11a5ea7.685f28",
+        "id": "19cd8085.d8fca7",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4020.5001220703125,
-        "y": 287,
+        "x": 4008.5001220703125,
+        "y": 308,
         "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "dfb8903c.c1b1d8"
+                "a2185ea8.7f403"
             ]
         ]
     },
     {
-        "id": "6cb0b7a8.80c24",
+        "id": "ff1311fc.28b29",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4012.5001220703125,
-        "y": 342,
+        "x": 4000.5001220703125,
+        "y": 363,
         "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "509847ff.264c58"
+                "c3cea897.f88808"
             ]
         ]
     },
     {
-        "id": "dfb8903c.c1b1d8",
+        "id": "a2185ea8.7f403",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4164.8824462890625,
-        "y": 286.6556701660156,
+        "x": 4152.8824462890625,
+        "y": 307.6556701660156,
         "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "22c6d630.71326a"
+                "eb7f6fc2.5f3468"
             ]
         ]
     },
     {
-        "id": "5e775dc4.42bfbc",
+        "id": "a0fa7da8.75192",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4747,
-        "y": 289,
+        "x": 4735,
+        "y": 310,
         "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "f76a815f.36c178"
+                "809287e6.83f07"
             ]
         ]
     },
     {
-        "id": "22c6d630.71326a",
+        "id": "eb7f6fc2.5f3468",
         "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": 4349,
-        "y": 285,
+        "x": 4337,
+        "y": 306,
         "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "a3e1c0eb.9f5f88"
+                "21971ee2.f88962"
             ]
         ]
     },
     {
-        "id": "a3e1c0eb.9f5f88",
+        "id": "21971ee2.f88962",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4544,
-        "y": 285,
+        "x": 4532,
+        "y": 306,
         "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "5e775dc4.42bfbc"
+                "a0fa7da8.75192"
             ]
         ]
     },
     {
-        "id": "a90c44f8.bdb148",
+        "id": "929f1027.4a5828",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4017.5001220703125,
-        "y": 399,
+        "x": 4005.5001220703125,
+        "y": 420,
         "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "7a5f3123.aad6e8"
+                "5ece63ab.72534c"
             ]
         ]
     },
     {
-        "id": "7a5f3123.aad6e8",
+        "id": "5ece63ab.72534c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 4169.5001220703125,
-        "y": 400,
+        "x": 4157.5001220703125,
+        "y": 421,
         "z": "8a9c455f.82beb8",
         "wires": []
     },
     {
-        "id": "509847ff.264c58",
+        "id": "c3cea897.f88808",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 4180.5001220703125,
-        "y": 343,
+        "x": 4168.5001220703125,
+        "y": 364,
         "z": "8a9c455f.82beb8",
         "wires": []
     },
     {
-        "id": "4ab5c9a1.06e3f",
+        "id": "fd9485b.71b4af8",
         "type": "execute",
         "name": "get esr-thirdparty-sdnc",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainA.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainA.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
-        "x": 5132,
-        "y": 302,
+        "x": 5120,
+        "y": 323,
         "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "73f9ea02.2fb1e4",
-                "f8008145.65a48",
-                "81ec8b7a.5856d8"
+                "12fe3fd6.ccef78",
+                "5cf62e0d.6aa85",
+                "156d902b.c3731"
             ]
         ]
     },
     {
-        "id": "f76a815f.36c178",
+        "id": "809287e6.83f07",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4926,
-        "y": 289,
+        "x": 4914,
+        "y": 310,
         "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "ba856b81.43ed78",
-                "4ab5c9a1.06e3f"
+                "a1955015.d4546",
+                "fd9485b.71b4af8"
             ]
         ]
     },
     {
-        "id": "ba856b81.43ed78",
+        "id": "a1955015.d4546",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domainA id",
         "xml": "<set>\n<parameter name='tmp.domainA.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 5162,
-        "y": 250,
+        "x": 5150,
+        "y": 271,
         "z": "8a9c455f.82beb8",
         "wires": []
     },
     {
-        "id": "73f9ea02.2fb1e4",
+        "id": "12fe3fd6.ccef78",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5342,
-        "y": 293,
+        "x": 5330,
+        "y": 314,
         "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "5955dc9c.10f754"
+                "cc3a75a4.21fc7"
             ]
         ]
     },
     {
-        "id": "f8008145.65a48",
+        "id": "5cf62e0d.6aa85",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5334,
-        "y": 348,
+        "x": 5322,
+        "y": 369,
         "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "e3286b6.68c7618"
+                "bff3bfa.5f55cc"
             ]
         ]
     },
     {
-        "id": "81ec8b7a.5856d8",
+        "id": "156d902b.c3731",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5339,
-        "y": 405,
+        "x": 5327,
+        "y": 426,
         "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "ecd34f94.c447e"
+                "be590afe.7cc5a8"
             ]
         ]
     },
     {
-        "id": "ecd34f94.c447e",
+        "id": "be590afe.7cc5a8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 5491,
-        "y": 406,
+        "x": 5479,
+        "y": 427,
         "z": "8a9c455f.82beb8",
         "wires": []
     },
     {
-        "id": "e3286b6.68c7618",
+        "id": "bff3bfa.5f55cc",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 5502,
-        "y": 351,
+        "x": 5490,
+        "y": 372,
         "z": "8a9c455f.82beb8",
         "wires": []
     },
     {
-        "id": "5955dc9c.10f754",
+        "id": "cc3a75a4.21fc7",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5486.38232421875,
-        "y": 290.6556701660156,
+        "x": 5474.38232421875,
+        "y": 311.6556701660156,
         "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "adf5d068.f7cc"
+                "665ad654.79ee8"
             ]
         ]
     },
     {
-        "id": "adf5d068.f7cc",
+        "id": "665ad654.79ee8",
         "type": "set",
         "name": "set controller domainA data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.url' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.user' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.password' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
         "comments": "",
-        "x": 5701,
-        "y": 287,
+        "x": 5689,
+        "y": 308,
         "z": "8a9c455f.82beb8",
         "wires": []
     },
     {
-        "id": "a3f28ac6.d30ed8",
+        "id": "e86e6571.913898",
         "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": 726,
-        "y": 464,
+        "x": 714,
+        "y": 485,
         "z": "8a9c455f.82beb8",
         "wires": [
             []
         ]
     },
     {
-        "id": "b8f0eb5.a171218",
+        "id": "27bc86e9.1c4e52",
         "type": "set",
         "name": "set attachment_param for OTN B",
         "xml": "<set>\n<parameter name='src-node-id' value='`$tmp.aai.vpn-bindingB.src-access-node-id`' />\n<parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingB.dst-access-node-id`' />\n<parameter name='src-tpn-id' value='1' />\n<parameter name='src-ttp-id' value='`$tmp.aai.vpn-bindingB.src-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='otn-tunnel-name-dst-domain' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n<parameter name='client-id' value='`$tmp.aai.vpn-bindingB.access-client-id`' />\n<parameter name='provider-id' value='`$tmp.aai.vpn-bindingB.access-provider-id`' />\n<parameter name='topology-id' value='`$tmp.aai.vpn-bindingB.access-topology-id`' />\n",
         "comments": "",
-        "x": 3841,
-        "y": 974,
+        "x": 3829,
+        "y": 995,
         "z": "8a9c455f.82beb8",
         "wires": []
     },
     {
-        "id": "d94b849.7fdac78",
+        "id": "f8350413.ea8398",
         "type": "execute",
         "name": "execute RestApiCallNode Create OTN tunnel with token",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-otn-dst-domain-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/data/ietf-te:te'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 3904,
-        "y": 1303,
+        "x": 3892,
+        "y": 1324,
         "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "bfb79ead.715e28",
-                "d50b4560.d85de8"
+                "4e841df5.4d2d34",
+                "5e6f0ddb.0967b4"
             ]
         ]
     },
     {
-        "id": "bfb79ead.715e28",
+        "id": "4e841df5.4d2d34",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4199.5,
-        "y": 1270,
+        "x": 4187.5,
+        "y": 1291,
         "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "3d3c3af3.12a3b6"
+                "8fb2eae.74bbb98"
             ]
         ]
     },
     {
-        "id": "d50b4560.d85de8",
+        "id": "5e6f0ddb.0967b4",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4204.5,
-        "y": 1335,
+        "x": 4192.5,
+        "y": 1356,
         "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "347f5539.8f6cd2"
+                "9fef13b3.660c58"
             ]
         ]
     },
     {
-        "id": "3d3c3af3.12a3b6",
+        "id": "8fb2eae.74bbb98",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create OTN tunnel rest api\" />\n",
         "comments": "",
-        "x": 4367.5,
-        "y": 1270,
+        "x": 4355.5,
+        "y": 1291,
         "z": "8a9c455f.82beb8",
         "wires": []
     },
     {
-        "id": "347f5539.8f6cd2",
+        "id": "9fef13b3.660c58",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4378,
-        "y": 1335,
+        "x": 4366,
+        "y": 1356,
         "z": "8a9c455f.82beb8",
         "wires": [
             []
         ]
     },
     {
-        "id": "7af2004a.23f66",
+        "id": "2fd670.86d5219",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.dst.domainB.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.vpn-bindingB.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.vpn-bindingB.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.vpn-bindingB.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.vpn-bindingB.dst-access-node-id`\" />\n",
         "comments": "",
-        "x": 3780,
-        "y": 1031,
+        "x": 3768,
+        "y": 1052,
         "z": "8a9c455f.82beb8",
         "wires": []
     },
     {
-        "id": "9e8fb92f.dc9c38",
+        "id": "8581969f.3e9f8",
         "type": "get-resource",
         "name": "get-resource dst pnf",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.dst.domainB.pnf-name\"\n        pfx='tmp.aai.destination-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 3800,
-        "y": 1128,
+        "x": 3788,
+        "y": 1149,
         "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "3defc723.7feba8",
-                "92e9e56.6323798",
-                "92430372.354f08"
+                "3c9a5980.f5df5e",
+                "6737c173.340e3",
+                "68a240da.0733"
             ]
         ]
     },
     {
-        "id": "3defc723.7feba8",
+        "id": "3c9a5980.f5df5e",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4002.5001220703125,
-        "y": 1081,
+        "x": 3990.5001220703125,
+        "y": 1102,
         "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "38216362.304eb4"
+                "ea38c477.b7b2f"
             ]
         ]
     },
     {
-        "id": "92e9e56.6323798",
+        "id": "6737c173.340e3",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3994.5001220703125,
-        "y": 1136,
+        "x": 3982.5001220703125,
+        "y": 1157,
         "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "48eafe9b.93564"
+                "8bbc992f.718ea"
             ]
         ]
     },
     {
-        "id": "38216362.304eb4",
+        "id": "ea38c477.b7b2f",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4146.8824462890625,
-        "y": 1078.6556701660156,
+        "x": 4134.8824462890625,
+        "y": 1099.6556701660156,
         "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "5738b986.eff058"
+                "18cecfe3.6de9e"
             ]
         ]
     },
     {
-        "id": "5738b986.eff058",
+        "id": "18cecfe3.6de9e",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='dpvidx' start='0' end='`$tmp.aai.destination-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 4331,
-        "y": 1093,
+        "x": 4319,
+        "y": 1114,
         "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "424cd2de.fa894c"
+                "68f9f038.67b62"
             ]
         ]
     },
     {
-        "id": "92430372.354f08",
+        "id": "68a240da.0733",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3999.5001220703125,
-        "y": 1193,
+        "x": 3987.5001220703125,
+        "y": 1214,
         "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "93dd1d01.b545d"
+                "20686ade.8b231e"
             ]
         ]
     },
     {
-        "id": "93dd1d01.b545d",
+        "id": "20686ade.8b231e",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 4151.5001220703125,
-        "y": 1194,
+        "x": 4139.5001220703125,
+        "y": 1215,
         "z": "8a9c455f.82beb8",
         "wires": []
     },
     {
-        "id": "48eafe9b.93564",
+        "id": "8bbc992f.718ea",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 4162.5001220703125,
-        "y": 1139,
+        "x": 4150.5001220703125,
+        "y": 1160,
         "z": "8a9c455f.82beb8",
         "wires": []
     },
     {
-        "id": "38af15c1.7d84ba",
+        "id": "597aa62c.50d3c",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4729,
-        "y": 1097,
+        "x": 4717,
+        "y": 1118,
         "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "d8eb3cd4.227208"
+                "e04d6fa3.eba9f"
             ]
         ]
     },
     {
-        "id": "424cd2de.fa894c",
+        "id": "68f9f038.67b62",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4526,
-        "y": 1093,
+        "x": 4514,
+        "y": 1114,
         "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "38af15c1.7d84ba"
+                "597aa62c.50d3c"
             ]
         ]
     },
     {
-        "id": "a9c07a83.518f98",
+        "id": "2f50548b.6d0f1c",
         "type": "execute",
         "name": "get esr-thirdparty-sdnc",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainB.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainB.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
-        "x": 5114,
-        "y": 1096,
+        "x": 5102,
+        "y": 1117,
         "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "ef0c3c57.987338",
-                "56343453.6f0ce4",
-                "3b68871e.15bfe"
+                "a769e440.df581",
+                "a7207c49.d2bbc",
+                "1e0583ed.3bab5c"
             ]
         ]
     },
     {
-        "id": "d8eb3cd4.227208",
+        "id": "e04d6fa3.eba9f",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4906,
-        "y": 1089,
+        "x": 4894,
+        "y": 1110,
         "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "f04e0884.6fcbb8",
-                "a9c07a83.518f98"
+                "eacacb80.08d4c",
+                "2f50548b.6d0f1c"
             ]
         ]
     },
     {
-        "id": "f04e0884.6fcbb8",
+        "id": "eacacb80.08d4c",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domainB id",
         "xml": "<set>\n<parameter name='tmp.domainB.esr-thirdparty-id' value=\"`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 5144,
-        "y": 1044,
+        "x": 5132,
+        "y": 1065,
         "z": "8a9c455f.82beb8",
         "wires": []
     },
     {
-        "id": "b02d57da.181518",
+        "id": "61827e75.b97ad8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 5473,
-        "y": 1200,
+        "x": 5461,
+        "y": 1221,
         "z": "8a9c455f.82beb8",
         "wires": []
     },
     {
-        "id": "fed20348.5bb418",
+        "id": "b6c7c29b.5ee08",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",
         "comments": "",
-        "x": 5484,
-        "y": 1145,
+        "x": 5472,
+        "y": 1166,
         "z": "8a9c455f.82beb8",
         "wires": []
     },
     {
-        "id": "63aaed6a.7bdac4",
+        "id": "7c1b7b20.2d7bbc",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5468.38232421875,
-        "y": 1084.6556701660156,
+        "x": 5456.38232421875,
+        "y": 1105.6556701660156,
         "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "75824df.2d8fab4"
+                "9190ad56.af3378"
             ]
         ]
     },
     {
-        "id": "75824df.2d8fab4",
+        "id": "9190ad56.af3378",
         "type": "set",
         "name": "set controller domainB data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.url' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.user' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.password' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
         "comments": "",
-        "x": 5683,
-        "y": 1081,
+        "x": 5671,
+        "y": 1102,
         "z": "8a9c455f.82beb8",
         "wires": []
     },
     {
-        "id": "ef0c3c57.987338",
+        "id": "a769e440.df581",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5324,
-        "y": 1087,
+        "x": 5312,
+        "y": 1108,
         "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "63aaed6a.7bdac4"
+                "7c1b7b20.2d7bbc"
             ]
         ]
     },
     {
-        "id": "56343453.6f0ce4",
+        "id": "a7207c49.d2bbc",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5316,
-        "y": 1142,
+        "x": 5304,
+        "y": 1163,
         "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "fed20348.5bb418"
+                "b6c7c29b.5ee08"
             ]
         ]
     },
     {
-        "id": "3b68871e.15bfe",
+        "id": "1e0583ed.3bab5c",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5321,
-        "y": 1199,
+        "x": 5309,
+        "y": 1220,
         "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "b02d57da.181518"
+                "61827e75.b97ad8"
             ]
         ]
     },
     {
-        "id": "2d3714db.b7aad4",
+        "id": "9174febc.b8b998",
         "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": 1838,
-        "y": 453,
+        "x": 1826,
+        "y": 474,
         "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "ff6cd3bd.d426f",
-                "64ede831.c277d",
-                "c3e64c55.d790f8"
+                "c96ce0ff.9fbaf8",
+                "96dddcba.eaaec8",
+                "4ccaabcc.f5bb34"
             ]
         ]
     },
     {
-        "id": "ff6cd3bd.d426f",
+        "id": "c96ce0ff.9fbaf8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2046,
-        "y": 417,
+        "x": 2034,
+        "y": 438,
         "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "ab398477.a58648"
+                "5281d926.1c9dd"
             ]
         ]
     },
     {
-        "id": "64ede831.c277d",
+        "id": "96dddcba.eaaec8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2046.490966796875,
-        "y": 462.57403564453125,
+        "x": 2034.490966796875,
+        "y": 483.57403564453125,
         "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "575d4e0a.5d761"
+                "50a19d40.768324"
             ]
         ]
     },
     {
-        "id": "c3e64c55.d790f8",
+        "id": "4ccaabcc.f5bb34",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2044,
-        "y": 506,
+        "x": 2032,
+        "y": 527,
         "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "b99b7bb3.94d958"
+                "ffedf4ef.62de2"
             ]
         ]
     },
     {
-        "id": "575d4e0a.5d761",
+        "id": "50a19d40.768324",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 2209.0623779296875,
-        "y": 462.8597717285156,
+        "x": 2197.0623779296875,
+        "y": 483.8597717285156,
         "z": "8a9c455f.82beb8",
         "wires": []
     },
     {
-        "id": "b99b7bb3.94d958",
+        "id": "ffedf4ef.62de2",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 2213,
-        "y": 507,
+        "x": 2201,
+        "y": 528,
         "z": "8a9c455f.82beb8",
         "wires": []
     },
     {
-        "id": "684f9a1f.f6246c",
+        "id": "113dd07d.86f868",
         "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": 2519,
-        "y": 506,
+        "x": 2507,
+        "y": 527,
         "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "7a997c1a.ca4d0c",
-                "5d76d89f.d221e",
-                "d47edd7.a73b9a"
+                "2b6a4b71.479d3c",
+                "34c32e6f.a9d052",
+                "c2c66c33.7e24d"
             ]
         ]
     },
     {
-        "id": "11f43428.ee3774",
+        "id": "7a40580d.1d5388",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2903,
-        "y": 506,
+        "x": 2891,
+        "y": 527,
         "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "9d8c4947.e731c",
-                "a3bb6162.8aa1a8"
+                "eeee2acf.9c0ba8",
+                "57847c7b.2f3dbc"
             ]
         ]
     },
     {
-        "id": "7a997c1a.ca4d0c",
+        "id": "2b6a4b71.479d3c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2730,
-        "y": 508,
+        "x": 2718,
+        "y": 529,
         "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "11f43428.ee3774"
+                "7a40580d.1d5388"
             ]
         ]
     },
     {
-        "id": "5d76d89f.d221e",
+        "id": "34c32e6f.a9d052",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2730.490966796875,
-        "y": 553.5740356445312,
+        "x": 2718.490966796875,
+        "y": 574.5740356445312,
         "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "38cca479.139cac"
+                "17c937f3.281d28"
             ]
         ]
     },
     {
-        "id": "d47edd7.a73b9a",
+        "id": "c2c66c33.7e24d",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2728,
-        "y": 597,
+        "x": 2716,
+        "y": 618,
         "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "3c7730a0.80743"
+                "45484d04.351e94"
             ]
         ]
     },
     {
-        "id": "3c7730a0.80743",
+        "id": "45484d04.351e94",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 2895,
-        "y": 596,
+        "x": 2883,
+        "y": 617,
         "z": "8a9c455f.82beb8",
         "wires": []
     },
     {
-        "id": "38cca479.139cac",
+        "id": "17c937f3.281d28",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 2893.0623779296875,
-        "y": 553.8597717285156,
+        "x": 2881.0623779296875,
+        "y": 574.8597717285156,
         "z": "8a9c455f.82beb8",
         "wires": []
     },
     {
-        "id": "ab398477.a58648",
+        "id": "5281d926.1c9dd",
         "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": 2247,
-        "y": 412,
+        "x": 2235,
+        "y": 433,
         "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "32748804.ce58a"
+                "24c8cf8c.d35f5"
             ]
         ]
     },
     {
-        "id": "32748804.ce58a",
+        "id": "24c8cf8c.d35f5",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2452,
-        "y": 412,
+        "x": 2440,
+        "y": 433,
         "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "41c73b96.f41a84"
+                "ffd8562e.6c7ab"
             ]
         ]
     },
     {
-        "id": "41c73b96.f41a84",
+        "id": "ffd8562e.6c7ab",
         "type": "outcome",
         "name": "vpn-binding",
         "xml": "<outcome value='vpn-binding'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2618,
-        "y": 412,
+        "x": 2606,
+        "y": 433,
         "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "cfeba90.49ffe58"
+                "1639e360.7db745"
             ]
         ]
     },
     {
-        "id": "cfeba90.49ffe58",
+        "id": "1639e360.7db745",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2781,
-        "y": 412,
+        "x": 2769,
+        "y": 433,
         "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "684f9a1f.f6246c",
-                "b9f32cf4.c94178"
+                "113dd07d.86f868",
+                "b864657f.9c5a"
             ]
         ]
     },
     {
-        "id": "9d8c4947.e731c",
+        "id": "eeee2acf.9c0ba8",
         "type": "switchNode",
         "name": "switch vpn-binding has dst-access-ltp",
         "xml": "<switch test='`$tmp.aai.vpn-binding.dst-access-ltp-id`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3157,
-        "y": 505,
+        "x": 3145,
+        "y": 526,
         "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "c705e3fd.e27bf",
-                "74e33b9a.6a3ba4"
+                "888039c0.be2748",
+                "40c5843d.11f78c"
             ]
         ]
     },
     {
-        "id": "c705e3fd.e27bf",
+        "id": "888039c0.be2748",
         "type": "outcome",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3410,
-        "y": 539,
+        "x": 3398,
+        "y": 560,
         "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "ab5b6203.69a998"
+                "d751d093.92a62"
             ]
         ]
     },
     {
-        "id": "74e33b9a.6a3ba4",
+        "id": "40c5843d.11f78c",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3410,
-        "y": 483,
+        "x": 3398,
+        "y": 504,
         "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "7b04fd35.ba570c"
+                "ddefc1a3.6644c8"
             ]
         ]
     },
     {
-        "id": "ab5b6203.69a998",
+        "id": "d751d093.92a62",
         "type": "switchNode",
         "name": "switch vpn-binding has src-access-ltp",
         "xml": "<switch test='`$tmp.aai.vpn-binding.src-access-ltp-id`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3149,
-        "y": 1325,
+        "x": 3137,
+        "y": 1346,
         "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "15797e4.5eae102",
-                "55009f8b.9fdc5"
+                "b9609f04.c7afe8",
+                "28e97c84.2c5ab4"
             ]
         ]
     },
     {
-        "id": "15797e4.5eae102",
+        "id": "b9609f04.c7afe8",
         "type": "outcome",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3402,
-        "y": 1359,
+        "x": 3390,
+        "y": 1380,
         "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "4151c132.8e3c28"
+                "ee3de09a.383318"
             ]
         ]
     },
     {
-        "id": "55009f8b.9fdc5",
+        "id": "28e97c84.2c5ab4",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3402,
-        "y": 1303,
+        "x": 3390,
+        "y": 1324,
         "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "db74d7f2.74d0f8"
+                "b80c5827.1a79a"
             ]
         ]
     },
     {
-        "id": "4151c132.8e3c28",
+        "id": "ee3de09a.383318",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3553,
-        "y": 1359,
+        "x": 3541,
+        "y": 1380,
         "z": "8a9c455f.82beb8",
         "wires": []
     },
     {
-        "id": "ad6a538e.8b5998",
+        "id": "8527e1fa.cc6b4",
         "type": "set",
         "name": "set vpn-bindingA and connectivityA",
         "xml": "<set>\n<parameter name='tmp.aai.vpn-bindingA.' value=\"`$tmp.aai.vpn-binding.`\" />\n<parameter name='tmp.aai.connectivityA.' value=\"`$tmp.aai.connectivity.`\" />\n",
         "comments": "",
-        "x": 3856,
-        "y": 110,
+        "x": 3844,
+        "y": 131,
         "z": "8a9c455f.82beb8",
         "wires": []
     },
     {
-        "id": "51807068.f4c68",
+        "id": "615fdc8e.20c4e4",
         "type": "set",
         "name": "set vpn-bindingB and connectivityB",
         "xml": "<set>\n<parameter name='tmp.aai.vpn-bindingB.' value=\"`$tmp.aai.vpn-binding.`\" />\n<parameter name='tmp.aai.connectivityB.' value=\"`$tmp.aai.connectivity.`\" />\n\n",
         "comments": "",
-        "x": 3837,
-        "y": 916,
+        "x": 3825,
+        "y": 937,
         "z": "8a9c455f.82beb8",
         "wires": []
     },
     {
-        "id": "7b04fd35.ba570c",
+        "id": "ddefc1a3.6644c8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 3578,
-        "y": 485,
+        "x": 3566,
+        "y": 506,
         "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "ad6a538e.8b5998",
-                "3d56fd4f.8da4ea",
-                "5074df67.2ba988",
-                "9fd13730.014208",
-                "ab834e.f483fcb",
-                "c9d60073.e2df48",
-                "119d7057.187e9"
+                "8527e1fa.cc6b4",
+                "25e7d332.a761fc",
+                "75d6c996.11aeb",
+                "c824ab5b.360f6",
+                "a96cdedb.06ef48",
+                "616c98c7.f82ea8",
+                "fee47d9.4382e"
             ]
         ]
     },
     {
-        "id": "db74d7f2.74d0f8",
+        "id": "b80c5827.1a79a",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3553,
-        "y": 1302,
+        "x": 3541,
+        "y": 1323,
         "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "51807068.f4c68",
-                "b8f0eb5.a171218",
-                "7af2004a.23f66",
-                "9e8fb92f.dc9c38",
-                "d94b849.7fdac78",
-                "f91c20c6.244a28",
-                "158d95b4.dbf02a"
+                "615fdc8e.20c4e4",
+                "27bc86e9.1c4e52",
+                "2fd670.86d5219",
+                "8581969f.3e9f8",
+                "f8350413.ea8398",
+                "96b5aedc.4196d",
+                "e2e659bb.42dea"
             ]
         ]
     },
     {
-        "id": "f91c20c6.244a28",
+        "id": "96b5aedc.4196d",
         "type": "set",
         "name": "set sotn_value",
-        "xml": "<set>\n<parameter name='eth-service-name' value='`$tmp.aai.connectivityB.connectivity-id`' />\n<parameter name='provider-id' value='`$tmp.aai.connectivityB.access-provider-id`' />\n<parameter name='client-id' value='`$tmp.aai.connectivityB.access-client-id`' />\n<parameter name='topology-id' value='`$tmp.aai.connectivityB.access-topology-id`' />\n<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityB.connectivity-id`' />\n<parameter name='index-number' value='0' />\n<parameter name='eth-node-id' value='`$tmp.aai.connectivityB.access-node-id`' />\n<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityB.access-ltp-id`' />\n",
+        "xml": "<set>\n<!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityB.connectivity-id`' />-->\n<parameter name='eth-service-name' value='`$tmp.aai.connectivityB.etht-svc-name`' />\n<parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />\n<parameter name='provider-id' value='`$tmp.aai.connectivityB.access-provider-id`' />\n<parameter name='client-id' value='`$tmp.aai.connectivityB.access-client-id`' />\n<parameter name='topology-id' value='`$tmp.aai.connectivityB.access-topology-id`' />\n<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityB.connectivity-id`' />\n<parameter name='index-number' value='0' />\n<parameter name='eth-node-id' value='`$tmp.aai.connectivityB.access-node-id`' />\n<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityB.access-ltp-id`' />\n<parameter name='CIR' value='`$tmp.aai.vpn-bindingB.route-distinguisher *1000000`' />\n<parameter name='EIR' value='`$tmp.aai.vpn-bindingB.route-distinguisher *1000000`' />\n",
         "comments": "",
-        "x": 3782,
-        "y": 1445,
+        "x": 3770,
+        "y": 1466,
         "z": "8a9c455f.82beb8",
         "wires": []
     },
     {
-        "id": "158d95b4.dbf02a",
+        "id": "e2e659bb.42dea",
         "type": "execute",
         "name": "execute RestApiCallNode Create ethernet Service without token",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-ethernet-service.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3936,
-        "y": 1493,
+        "x": 3924,
+        "y": 1514,
         "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "7e8ddb70.effbcc",
-                "8eaa1ef7.3644e"
+                "a28581db.fa7cb",
+                "a3f78a52.db8928"
             ]
         ]
     },
     {
-        "id": "7e8ddb70.effbcc",
+        "id": "a28581db.fa7cb",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4281.5,
-        "y": 1474,
+        "x": 4269.5,
+        "y": 1495,
         "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "596967d4.0f4de8"
+                "14523534.ce6de3"
             ]
         ]
     },
     {
-        "id": "8eaa1ef7.3644e",
+        "id": "a3f78a52.db8928",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4285.5,
-        "y": 1514,
+        "x": 4273.5,
+        "y": 1535,
         "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "4f294e9d.697c08"
+                "2e9384b8.e29014"
             ]
         ]
     },
     {
-        "id": "596967d4.0f4de8",
+        "id": "14523534.ce6de3",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create ethernet service rest api\" />\n",
         "comments": "",
-        "x": 4439.5,
-        "y": 1474,
+        "x": 4427.5,
+        "y": 1495,
         "z": "8a9c455f.82beb8",
         "wires": []
     },
     {
-        "id": "4f294e9d.697c08",
+        "id": "2e9384b8.e29014",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4443,
-        "y": 1514,
+        "x": 4431,
+        "y": 1535,
         "z": "8a9c455f.82beb8",
         "wires": [
             [
-                "637a80dd.df05",
-                "d2c33ee2.7a3708"
+                "b54e7482.e242c8",
+                "df1f167a.857918"
             ]
         ]
     },
     {
-        "id": "78a845.7bb187bc",
+        "id": "364ac531.cfcb5a",
         "type": "comment",
         "name": "TODO: FIXME:",
         "info": "put proper values based on connectivity resource retrieved from AAI",
         "comments": "",
-        "x": 3779.5,
-        "y": 1401,
+        "x": 3767.5,
+        "y": 1422,
         "z": "8a9c455f.82beb8",
         "wires": []
     },
     {
-        "id": "637a80dd.df05",
+        "id": "b54e7482.e242c8",
         "type": "save",
         "name": "update vpn-binding B resource (aka. OTN domainB) in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingB.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-bindingB.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-bindingB.vpn-id`' />\n\n<parameter name='operational-status' value='Activated' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 4783,
-        "y": 1513,
+        "x": 4771,
+        "y": 1534,
         "z": "8a9c455f.82beb8",
         "wires": [
             []
         ]
     },
     {
-        "id": "88ec2f6d.8d5da",
+        "id": "68be1db9.7e03ec",
         "type": "comment",
         "name": "TODO: FIXME",
         "info": "use proper vpn-binding id and connectivity\n\nAlso, does CCSDK support \"update\" operation for vpn-binding and connectivity?",
         "comments": "",
-        "x": 4641,
-        "y": 1471,
+        "x": 4629,
+        "y": 1492,
         "z": "8a9c455f.82beb8",
         "wires": []
     },
     {
-        "id": "d2c33ee2.7a3708",
+        "id": "df1f167a.857918",
         "type": "save",
         "name": "update connectivity resource in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.connectivityB.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.connectivityB.connectivity-id`' />\n<parameter name='operational-status' value='Activated' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 4712,
-        "y": 1562,
+        "x": 4700,
+        "y": 1583,
         "z": "8a9c455f.82beb8",
         "wires": [
             []
         ]
     },
     {
-        "id": "a3bb6162.8aa1a8",
+        "id": "57847c7b.2f3dbc",
         "type": "set",
         "name": "set attachment_param for OTN",
         "xml": "<set>\n<parameter name='gfp-n' value='`$tmp.aai.vpn-binding.route-distinguisher`' />\n",
         "comments": "",
-        "x": 3144,
-        "y": 411,
+        "x": 3132,
+        "y": 432,
         "z": "8a9c455f.82beb8",
         "wires": []
     },
     {
-        "id": "b9f32cf4.c94178",
+        "id": "b864657f.9c5a",
         "type": "set",
         "name": "unset tmp.aai.vpn-binding",
         "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value='' />\n",
         "comments": "",
-        "x": 2965,
-        "y": 283,
+        "x": 2953,
+        "y": 304,
         "z": "8a9c455f.82beb8",
         "wires": []
     }
diff --git a/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-allocate.json b/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-allocate.json
index 7a6e77e8..e92f7b29 100644
--- a/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-allocate.json
+++ b/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-allocate.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "8af466c4.459d38",
+        "id": "187a8cd0.b6793b",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 123,
-        "y": 94,
+        "x": 144,
+        "y": 132,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "4f44bc11.1718bc"
+                "5ea5ad17.ee4964"
             ]
         ]
     },
     {
-        "id": "4f44bc11.1718bc",
+        "id": "5ea5ad17.ee4964",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,3488 +22,3518 @@
         "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": 407.2856903076172,
-        "y": 155.23810863494873,
+        "x": 428.2856903076172,
+        "y": 193.23810863494873,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "25a99bf3.257e24"
+                "9dad8fbc.f24f98"
             ]
         ]
     },
     {
-        "id": "25a99bf3.257e24",
+        "id": "9dad8fbc.f24f98",
         "type": "method",
         "name": "method tsli-vnf-topology-operation-trans-slice-allocate",
         "xml": "<method rpc='tsli-vnf-topology-operation-trans-slice-allocate' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 413.42860412597656,
-        "y": 240.00003051757812,
+        "x": 434.42860412597656,
+        "y": 278.0000305175781,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "e0aece26.83282"
+                "ca46cddf.f67038"
             ]
         ]
     },
     {
-        "id": "e0aece26.83282",
+        "id": "ca46cddf.f67038",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 783.238037109375,
-        "y": 264.66668701171875,
+        "x": 804.238037109375,
+        "y": 302.66668701171875,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "19dfd83.33483a8",
-                "1050151b.02ec53",
-                "2f5068f1.5086e8"
+                "506e7f5c.19244",
+                "7c740453.8a159c",
+                "ac58016f.1c2c1"
             ]
         ]
     },
     {
-        "id": "19dfd83.33483a8",
+        "id": "506e7f5c.19244",
         "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": 1084.571533203125,
-        "y": 535.5969848632812,
+        "x": 1105.571533203125,
+        "y": 573.5969848632812,
         "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "1050151b.02ec53",
+        "id": "7c740453.8a159c",
         "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": 1106,
-        "y": 238,
+        "x": 1127,
+        "y": 276,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "50a47283.15fbe4",
-                "b5bb871c.db338",
-                "a61c0811.039808"
+                "78f50d5a.2a0cec",
+                "c34c58a5.11a148",
+                "f82c0a42.39fea8"
             ]
         ]
     },
     {
-        "id": "50a47283.15fbe4",
+        "id": "78f50d5a.2a0cec",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1331,
-        "y": 96,
+        "x": 1352,
+        "y": 134,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "80a63fa0.68596"
+                "dfc9a5db.996c4"
             ]
         ]
     },
     {
-        "id": "b5bb871c.db338",
+        "id": "c34c58a5.11a148",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1340.490966796875,
-        "y": 138.57403564453125,
+        "x": 1361.490966796875,
+        "y": 176.57403564453125,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "d32b21e7.8cada8"
+                "5383933.3cbeeec"
             ]
         ]
     },
     {
-        "id": "a61c0811.039808",
+        "id": "f82c0a42.39fea8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1329,
-        "y": 185,
+        "x": 1350,
+        "y": 223,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "229167e8.df6688"
+                "3912b121.be04f6"
             ]
         ]
     },
     {
-        "id": "80a63fa0.68596",
+        "id": "dfc9a5db.996c4",
         "type": "switchNode",
         "name": "switch allotted-resources_length != 0",
         "xml": "<switch test='`$tmp.aai.service-instance.allotted-resources_length != 0`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1570,
-        "y": 93,
+        "x": 1591,
+        "y": 131,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "d44d65ef.318f48",
-                "e1082721.453ff"
+                "fea7170c.7030f8",
+                "8bbb818c.845db"
             ]
         ]
     },
     {
-        "id": "d32b21e7.8cada8",
+        "id": "5383933.3cbeeec",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 1494.0623779296875,
-        "y": 141.85977172851562,
+        "x": 1515.0623779296875,
+        "y": 179.85977172851562,
         "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "229167e8.df6688",
+        "id": "3912b121.be04f6",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 1498,
-        "y": 186,
+        "x": 1519,
+        "y": 224,
         "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "a49b8769.572b48",
+        "id": "ca7ed950.c4257",
         "type": "set",
         "name": "set the 1st allotted-resource-id",
         "xml": "<set>\n<parameter name='allotted-resource-id' value=\"`$tmp.aai.service-instance.allotted-resources.allotted-resource[0].id`\" />\n\n\n",
         "comments": "",
-        "x": 1969,
-        "y": 160,
+        "x": 1990,
+        "y": 198,
         "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "d44d65ef.318f48",
+        "id": "fea7170c.7030f8",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1783,
-        "y": 117,
+        "x": 1804,
+        "y": 155,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "7234fca3.e71404"
+                "bf993d83.a36c8"
             ]
         ]
     },
     {
-        "id": "e1082721.453ff",
+        "id": "8bbb818c.845db",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1785,
-        "y": 57,
+        "x": 1806,
+        "y": 95,
         "z": "4d37a11.42c136",
         "wires": [
             []
         ]
     },
     {
-        "id": "e3f19b5a.145ff8",
+        "id": "f5ddac6.6343fd",
         "type": "comment",
         "name": "new for TransportSlicing",
         "info": "",
         "comments": "",
-        "x": 1085,
-        "y": 126,
+        "x": 1106,
+        "y": 164,
         "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "7234fca3.e71404",
+        "id": "bf993d83.a36c8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1768,
-        "y": 205,
+        "x": 1789,
+        "y": 243,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "a49b8769.572b48",
-                "bd4dde9a.1bdbc8"
+                "ca7ed950.c4257",
+                "78e29884.225c08"
             ]
         ]
     },
     {
-        "id": "fcc70311.f003c",
+        "id": "50cd8b4c.3fbe34",
         "type": "set",
         "name": "set network-route-A",
         "xml": "<set>\n<parameter name='network-route-A' value=\"`$tmp.aai.logical-link.link-name`\" />\n\n\n",
         "comments": "",
-        "x": 2330,
-        "y": 803,
+        "x": 2370,
+        "y": 822,
         "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "409bbb6d.55b47c",
+        "id": "4f854478.eff1a4",
         "type": "set",
         "name": "set network-route-B",
         "xml": "<set>\n<parameter name='network-route-B' value=\"`$tmp.aai.logical-link.link-name2`\" />\n\n\n",
         "comments": "",
-        "x": 2332,
-        "y": 854,
+        "x": 2371,
+        "y": 877,
         "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "bd4dde9a.1bdbc8",
+        "id": "78e29884.225c08",
         "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": 1972,
-        "y": 235,
+        "x": 1993,
+        "y": 273,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "4f2f09b0.4a4f9",
-                "a509e8e5.13e7a8",
-                "2d1dc418.c3457c"
+                "e80669a1.e9e15",
+                "2a720603.9816ea",
+                "13ab43c3.0c3b8c"
             ]
         ]
     },
     {
-        "id": "4f2f09b0.4a4f9",
+        "id": "e80669a1.e9e15",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2188,
-        "y": 302,
+        "x": 2209,
+        "y": 340,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "2c4c53ed.c92a04"
+                "14dca185.e1b46e"
             ]
         ]
     },
     {
-        "id": "a509e8e5.13e7a8",
+        "id": "2a720603.9816ea",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2188.490966796875,
-        "y": 201.573974609375,
+        "x": 2209.490966796875,
+        "y": 239.573974609375,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "b0eb4825.a76068"
+                "e741b978.cc2c38"
             ]
         ]
     },
     {
-        "id": "2d1dc418.c3457c",
+        "id": "13ab43c3.0c3b8c",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2184,
-        "y": 251,
+        "x": 2205,
+        "y": 289,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "8d5abfeb.01e9e"
+                "b16bf403.baad58"
             ]
         ]
     },
     {
-        "id": "b0eb4825.a76068",
+        "id": "e741b978.cc2c38",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 2366.0625,
-        "y": 201.8597412109375,
+        "x": 2387.0625,
+        "y": 239.8597412109375,
         "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "8d5abfeb.01e9e",
+        "id": "b16bf403.baad58",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 2366,
-        "y": 251,
+        "x": 2387,
+        "y": 289,
         "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "abb2414c.5ad6c8",
+        "id": "6e843ab.3582ec4",
         "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": 1707,
-        "y": 724,
+        "x": 1728,
+        "y": 762,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "adf5b844.beeba",
-                "12473ca6.c43deb",
-                "1c108294.607cad"
+                "a6a55952.b90f",
+                "4070a4d0.4176d4",
+                "60c71e39.2f942"
             ]
         ]
     },
     {
-        "id": "12473ca6.c43deb",
+        "id": "4070a4d0.4176d4",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1998.490966796875,
-        "y": 702.573974609375,
+        "x": 2019.490966796875,
+        "y": 740.573974609375,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "bde422ea.a4cc28"
+                "77c211be.bc11e8"
             ]
         ]
     },
     {
-        "id": "1c108294.607cad",
+        "id": "60c71e39.2f942",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1987,
-        "y": 747,
+        "x": 2008,
+        "y": 785,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "da8d3db8.78e6c"
+                "fbd7810f.a3734"
             ]
         ]
     },
     {
-        "id": "bde422ea.a4cc28",
+        "id": "77c211be.bc11e8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 2147.0625,
-        "y": 702.8597412109375,
+        "x": 2168.0625,
+        "y": 740.8597412109375,
         "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "da8d3db8.78e6c",
+        "id": "fbd7810f.a3734",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 2146,
-        "y": 747,
+        "x": 2167,
+        "y": 785,
         "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "adf5b844.beeba",
+        "id": "a6a55952.b90f",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1994,
-        "y": 826,
+        "x": 2015,
+        "y": 864,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "b6fe1d93.64f5d8"
+                "22d259e0.d6e2e6"
             ]
         ]
     },
     {
-        "id": "b6fe1d93.64f5d8",
+        "id": "22d259e0.d6e2e6",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2133,
-        "y": 826,
+        "x": 2154,
+        "y": 864,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "fcc70311.f003c",
-                "409bbb6d.55b47c",
-                "34d7360f.96bb2a",
-                "48146421.80a074",
-                "31bc0e97.d1b352",
-                "c57c6aeb.0d49c",
-                "5ce97afb.25ecd4",
-                "1f2f2fca.dd946",
-                "fc0327f0.f229c8",
-                "7a9db702.f0e1b",
-                "1f17f018.71ce48",
-                "75da5f28.16fb78",
-                "15d01a88.67da65",
-                "8335f76.9af8388",
-                "47a3a765.16faa",
-                "5651ec55.50184c",
-                "edb297b0.c9f328",
-                "91eba2f3.844de"
+                "50cd8b4c.3fbe34",
+                "4f854478.eff1a4",
+                "14a4c097.be654f",
+                "644a5f8e.b0774",
+                "79e86730.1965c8",
+                "4f1b84d7.aafb5c",
+                "7ca2c5af.473d34",
+                "28a40435.4178ec",
+                "b46ca414.99697",
+                "57fdafb2.9eec08",
+                "260f00b5.585908",
+                "134248ca.e0fa77",
+                "fc2a7bf0.e878b",
+                "a5814717.4b953",
+                "84749d0f.3038c8",
+                "39b144a2.fc3a7c",
+                "21292318.735edc",
+                "ce066c5d.e7734",
+                "c19c2198.0de5c",
+                "303c5717.c426f"
             ]
         ]
     },
     {
-        "id": "34d7360f.96bb2a",
+        "id": "14a4c097.be654f",
         "type": "save",
         "name": "get network-route-A from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-route\"\n\tkey='network-route.route-id = $network-route-A'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-route-A\">",
         "comments": "",
         "outputs": 1,
-        "x": 2362,
-        "y": 907,
+        "x": 2383,
+        "y": 945,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "1b983b4f.2c744d",
-                "83f9f068.59488",
-                "b0f14e34.bcfcc8"
+                "7df96ca0.99ecc4",
+                "50b0a0cb.3236a8",
+                "a3437ac7.e0ee1"
             ]
         ]
     },
     {
-        "id": "48146421.80a074",
+        "id": "644a5f8e.b0774",
         "type": "save",
         "name": "get network-route-B from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"network-route\"\n\tkey='network-route.route-id = $network-route-B'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.network-route-B\">",
         "comments": "",
         "outputs": 1,
-        "x": 2341,
-        "y": 1508.9998779296875,
+        "x": 2362,
+        "y": 1546.9998779296875,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "191b0cc5.853723",
-                "bdfa4737.7997e",
-                "3dcbfde4.8fdb42"
+                "ece670c3.4f34a8",
+                "263c76fe.5b3242",
+                "97139121.0331f8"
             ]
         ]
     },
     {
-        "id": "1b983b4f.2c744d",
+        "id": "7df96ca0.99ecc4",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2563,
-        "y": 791,
+        "x": 2584,
+        "y": 829,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "5a65addc.f9d584"
+                "a6fc1138.23945"
             ]
         ]
     },
     {
-        "id": "83f9f068.59488",
+        "id": "50b0a0cb.3236a8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2558.509033203125,
-        "y": 840.426025390625,
+        "x": 2579.509033203125,
+        "y": 878.426025390625,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "60568789.b01d3"
+                "6e6d0210.60f404"
             ]
         ]
     },
     {
-        "id": "b0f14e34.bcfcc8",
+        "id": "a3437ac7.e0ee1",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2562.509033203125,
-        "y": 891.426025390625,
+        "x": 2583.509033203125,
+        "y": 929.426025390625,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "4d860946.d83b4"
+                "d860cdb2.412c48"
             ]
         ]
     },
     {
-        "id": "5a65addc.f9d584",
+        "id": "a6fc1138.23945",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 2711.571533203125,
-        "y": 790.2857666015625,
+        "x": 2732.571533203125,
+        "y": 828.2857666015625,
         "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "60568789.b01d3",
+        "id": "6e6d0210.60f404",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 2701.509033203125,
-        "y": 840.426025390625,
+        "x": 2722.509033203125,
+        "y": 878.426025390625,
         "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "191b0cc5.853723",
+        "id": "ece670c3.4f34a8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2564,
-        "y": 1478.9998779296875,
+        "x": 2585,
+        "y": 1516.9998779296875,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "63b24300.9bd254"
+                "f4c07ea8.414868"
             ]
         ]
     },
     {
-        "id": "bdfa4737.7997e",
+        "id": "263c76fe.5b3242",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2559.509033203125,
-        "y": 1528.4259033203125,
+        "x": 2580.509033203125,
+        "y": 1566.4259033203125,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "f56e5adb.9f7af8"
+                "ce13d349.caf3b8"
             ]
         ]
     },
     {
-        "id": "3dcbfde4.8fdb42",
+        "id": "97139121.0331f8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2563.509033203125,
-        "y": 1579.4259033203125,
+        "x": 2584.509033203125,
+        "y": 1617.4259033203125,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "b596324f.8c351"
+                "d30e3d8d.09cef8"
             ]
         ]
     },
     {
-        "id": "63b24300.9bd254",
+        "id": "f4c07ea8.414868",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 2712.571533203125,
-        "y": 1478.28564453125,
+        "x": 2733.571533203125,
+        "y": 1516.28564453125,
         "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "f56e5adb.9f7af8",
+        "id": "ce13d349.caf3b8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 2702.509033203125,
-        "y": 1528.4259033203125,
+        "x": 2723.509033203125,
+        "y": 1566.4259033203125,
         "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "f08611d.e85e5f",
+        "id": "e31af50c.926d2",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3376.66650390625,
-        "y": 935,
+        "x": 3397.66650390625,
+        "y": 973,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "bcee177.eb94168",
-                "f75d67.7cccfa98",
-                "a4c22219.803cd8",
-                "d6e02ca6.c9a8c8",
-                "5b5222c9.d7a36c"
+                "c203b1ea.86f6c",
+                "d4cb3bd3.a349c8",
+                "5d25d92f.6f798",
+                "a5aee8f6.ab5e58",
+                "c830d981.aee038"
             ]
         ]
     },
     {
-        "id": "8b31e4a0.a10748",
+        "id": "b7824d8a.d2e4f8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3204,
-        "y": 936,
+        "x": 3225,
+        "y": 974,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "f08611d.e85e5f"
+                "e31af50c.926d2"
             ]
         ]
     },
     {
-        "id": "c9553d7.4a532c",
+        "id": "5d5b9681.b7598",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3213.490966796875,
-        "y": 978.5740356445312,
+        "x": 3234.490966796875,
+        "y": 1016.5740356445312,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "b569fb01.0907f8"
+                "4fc1bcc7.eeb784"
             ]
         ]
     },
     {
-        "id": "cf1d45bd.26226",
+        "id": "6e8be76c.59d528",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3202,
-        "y": 1025,
+        "x": 3223,
+        "y": 1063,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "8595bfe0.610eb"
+                "ac4a57cf.bef8e8"
             ]
         ]
     },
     {
-        "id": "b569fb01.0907f8",
+        "id": "4fc1bcc7.eeb784",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 3367.0623779296875,
-        "y": 981.8597717285156,
+        "x": 3388.0623779296875,
+        "y": 1019.8597717285156,
         "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "8595bfe0.610eb",
+        "id": "ac4a57cf.bef8e8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3371,
-        "y": 1026,
+        "x": 3392,
+        "y": 1064,
         "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "4d860946.d83b4",
+        "id": "d860cdb2.412c48",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2724,
-        "y": 893,
+        "x": 2745,
+        "y": 931,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "de6bae96.a20288",
-                "2546bd9f.525272"
+                "62113903.77ec78",
+                "c9fe9947.c06348"
             ]
         ]
     },
     {
-        "id": "b596324f.8c351",
+        "id": "d30e3d8d.09cef8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2714,
-        "y": 1580.9998779296875,
+        "x": 2735,
+        "y": 1618.9998779296875,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "cc046399.813d8",
-                "94119745.c4be9"
+                "4ecc6dae.def654",
+                "669a0eda.d8f578"
             ]
         ]
     },
     {
-        "id": "d0ee2422.3da6b8",
+        "id": "a1006da4.a872e",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3344.66650390625,
-        "y": 1771,
+        "x": 3365.66650390625,
+        "y": 1809,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "1c0836ef.f83329",
-                "4c626db2.041e5c",
-                "a8a1220c.849508",
-                "46fb3252.5c32c4",
-                "3da30ce3.e252e4"
+                "a3aca2eb.21f5a8",
+                "d3723bfd.d9b168",
+                "d3c0c42f.4b437",
+                "2512774e.7c83b8",
+                "d281a70f.336618"
             ]
         ]
     },
     {
-        "id": "33a31a8c.e3b546",
+        "id": "c9dbe459.2e8d58",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3172,
-        "y": 1772,
+        "x": 3193,
+        "y": 1810,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "d0ee2422.3da6b8"
+                "a1006da4.a872e"
             ]
         ]
     },
     {
-        "id": "333e39a9.5e6146",
+        "id": "dab2f9a8.cea26",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3181.490966796875,
-        "y": 1814.5740356445312,
+        "x": 3202.490966796875,
+        "y": 1852.5740356445312,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "c1fc954e.de2348"
+                "6f793776.f883f"
             ]
         ]
     },
     {
-        "id": "18c9eff6.77ede8",
+        "id": "f5d094cc.fe5d68",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3170,
-        "y": 1861,
+        "x": 3191,
+        "y": 1899,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "a54283a5.d344c"
+                "f383fe68.3b83"
             ]
         ]
     },
     {
-        "id": "c1fc954e.de2348",
+        "id": "6f793776.f883f",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 3335.0623779296875,
-        "y": 1817.8597717285156,
+        "x": 3356.0623779296875,
+        "y": 1855.8597717285156,
         "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "a54283a5.d344c",
+        "id": "f383fe68.3b83",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3339,
-        "y": 1862,
+        "x": 3360,
+        "y": 1900,
         "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "bcee177.eb94168",
+        "id": "c203b1ea.86f6c",
         "type": "execute",
         "name": "execute split tp-id to get pnf-name",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-A.p-interface-src.interface-name`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainA\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 3641,
-        "y": 919,
+        "x": 3662,
+        "y": 957,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "60be6e60.f9ecc8",
-                "ba14138e.5a08c8"
+                "6fb08f41.de4d4",
+                "183e3f66.48a0d1"
             ]
         ]
     },
     {
-        "id": "ba14138e.5a08c8",
+        "id": "183e3f66.48a0d1",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3864,
-        "y": 874,
+        "x": 3885,
+        "y": 912,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "9427c16f.fe3b38"
+                "e55834d1.3ca1b8"
             ]
         ]
     },
     {
-        "id": "60be6e60.f9ecc8",
+        "id": "6fb08f41.de4d4",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3866,
-        "y": 938,
+        "x": 3887,
+        "y": 976,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "8f5282b4.e9d138"
+                "f45e344f.88a748"
             ]
         ]
     },
     {
-        "id": "9e9c487d.182678",
+        "id": "5bf466f.7bcdb98",
         "type": "set",
         "name": "set ltpId",
         "xml": "<set>\n<parameter name='tmp.src.ltpId' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n",
         "comments": "",
-        "x": 4199,
-        "y": 832,
+        "x": 4220,
+        "y": 870,
         "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "8f5282b4.e9d138",
+        "id": "f45e344f.88a748",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
         "comments": "",
-        "x": 4028,
-        "y": 934,
+        "x": 4049,
+        "y": 972,
         "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "9427c16f.fe3b38",
+        "id": "e55834d1.3ca1b8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4029,
-        "y": 871,
+        "x": 4050,
+        "y": 909,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "7be29fde.94965",
-                "9e9c487d.182678"
+                "194d0d3d.11557b",
+                "5bf466f.7bcdb98"
             ]
         ]
     },
     {
-        "id": "7be29fde.94965",
+        "id": "194d0d3d.11557b",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.src.pnf-name' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n",
         "comments": "",
-        "x": 4200,
-        "y": 937,
+        "x": 4221,
+        "y": 975,
         "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "305634db.acff34",
+        "id": "dd1a9ea9.6d631",
         "type": "comment",
         "name": "TODO: FIXME",
         "info": "using the output of regex string arrays,\nconcatinate index 0 to index[length-2] all together\nin order to assemble the correct pnf-name",
         "comments": "",
-        "x": 4201,
-        "y": 886,
+        "x": 4222,
+        "y": 924,
         "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "a4c22219.803cd8",
+        "id": "5d25d92f.6f798",
         "type": "save",
         "name": "save connectivity resource in AAI",
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n<parameter name='cvlan' value='' />\n\n<parameter name='bandwidth-profile-name' value='`$prop.sotn.etht-svc-name`' />\n<parameter name='vpn-type' value='`$prop.sotn.vpnType`' />\n<parameter name='CIR' value='`$prop.sotn.cir`' />\n<parameter name='EIR' value='`$prop.sotn.eir`' />\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",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>\n<parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n<parameter name='cvlan' value='' />\n\n<parameter name='bandwidth-profile-name' value='`$prop.sotn.etht-svc-name`' />\n<parameter name='vpn-type' value='`$prop.sotn.vpnType`' />\n<parameter name='CIR' value='`$prop.sotn.cir`' />\n<parameter name='EIR' value='`$prop.sotn.eir`' />\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": 3643,
-        "y": 1078,
+        "x": 3664,
+        "y": 1116,
         "z": "4d37a11.42c136",
         "wires": [
             []
         ]
     },
     {
-        "id": "f75d67.7cccfa98",
+        "id": "d4cb3bd3.a349c8",
         "type": "execute",
         "name": "execute UUID generator for connectivity domainA",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"uuid.connectivity-domainA-uuid\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3688,
-        "y": 988,
+        "x": 3709,
+        "y": 1026,
         "z": "4d37a11.42c136",
         "wires": [
             []
         ]
     },
     {
-        "id": "51860532.882634",
+        "id": "6324b9d6.c58fe",
         "type": "comment",
         "name": "TODO: FIXME",
         "info": "using the output of regex string arrays,\nconcatinate index 0 to index[?] all together\nin order to assemble the correct values for provider-id, \ntopology-id, node-id, etc.",
         "comments": "",
-        "x": 3577,
-        "y": 1029,
+        "x": 3598,
+        "y": 1067,
         "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "1c0836ef.f83329",
+        "id": "a3aca2eb.21f5a8",
         "type": "execute",
         "name": "execute split tp-id to get pnf-name",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-B.p-interface-dst.interface-name`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainB\"/>\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 3631,
-        "y": 1775.0001220703125,
+        "x": 3652,
+        "y": 1813.0001220703125,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "9b737b83.c6ca88",
-                "22a6cd9c.81b312"
+                "37186f70.3d57",
+                "4ffb9846.2cd768"
             ]
         ]
     },
     {
-        "id": "22a6cd9c.81b312",
+        "id": "4ffb9846.2cd768",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3854,
-        "y": 1730.0001220703125,
+        "x": 3875,
+        "y": 1768.0001220703125,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "f2364b58.93416"
+                "17371f4a.955d61"
             ]
         ]
     },
     {
-        "id": "9b737b83.c6ca88",
+        "id": "37186f70.3d57",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3856,
-        "y": 1794.0001220703125,
+        "x": 3877,
+        "y": 1832.0001220703125,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "e81f51e1.476528"
+                "1981566c.49d212"
             ]
         ]
     },
     {
-        "id": "c355fa60.d02f7",
+        "id": "17f707eb.a2a908",
         "type": "set",
         "name": "set ltpId",
         "xml": "<set>\n<parameter name='tmp.dst.ltpId' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\n",
         "comments": "",
-        "x": 4189,
-        "y": 1688.0001220703125,
+        "x": 4210,
+        "y": 1726.0001220703125,
         "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "e81f51e1.476528",
+        "id": "1981566c.49d212",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
         "comments": "",
-        "x": 4015,
-        "y": 1813.0001220703125,
+        "x": 4036,
+        "y": 1851.0001220703125,
         "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "f2364b58.93416",
+        "id": "17371f4a.955d61",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4019,
-        "y": 1727.0001220703125,
+        "x": 4040,
+        "y": 1765.0001220703125,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "c355fa60.d02f7",
-                "fbcef05a.30da7"
+                "17f707eb.a2a908",
+                "ca2d1022.cf4e88"
             ]
         ]
     },
     {
-        "id": "fbcef05a.30da7",
+        "id": "ca2d1022.cf4e88",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.dst.pnf-name' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n",
         "comments": "",
-        "x": 4190,
-        "y": 1793.0001220703125,
+        "x": 4211,
+        "y": 1831.0001220703125,
         "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "5702bff2.1c714",
+        "id": "8cfd8f17.95a8e",
         "type": "comment",
         "name": "TODO: FIXME",
         "info": "using the output of regex string arrays,\nconcatinate index 0 to index[length-2] all together\nin order to assemble the correct pnf-name",
         "comments": "",
-        "x": 4185,
-        "y": 1742.0001220703125,
+        "x": 4206,
+        "y": 1780.0001220703125,
         "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "a8a1220c.849508",
+        "id": "d3c0c42f.4b437",
         "type": "save",
         "name": "save connectivity resource in AAI",
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainB-uuid`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\n<parameter name='cvlan' value='' />\n\n\n<parameter name='bandwidth-profile-name' value='`$prop.sotn.etht-svc-name`' />\n<parameter name='vpn-type' value='`$prop.sotn.vpnType`' />\n<parameter name='CIR' value='`$prop.sotn.cir`' />\n<parameter name='EIR' value='`$prop.sotn.eir`' />\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",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainB-uuid`' />\n<parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />\n<parameter name='operational-status' value='Created' />\n<parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />\n<parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />\n<parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />\n<parameter name='access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n<parameter name='access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\n<parameter name='cvlan' value='' />\n\n\n<parameter name='bandwidth-profile-name' value='`$prop.sotn.etht-svc-name`' />\n<parameter name='vpn-type' value='`$prop.sotn.vpnType`' />\n<parameter name='CIR' value='`$prop.sotn.cir`' />\n<parameter name='EIR' value='`$prop.sotn.eir`' />\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": 3633,
-        "y": 1934.0001220703125,
+        "x": 3654,
+        "y": 1972.0001220703125,
         "z": "4d37a11.42c136",
         "wires": [
             []
         ]
     },
     {
-        "id": "4c626db2.041e5c",
+        "id": "d3723bfd.d9b168",
         "type": "execute",
         "name": "execute UUID generator for connectivity domainB",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.connectivity-domainB-uuid\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3678,
-        "y": 1844.0001220703125,
+        "x": 3699,
+        "y": 1882.0001220703125,
         "z": "4d37a11.42c136",
         "wires": [
             []
         ]
     },
     {
-        "id": "a742fa6d.53c048",
+        "id": "1765f0ec.e922ff",
         "type": "comment",
         "name": "TODO: FIXME",
         "info": "using the output of regex string arrays,\nconcatinate index 0 to index[?] all together\nin order to assemble the correct values for provider-id, \ntopology-id, node-id, etc.",
         "comments": "",
-        "x": 3567,
-        "y": 1882.0001220703125,
+        "x": 3588,
+        "y": 1920.0001220703125,
         "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "31bc0e97.d1b352",
+        "id": "79e86730.1965c8",
         "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": 2542,
-        "y": 2009,
+        "x": 2563,
+        "y": 2047,
         "z": "4d37a11.42c136",
         "wires": [
             []
         ]
     },
     {
-        "id": "c57c6aeb.0d49c",
+        "id": "4f1b84d7.aafb5c",
         "type": "set",
         "name": "set attachment_param",
         "xml": "<set>\n<parameter name='prop.connection-attachment.access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />\n<parameter name='prop.connection-attachment.access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />\n<parameter name='prop.connection-attachment.access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />\n<parameter name='prop.connection-attachment.access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='prop.connection-attachment.access-ltp-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -1]`' />\n\n<parameter name='prop.remote.connection-attachment.access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />\n<parameter name='prop.remote.connection-attachment.access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />\n<parameter name='prop.remote.connection-attachment.access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />\n<parameter name='prop.remote.connection-attachment.access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n<parameter name='prop.remote.connection-attachment.access-ltp-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -1]`' />\n\n<!--<parameter name='prop.remote.connection-attachment.access-provider-id' value='`$oof.vpn.access-provider-id`' />-->\n<!--<parameter name='prop.remote.connection-attachment.access-client-id' value='`$oof.vpn.access-client-id`' />-->\n<!--<parameter name='prop.remote.connection-attachment.access-topology-id' value='`$oof.vpn.access-topology-id`' />-->\n<!--<parameter name='prop.remote.connection-attachment.access-node-id' value='`$oof.vpn.access-node-id`' />-->\n<!--<parameter name='prop.remote.connection-attachment.access-ltp-id' value='`$oof.vpn.src-access-ltp-id`' />-->\n",
         "comments": "",
-        "x": 2336,
-        "y": 1949,
+        "x": 2357,
+        "y": 1987,
         "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "df325b41.3eb068",
+        "id": "3db83432.384b6c",
         "type": "comment",
         "name": "TODO: FIXME",
         "info": "put proper values for src topology-id, node-id, ltp-id, etc (in domain A)\nand dst topology-id, node-id, ltp-id, etc (in domain B)",
         "comments": "",
-        "x": 2310,
-        "y": 1902,
+        "x": 2331,
+        "y": 1940,
         "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "5ce97afb.25ecd4",
+        "id": "7ca2c5af.473d34",
         "type": "save",
         "name": "save vpn-binding A resource (aka. OTN domainA) in AAI",
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-domainA-uuid' >\n<parameter name='vpn-id' value='`$prop.vpn-binding-domainA-uuid`' />\n<parameter name='vpn-name' value='`$prop.vpn-binding-domainA-uuid`' />\n<parameter name='access-provider-id' value='`$domain-A.provider-id`' />\n<!--<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />-->\n<parameter name='access-client-id' value='`$domain-A.client-id`' />\n<!--<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />-->\n<parameter name='access-topology-id' value='`$domain-A.te-topo-id`' />\n<!--<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />-->\n<parameter name='src-access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<!--<parameter name='src-access-ltp-id' value='`$source.tunnel-tp-id`' />-->\n<parameter name='src-access-ltp-id' value='' />\n<parameter name='dst-access-node-id' value='`$domain-A.node-id`' />\n<parameter name='dst-access-ltp-id' value='`$domain-A.tunnel-tp-id`' />\n<parameter name='route-distinguisher' value='`$gfp`' />\n<parameter name='vpn-type' value='`$prop.global.sotn.vpnType`' />\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",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-domainA-uuid' >\n<parameter name='vpn-id' value='`$prop.vpn-binding-domainA-uuid`' />\n<parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />\n<parameter name='access-provider-id' value='`$domain-A.provider-id`' />\n<!--<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />-->\n<parameter name='access-client-id' value='`$domain-A.client-id`' />\n<!--<parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />-->\n<parameter name='access-topology-id' value='`$domain-A.te-topo-id`' />\n<!--<parameter name='access-topology-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -5]`' />-->\n<parameter name='src-access-node-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<!--<parameter name='src-access-ltp-id' value='`$source.tunnel-tp-id`' />-->\n<parameter name='src-access-ltp-id' value='' />\n<parameter name='dst-access-node-id' value='`$domain-A.node-id`' />\n<parameter name='dst-access-ltp-id' value='`$domain-A.tunnel-tp-id`' />\n<parameter name='route-distinguisher' value='`$gfp`' />\n<parameter name='vpn-type' value='`$prop.global.sotn.vpnType`' />\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",
         "comments": "",
         "outputs": 1,
-        "x": 2418,
-        "y": 2168,
+        "x": 2439,
+        "y": 2206,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "265fc651.8685d2"
+                "57191dce.959cfc"
             ]
         ]
     },
     {
-        "id": "1f2f2fca.dd946",
+        "id": "28a40435.4178ec",
         "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-domainA-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": 2421.5,
-        "y": 2238,
+        "x": 2442.5,
+        "y": 2276,
         "z": "4d37a11.42c136",
         "wires": [
             []
         ]
     },
     {
-        "id": "47b16974.ba7ff8",
+        "id": "82428356.c63018",
         "type": "save",
         "name": "save srcLTP relationship in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $tmp.vpnName' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"p-interface\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/pnfs/pnf/' + $oof.vpn.access-node-id + '/p-interfaces/p-interface/' + $src-ltpId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"p-interface.interface-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$src-ltpId`\" />\n\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 3069.5,
-        "y": 2157,
+        "x": 3090.5,
+        "y": 2195,
         "z": "4d37a11.42c136",
         "wires": [
             []
         ]
     },
     {
-        "id": "45a1ff6d.febe7",
+        "id": "356966b3.03f20a",
         "type": "save",
         "name": "save dstLTP relationship in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $tmp.vpnName' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"p-interface\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/pnfs/pnf/' + $oof.vpn.access-node-id + '/p-interfaces/p-interface/' + $dst-ltpId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"p-interface.interface-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$dst-ltpId`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 3071.5,
-        "y": 2196,
+        "x": 3092.5,
+        "y": 2234,
         "z": "4d37a11.42c136",
         "wires": [
             []
         ]
     },
     {
-        "id": "d6e02ca6.c9a8c8",
+        "id": "a5aee8f6.ab5e58",
         "type": "save",
         "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $uuid.connectivity-domainA-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$uuid.connectivity-domainA-uuid`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
         "comments": "",
         "outputs": 1,
-        "x": 3771,
-        "y": 1126,
+        "x": 3792,
+        "y": 1164,
         "z": "4d37a11.42c136",
         "wires": [
             []
         ]
     },
     {
-        "id": "46fb3252.5c32c4",
+        "id": "2512774e.7c83b8",
         "type": "save",
         "name": "save TNNSSI (transport service instance) relationship to connectivity in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' \n      key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.connectivity-domainB-uuid`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.connectivity-domainB-uuid`\" />\n\n\n<!--<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance:relationship-list' -->\n<!--      key='service-instance.service-instance-id = $service-data.service-information.service-instance-id -->\n<!--         AND customer.global-customer-id = $service-data.networks.network[$nidx].network-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.networks.network[$nidx].network-data.service-information.subscription-service-type' -->\n<!--      force=\"true\" pfx=\"tmp.AnAI-data\">-->\n<!--<parameter name=\"relationship-list.relationship[0].related-to\" value=\"connectivity\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/connectivities/connectivity/' + $prop.sotn.network-id`\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"connectivity.connectivity-id\" />-->\n<!--<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$prop.sotn.network-id`\" />-->",
         "comments": "",
         "outputs": 1,
-        "x": 3760,
-        "y": 1999.0001220703125,
+        "x": 3781,
+        "y": 2037.0001220703125,
         "z": "4d37a11.42c136",
         "wires": [
             []
         ]
     },
     {
-        "id": "265fc651.8685d2",
+        "id": "57191dce.959cfc",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2718,
-        "y": 2175,
+        "x": 2739,
+        "y": 2213,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "adcdcd16.7b29a8"
+                "dcb72301.82c018"
             ]
         ]
     },
     {
-        "id": "adcdcd16.7b29a8",
+        "id": "dcb72301.82c018",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2858.500244140625,
-        "y": 2176.25390625,
+        "x": 2879.500244140625,
+        "y": 2214.25390625,
         "z": "4d37a11.42c136",
         "wires": [
             []
         ]
     },
     {
-        "id": "4042eea1.42325",
+        "id": "6975c99d.325498",
         "type": "comment",
         "name": "TODO: FIXME: do we need this relationship?",
         "info": "",
         "comments": "",
-        "x": 3106,
-        "y": 2116,
+        "x": 3127,
+        "y": 2154,
         "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "8bb65fc7.c411f",
+        "id": "e85b69e.5211998",
         "type": "comment",
         "name": "TODO: FIXME: put proper values",
         "info": "",
         "comments": "",
-        "x": 2385,
-        "y": 2128,
+        "x": 2406,
+        "y": 2166,
         "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "fc0327f0.f229c8",
+        "id": "b46ca414.99697",
         "type": "save",
         "name": "save vpn-binding B resource (aka. OTN domainB) in AAI",
-        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-domainB-uuid' >\n<parameter name='vpn-id' value='`$prop.vpn-binding-domainB-uuid`' />\n<parameter name='vpn-name' value='`$prop.vpn-binding-domainB-uuid`' />\n<parameter name='access-provider-id' value='`$domain-B.provider-id`' />\n<!--<parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />-->\n<parameter name='access-client-id' value='`$domain-B.client-id`' />\n<!--<parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />-->\n<parameter name='access-topology-id' value='`$domain-B.te-topo-id`' />\n<!--<parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />-->\n<parameter name='src-access-node-id' value='`$domain-B.node-id`' />\n<parameter name='src-access-ltp-id' value='`$domain-B.tunnel-tp-id`' />\n<parameter name='dst-access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n<!--<parameter name='dst-access-ltp-id' value='`$destination.tunnel-tp-id`' />-->\n<parameter name='dst-access-ltp-id' value='' />\n<parameter name='route-distinguisher' value='`$gfp`' />\n<parameter name='vpn-type' value='`$prop.global.sotn.vpnType`' />\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",
+        "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $prop.vpn-binding-domainB-uuid' >\n<parameter name='vpn-id' value='`$prop.vpn-binding-domainB-uuid`' />\n<parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />\n<parameter name='access-provider-id' value='`$domain-B.provider-id`' />\n<!--<parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />-->\n<parameter name='access-client-id' value='`$domain-B.client-id`' />\n<!--<parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />-->\n<parameter name='access-topology-id' value='`$domain-B.te-topo-id`' />\n<!--<parameter name='access-topology-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -5]`' />-->\n<parameter name='src-access-node-id' value='`$domain-B.node-id`' />\n<parameter name='src-access-ltp-id' value='`$domain-B.tunnel-tp-id`' />\n<parameter name='dst-access-node-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n<!--<parameter name='dst-access-ltp-id' value='`$destination.tunnel-tp-id`' />-->\n<parameter name='dst-access-ltp-id' value='' />\n<parameter name='route-distinguisher' value='`$gfp`' />\n<parameter name='vpn-type' value='`$prop.global.sotn.vpnType`' />\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",
         "comments": "",
         "outputs": 1,
-        "x": 2421,
-        "y": 2456,
+        "x": 2442,
+        "y": 2494,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "a95bb5bd.f30938"
+                "e64b3d38.e980a"
             ]
         ]
     },
     {
-        "id": "54e84a72.0a1bec",
+        "id": "58f4ff2f.89d75",
         "type": "comment",
         "name": "TODO: FIXME: do we need this relationship?",
         "info": "",
         "comments": "",
-        "x": 3109,
-        "y": 2396,
+        "x": 3130,
+        "y": 2434,
         "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "5ffd7140.0fcf",
+        "id": "cad39d05.aea5f",
         "type": "save",
         "name": "save srcLTP relationship in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $tmp.vpnName' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"p-interface\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/pnfs/pnf/' + $oof.vpn.access-node-id + '/p-interfaces/p-interface/' + $src-ltpId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"p-interface.interface-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$src-ltpId`\" />\n\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 3072.5,
-        "y": 2437,
+        "x": 3093.5,
+        "y": 2475,
         "z": "4d37a11.42c136",
         "wires": [
             []
         ]
     },
     {
-        "id": "d209c7d6.5be38",
+        "id": "489163b9.d640b4",
         "type": "save",
         "name": "save dstLTP relationship in AAI",
         "xml": "<save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding:relationship-list' \n      key='vpn-binding.vpn-id = $tmp.vpnName' \n      force=\"true\" pfx=\"tmp.AnAI-data\">\n<parameter name=\"relationship-list.relationship[0].related-to\" value=\"p-interface\" />\n<parameter name=\"relationship-list.relationship[0].related-link\" value=\"`'/network/pnfs/pnf/' + $oof.vpn.access-node-id + '/p-interfaces/p-interface/' + $dst-ltpId`\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-key\" value=\"p-interface.interface-name\" />\n<parameter name=\"relationship-list.relationship[0].relationship-data[0].relationship-value\" value=\"`$dst-ltpId`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 3074.5,
-        "y": 2476,
+        "x": 3095.5,
+        "y": 2514,
         "z": "4d37a11.42c136",
         "wires": [
             []
         ]
     },
     {
-        "id": "92281260.0bacb8",
+        "id": "d0ea482.a9901b8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2861.500244140625,
-        "y": 2456.25390625,
+        "x": 2882.500244140625,
+        "y": 2494.25390625,
         "z": "4d37a11.42c136",
         "wires": [
             []
         ]
     },
     {
-        "id": "a95bb5bd.f30938",
+        "id": "e64b3d38.e980a",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2721,
-        "y": 2455,
+        "x": 2742,
+        "y": 2493,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "92281260.0bacb8"
+                "d0ea482.a9901b8"
             ]
         ]
     },
     {
-        "id": "460ff82c.4ff7",
+        "id": "9cd3d1db.fb7ce8",
         "type": "comment",
         "name": "TODO: FIXME: put proper values",
         "info": "",
         "comments": "",
-        "x": 2401,
-        "y": 2416,
+        "x": 2422,
+        "y": 2454,
         "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "7a9db702.f0e1b",
+        "id": "57fdafb2.9eec08",
         "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-domainB-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": 2419.5,
-        "y": 2496,
+        "x": 2440.5,
+        "y": 2534,
         "z": "4d37a11.42c136",
         "wires": [
             []
         ]
     },
     {
-        "id": "b765768.33e8008",
+        "id": "aa4b663b.c9d06",
         "type": "comment",
         "name": "TODO: FIXME:",
         "info": "set attachment param and send request to NCE-T\nfor bandwidth matrix\nmay require a new template for JSON body",
         "comments": "",
-        "x": 2293,
-        "y": 2579,
+        "x": 2314,
+        "y": 2617,
         "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "15d01a88.67da65",
+        "id": "fc2a7bf0.e878b",
         "type": "set",
         "name": "set attachment_param domain A",
         "xml": "<set>\n<parameter name='request-id' value='`$prop.vpn-binding-domainA-uuid`' />\n<parameter name='otn-source-node' value='`$param-prefix-domainA[$param-prefix-domainA_length -3]`' />\n<parameter name='otn-dest-node' value='`$domain-A.node-id`' />\n<parameter name='bw-odu' value=\"`'0,' + $gfp`\" />\n<!--<parameter name='src-ttp-id' value='`$source.tunnel-tp-id`' />-->\n<parameter name='dst-ttp-id' value='`$domain-A.tunnel-tp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n",
         "comments": "",
-        "x": 2358,
-        "y": 2624,
+        "x": 2379,
+        "y": 2662,
         "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "7c6d32ec.4900b4",
+        "id": "2c916faf.da498",
         "type": "execute",
         "name": "get esr-thirdparty-sdnc",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainA.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainA.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
-        "x": 4815,
-        "y": 646,
+        "x": 4836,
+        "y": 684,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "f99473bc.f6917",
-                "8ca213cb.13c578",
-                "73897c92.dacd5c"
+                "883ac008.74f89",
+                "6cf958ca.c3e4a8",
+                "e70b241a.97d7e8"
             ]
         ]
     },
     {
-        "id": "2c4c53ed.c92a04",
+        "id": "14dca185.e1b46e",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2368,
-        "y": 302,
+        "x": 2389,
+        "y": 340,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "df1d026f.c1c088"
+                "8a257359.8a7208"
             ]
         ]
     },
     {
-        "id": "4b086b8f.46122c",
+        "id": "e1ac55d9.d865b8",
         "type": "outcome",
         "name": "logical-link",
         "xml": "<outcome value='logical-link'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1298.0001220703125,
-        "y": 719.0001220703125,
+        "x": 1319.0001220703125,
+        "y": 757.0001220703125,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "849b2fa9.e38c6"
+                "f6ec4c40.65362"
             ]
         ]
     },
     {
-        "id": "3637c149.a4c596",
+        "id": "14b8fde.fcc1702",
         "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": 2036,
-        "y": 425,
+        "x": 2057,
+        "y": 463,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "a6e3fac3.17782",
-                "36a75df5.accdba"
+                "e65ebebd.579d6",
+                "32fc4868.fa2b8"
             ]
         ]
     },
     {
-        "id": "36a75df5.accdba",
+        "id": "32fc4868.fa2b8",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2346,
-        "y": 432,
+        "x": 2367,
+        "y": 470,
         "z": "4d37a11.42c136",
         "wires": [
             []
         ]
     },
     {
-        "id": "a6e3fac3.17782",
+        "id": "e65ebebd.579d6",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2345,
-        "y": 486,
+        "x": 2366,
+        "y": 524,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "ccfe530c.696ee"
+                "c14b8719.903d8"
             ]
         ]
     },
     {
-        "id": "88e35dde.f9395",
+        "id": "badc6972.d68008",
         "type": "set",
         "name": "set the 1st logical-link-name",
         "xml": "<set>\n<parameter name='logical-link-name' value=\"`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].relationship-data[0].relationship-value`\" />\n\n\n",
         "comments": "",
-        "x": 1718,
-        "y": 669,
+        "x": 1739,
+        "y": 707,
         "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "849b2fa9.e38c6",
+        "id": "f6ec4c40.65362",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1475,
-        "y": 712,
+        "x": 1496,
+        "y": 750,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "88e35dde.f9395",
-                "abb2414c.5ad6c8"
+                "badc6972.d68008",
+                "6e843ab.3582ec4"
             ]
         ]
     },
     {
-        "id": "e4059fd.7caace",
+        "id": "76aa64b6.332a54",
         "type": "comment",
         "name": "Question?",
         "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
         "comments": "",
-        "x": 2904,
-        "y": 898,
+        "x": 2925,
+        "y": 936,
         "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "de6bae96.a20288",
+        "id": "62113903.77ec78",
         "type": "save",
         "name": "get p-interface-src from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"p-interface\"\n\t    key=\"pnf.pnf-name = $tmp.src.domainA.pnf-name\n\t        AND p-interface.interface-name = $tmp.aai.network-route-A.next-hop\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.network-route-A.p-interface-src\" >\n\n<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"p-interface\"-->\n<!--\t    key=\"pnf.pnf-name = $unique-src-node-Id-->\n<!--\t        and p-interface.interface-name = $tmp.aai.endpointA.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"-->\n<!--\t\tlocal-only=\"false\" -->\n<!--\t\tpfx=\"tmp.aai.endpointA.p-interface-src\" >-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 2947,
-        "y": 963,
+        "x": 2968,
+        "y": 1001,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "8b31e4a0.a10748",
-                "c9553d7.4a532c",
-                "cf1d45bd.26226"
+                "b7824d8a.d2e4f8",
+                "5d5b9681.b7598",
+                "6e8be76c.59d528"
             ]
         ]
     },
     {
-        "id": "cc046399.813d8",
+        "id": "4ecc6dae.def654",
         "type": "save",
         "name": "get p-interface-dst from aai",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"p-interface\"\n\t    key=\"pnf.pnf-name = $tmp.dst.domainB.pnf-name\n\t        AND p-interface.interface-name = $tmp.aai.network-route-B.next-hop\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.network-route-B.p-interface-dst\" >\n\n<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"p-interface\"-->\n<!--\t    key=\"pnf.pnf-name = $unique-src-node-Id-->\n<!--\t        and p-interface.interface-name = $tmp.aai.endpointA.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"-->\n<!--\t\tlocal-only=\"false\" -->\n<!--\t\tpfx=\"tmp.aai.endpointA.p-interface-src\" >-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 2944,
-        "y": 1807,
+        "x": 2965,
+        "y": 1845,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "33a31a8c.e3b546",
-                "333e39a9.5e6146",
-                "18c9eff6.77ede8"
+                "c9dbe459.2e8d58",
+                "dab2f9a8.cea26",
+                "f5d094cc.fe5d68"
             ]
         ]
     },
     {
-        "id": "76191dd2.8fade4",
+        "id": "6f6e53ed.b087ec",
         "type": "comment",
         "name": "Question?",
         "info": "How to know if DG would send this get request\nin \"nodes\" namespace instead of \"network\" namespace?",
         "comments": "",
-        "x": 2905,
-        "y": 1751,
+        "x": 2926,
+        "y": 1789,
         "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "df1d026f.c1c088",
+        "id": "8a257359.8a7208",
         "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": 2661,
-        "y": 249,
+        "x": 2682,
+        "y": 287,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "adfd76db.6991",
-                "7a639d69.b5bebc",
-                "4943cdeb.ab6f2c"
+                "8ea1434f.746858",
+                "f2d8ff7.3c8d5",
+                "a6d32e01.02e81"
             ]
         ]
     },
     {
-        "id": "7a639d69.b5bebc",
+        "id": "f2d8ff7.3c8d5",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2934.490966796875,
-        "y": 141.573974609375,
+        "x": 2955.490966796875,
+        "y": 179.573974609375,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "d0806055.3ff898"
+                "b85ff289.1649f"
             ]
         ]
     },
     {
-        "id": "d0806055.3ff898",
+        "id": "b85ff289.1649f",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 3112.0625,
-        "y": 141.8597412109375,
+        "x": 3133.0625,
+        "y": 179.8597412109375,
         "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "4943cdeb.ab6f2c",
+        "id": "a6d32e01.02e81",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2930,
-        "y": 191,
+        "x": 2951,
+        "y": 229,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "e3a044a2.8747b8"
+                "381f7f5a.80d3f8"
             ]
         ]
     },
     {
-        "id": "e3a044a2.8747b8",
+        "id": "381f7f5a.80d3f8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3112,
-        "y": 191,
+        "x": 3133,
+        "y": 229,
         "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "adfd76db.6991",
+        "id": "8ea1434f.746858",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2934,
-        "y": 242,
+        "x": 2955,
+        "y": 280,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "b8ee302f.a8ecc"
+                "6ca45b0b.848dec"
             ]
         ]
     },
     {
-        "id": "b8ee302f.a8ecc",
+        "id": "6ca45b0b.848dec",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3114,
-        "y": 242,
+        "x": 3135,
+        "y": 280,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "3637c149.a4c596"
+                "14b8fde.fcc1702"
             ]
         ]
     },
     {
-        "id": "7c0e5ba2.cb2954",
+        "id": "40603cb7.607bc4",
         "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": 2605,
-        "y": 466,
+        "x": 2626,
+        "y": 504,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "acd1414b.a58ab8"
+                "4e667cbe.69222c"
             ]
         ]
     },
     {
-        "id": "acd1414b.a58ab8",
+        "id": "4e667cbe.69222c",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2885,
-        "y": 466,
+        "x": 2906,
+        "y": 504,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "4b086b8f.46122c"
+                "e1ac55d9.d865b8"
             ]
         ]
     },
     {
-        "id": "ff4803af.9f0ab8",
+        "id": "13452ae4.22e4ad",
         "type": "outcome",
         "name": "network-policy",
         "xml": "<outcome value='network-policy'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3090,
-        "y": 440,
+        "x": 3111,
+        "y": 478,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "ae60df75.bd38f"
+                "245f45af.4ae9da"
             ]
         ]
     },
     {
-        "id": "ae60df75.bd38f",
+        "id": "245f45af.4ae9da",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3266.9998779296875,
-        "y": 432.9998779296875,
+        "x": 3287.9998779296875,
+        "y": 470.9998779296875,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "7c4264ea.4ef2cc",
-                "16bdb614.ef254a"
+                "868607a4.e796b",
+                "3bdb9c7c.d6977c"
             ]
         ]
     },
     {
-        "id": "7c4264ea.4ef2cc",
+        "id": "868607a4.e796b",
         "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": 3509.9998779296875,
-        "y": 389.9998779296875,
+        "x": 3530.9998779296875,
+        "y": 427.9998779296875,
         "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "16bdb614.ef254a",
+        "id": "3bdb9c7c.d6977c",
         "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": 3498.9998779296875,
-        "y": 444.9998779296875,
+        "x": 3519.9998779296875,
+        "y": 482.9998779296875,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "589b81b9.57a1a",
-                "afdb690e.be2878",
-                "2f4f9888.a0047"
+                "11d90691.38b7b1",
+                "e5aaddec.aca59",
+                "6698da7a.77b3bc"
             ]
         ]
     },
     {
-        "id": "2f4f9888.a0047",
+        "id": "6698da7a.77b3bc",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3752,
-        "y": 331,
+        "x": 3773,
+        "y": 369,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "10811a3b.3713ee"
+                "e904e6fc.1061a"
             ]
         ]
     },
     {
-        "id": "10811a3b.3713ee",
+        "id": "e904e6fc.1061a",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 3900.571533203125,
-        "y": 331.2857666015625,
+        "x": 3921.571533203125,
+        "y": 369.2857666015625,
         "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "a4b0529d.fb0728",
+        "id": "4975bc8f.93ecdc",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3899.509033203125,
-        "y": 375.426025390625,
+        "x": 3920.509033203125,
+        "y": 413.426025390625,
         "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "afdb690e.be2878",
+        "id": "e5aaddec.aca59",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3740.509033203125,
-        "y": 375.426025390625,
+        "x": 3761.509033203125,
+        "y": 413.426025390625,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "a4b0529d.fb0728"
+                "4975bc8f.93ecdc"
             ]
         ]
     },
     {
-        "id": "589b81b9.57a1a",
+        "id": "11d90691.38b7b1",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3747.509033203125,
-        "y": 454.426025390625,
+        "x": 3768.509033203125,
+        "y": 492.426025390625,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "2140264c.6d5f92"
+                "3b14af19.ae1128"
             ]
         ]
     },
     {
-        "id": "2140264c.6d5f92",
+        "id": "3b14af19.ae1128",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3886.509033203125,
-        "y": 454.426025390625,
+        "x": 3907.509033203125,
+        "y": 492.426025390625,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "22cd0794.035c48",
-                "fae49c49.31b99"
+                "70ed97b5.dc1c9",
+                "c2e43483.a12bd"
             ]
         ]
     },
     {
-        "id": "22cd0794.035c48",
+        "id": "70ed97b5.dc1c9",
         "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": 4092,
-        "y": 452,
+        "x": 4113,
+        "y": 490,
         "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "2546bd9f.525272",
+        "id": "c9fe9947.c06348",
         "type": "execute",
         "name": "execute split tp-id to get pnf-name",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-A.next-hop`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainA-pnfName\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2948,
-        "y": 633,
+        "x": 2969,
+        "y": 671,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "536f807c.cf39f",
-                "47e593b9.b45a3c"
+                "78baed3e.c501f4",
+                "120f1ac.ca76ae5"
             ]
         ]
     },
     {
-        "id": "47e593b9.b45a3c",
+        "id": "120f1ac.ca76ae5",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3171,
-        "y": 619,
+        "x": 3192,
+        "y": 657,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "97a737cb.3ff9d8"
+                "40ab4c81.445cd4"
             ]
         ]
     },
     {
-        "id": "536f807c.cf39f",
+        "id": "78baed3e.c501f4",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3173,
-        "y": 652,
+        "x": 3194,
+        "y": 690,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "2752a0c2.80dc4"
+                "9d068c67.4598d"
             ]
         ]
     },
     {
-        "id": "2752a0c2.80dc4",
+        "id": "9d068c67.4598d",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
         "comments": "",
-        "x": 3316,
-        "y": 649,
+        "x": 3337,
+        "y": 687,
         "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "97a737cb.3ff9d8",
+        "id": "40ab4c81.445cd4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3319,
-        "y": 612,
+        "x": 3340,
+        "y": 650,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "50707e3e.984ff",
-                "fca22b88.65f128"
+                "e718de2c.ab002",
+                "68fbd6c1.ad0448"
             ]
         ]
     },
     {
-        "id": "50707e3e.984ff",
+        "id": "e718de2c.ab002",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.src.domainA.pnf-name' value=\"`$param-prefix-domainA-pnfName[0] + '-' +\n                                                   $param-prefix-domainA-pnfName[1] + '-' +\n                                                   $param-prefix-domainA-pnfName[2] + '-' +\n                                                   $param-prefix-domainA-pnfName[3] + '-' +\n                                                   $param-prefix-domainA-pnfName[4] + '-' +\n                                                   $param-prefix-domainA-pnfName[5] + '-' +\n                                                   $param-prefix-domainA-pnfName[6] + '-' +\n                                                   $param-prefix-domainA-pnfName[7] + '-' +\n                                                   $param-prefix-domainA-pnfName[8]`\" />\n",
         "comments": "",
-        "x": 3481,
-        "y": 607,
+        "x": 3502,
+        "y": 645,
         "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "94119745.c4be9",
+        "id": "669a0eda.d8f578",
         "type": "execute",
         "name": "execute split tp-id to get pnf-name",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliStringUtils' method='split' >\n<parameter name=\"original_string\" value='`$tmp.aai.network-route-B.next-hop`'/>\n<!--<parameter name=\"regex\" value=\"[^-]+$\"/>-->\n<parameter name=\"regex\" value=\"[-]+\"/>\n<parameter name=\"ctx_memory_result_key\" value=\"param-prefix-domainB-pnfName\"/>\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2962,
-        "y": 1469.9998779296875,
+        "x": 2983,
+        "y": 1507.9998779296875,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "754647f7.9e2b8",
-                "657955bd.91fb44"
+                "3eeffc60.cab244",
+                "163d6add.444455"
             ]
         ]
     },
     {
-        "id": "657955bd.91fb44",
+        "id": "163d6add.444455",
         "type": "failure",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3185,
-        "y": 1455.9998779296875,
+        "x": 3206,
+        "y": 1493.9998779296875,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "80a7821a.19495"
+                "2e1531f5.2b244e"
             ]
         ]
     },
     {
-        "id": "754647f7.9e2b8",
+        "id": "3eeffc60.cab244",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3187,
-        "y": 1488.9998779296875,
+        "x": 3208,
+        "y": 1526.9998779296875,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "ee8e0ea1.9fea78"
+                "bb0d91d9.020e4"
             ]
         ]
     },
     {
-        "id": "ee8e0ea1.9fea78",
+        "id": "bb0d91d9.020e4",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value=\"An error occured while splitting sna1_route\" />\n",
         "comments": "",
-        "x": 3330,
-        "y": 1485.9998779296875,
+        "x": 3351,
+        "y": 1523.9998779296875,
         "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "80a7821a.19495",
+        "id": "2e1531f5.2b244e",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3333,
-        "y": 1448.9998779296875,
+        "x": 3354,
+        "y": 1486.9998779296875,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "413b415f.4e9208",
-                "81398c99.8688f"
+                "dd9519ef.d4213",
+                "54817df4.67d484"
             ]
         ]
     },
     {
-        "id": "413b415f.4e9208",
+        "id": "dd9519ef.d4213",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.dst.domainB.pnf-name' value=\"`$param-prefix-domainB-pnfName[0] + '-' +\n                                                   $param-prefix-domainB-pnfName[1] + '-' +\n                                                   $param-prefix-domainB-pnfName[2] + '-' +\n                                                   $param-prefix-domainB-pnfName[3] + '-' +\n                                                   $param-prefix-domainB-pnfName[4] + '-' +\n                                                   $param-prefix-domainB-pnfName[5] + '-' +\n                                                   $param-prefix-domainB-pnfName[6] + '-' +\n                                                   $param-prefix-domainB-pnfName[7] + '-' +\n                                                   $param-prefix-domainB-pnfName[8]`\" />\n",
         "comments": "",
-        "x": 3527,
-        "y": 1452,
+        "x": 3548,
+        "y": 1490,
         "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "2f5068f1.5086e8",
+        "id": "ac58016f.1c2c1",
         "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": 1073,
-        "y": 178,
+        "x": 1094,
+        "y": 216,
         "z": "4d37a11.42c136",
         "wires": [
             []
         ]
     },
     {
-        "id": "1f17f018.71ce48",
+        "id": "260f00b5.585908",
         "type": "execute",
         "name": "execute UUID generator for vpn-binding domainA",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.vpn-binding-domainA-uuid\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2424,
-        "y": 2090,
+        "x": 2445,
+        "y": 2128,
         "z": "4d37a11.42c136",
         "wires": [
             []
         ]
     },
     {
-        "id": "75da5f28.16fb78",
+        "id": "134248ca.e0fa77",
         "type": "execute",
         "name": "execute UUID generator for vpn-binding domainB",
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.vpn-binding-domainB-uuid\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2422,
-        "y": 2378,
+        "x": 2443,
+        "y": 2416,
         "z": "4d37a11.42c136",
         "wires": [
             []
         ]
     },
     {
-        "id": "5b5222c9.d7a36c",
+        "id": "c830d981.aee038",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='pividx' start='0' end='`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3595,
-        "y": 1203,
+        "x": 3616,
+        "y": 1241,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "57baeaf4.ebf064"
+                "4f78d00a.39ba68"
             ]
         ]
     },
     {
-        "id": "57baeaf4.ebf064",
+        "id": "4f78d00a.39ba68",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship[$pividx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3801,
-        "y": 1203,
+        "x": 3822,
+        "y": 1241,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "645e8c5e.f65a7c"
+                "489cbbcb.77186c"
             ]
         ]
     },
     {
-        "id": "645e8c5e.f65a7c",
+        "id": "489cbbcb.77186c",
         "type": "outcome",
         "name": "tunnel-termination-point",
         "xml": "<outcome value='tunnel-termination-point'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4016.28564453125,
-        "y": 1202.82177734375,
+        "x": 4037.28564453125,
+        "y": 1240.82177734375,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "894c9d7e.ee38"
+                "3bbad5a.8ec85aa"
             ]
         ]
     },
     {
-        "id": "894c9d7e.ee38",
+        "id": "3bbad5a.8ec85aa",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4223.1171875,
-        "y": 1203.34033203125,
+        "x": 4244.1171875,
+        "y": 1241.34033203125,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "d6f40c53.9a6bf",
-                "c910efe.c0a679",
-                "50a2016f.cc5d58"
+                "cf0eeee3.8d6188",
+                "80da6c7c.bf9bc",
+                "4327bba4.ea16c4"
             ]
         ]
     },
     {
-        "id": "d6f40c53.9a6bf",
+        "id": "cf0eeee3.8d6188",
         "type": "set",
         "name": "set source ttp-id",
         "xml": "<set>\n<parameter name='tmp.source.ttp-id' value=\"`$tmp.aai.network-route-A.p-interface-src.relationship-list.relationship[$pividx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 4438.1171875,
-        "y": 1165.34033203125,
+        "x": 4459.1171875,
+        "y": 1203.34033203125,
         "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "c910efe.c0a679",
+        "id": "80da6c7c.bf9bc",
         "type": "get-resource",
         "name": "get-resource src TTP",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"tunnel-termination-point\" \n\t\tkey=\"tunnel-termination-point.ttp-id = $tmp.source.ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.source-ttp' local-only='false' >\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 4435.1171875,
-        "y": 1204.34033203125,
+        "x": 4456.1171875,
+        "y": 1242.34033203125,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "ab61e075.552a9"
+                "54d57ef.0aa16"
             ]
         ]
     },
     {
-        "id": "50a2016f.cc5d58",
+        "id": "4327bba4.ea16c4",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 4390.6171875,
-        "y": 1246.34033203125,
+        "x": 4411.6171875,
+        "y": 1284.34033203125,
         "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "ab61e075.552a9",
+        "id": "54d57ef.0aa16",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4615.6171875,
-        "y": 1203.34033203125,
+        "x": 4636.6171875,
+        "y": 1241.34033203125,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "11eef788.e7252"
+                "136083ca.f8ed24"
             ]
         ]
     },
     {
-        "id": "11eef788.e7252",
+        "id": "136083ca.f8ed24",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4773.6171875,
-        "y": 1203.34033203125,
+        "x": 4794.6171875,
+        "y": 1241.34033203125,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "ab0df37c.a4d9e"
+                "43a5fa3.d0c2504"
             ]
         ]
     },
     {
-        "id": "ab0df37c.a4d9e",
+        "id": "43a5fa3.d0c2504",
         "type": "set",
         "name": "set source tunnel tp ip",
         "xml": "<set>\n<parameter name='source.tunnel-tp-id' value=\"`$tmp.aai.source-ttp.tunnel-tp-id`\" />\n",
         "comments": "",
-        "x": 4980.6171875,
-        "y": 1203.34033203125,
+        "x": 5001.6171875,
+        "y": 1241.34033203125,
         "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "3da30ce3.e252e4",
+        "id": "d281a70f.336618",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='dividx' start='0' end='`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3592,
-        "y": 2072.0001220703125,
+        "x": 3613,
+        "y": 2110.0001220703125,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "5324422e.146a4c"
+                "21553f06.14bad"
             ]
         ]
     },
     {
-        "id": "5324422e.146a4c",
+        "id": "21553f06.14bad",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship[$dividx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3798,
-        "y": 2072.0001220703125,
+        "x": 3819,
+        "y": 2110.0001220703125,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "a66bf5f9.332a38"
+                "d5a45fe2.8cbaf"
             ]
         ]
     },
     {
-        "id": "a66bf5f9.332a38",
+        "id": "d5a45fe2.8cbaf",
         "type": "outcome",
         "name": "tunnel-termination-point",
         "xml": "<outcome value='tunnel-termination-point'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4013.28564453125,
-        "y": 2071.8218994140625,
+        "x": 4034.28564453125,
+        "y": 2109.8218994140625,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "68fca589.e390fc"
+                "3432450f.73fd1a"
             ]
         ]
     },
     {
-        "id": "68fca589.e390fc",
+        "id": "3432450f.73fd1a",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4220.1171875,
-        "y": 2072.3404541015625,
+        "x": 4241.1171875,
+        "y": 2110.3404541015625,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "c073bf38.974dd",
-                "108cc1af.4a86d6",
-                "f0b0cdee.26542"
+                "4d1b045c.8befb4",
+                "ff4bcdcd.b592",
+                "82369db7.8fbd4"
             ]
         ]
     },
     {
-        "id": "c073bf38.974dd",
+        "id": "4d1b045c.8befb4",
         "type": "set",
         "name": "set destination ttp-id",
         "xml": "<set>\n<parameter name='tmp.destination.ttp-id' value=\"`$tmp.aai.network-route-B.p-interface-dst.relationship-list.relationship[$dividx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 4435.1171875,
-        "y": 2034.3404541015625,
+        "x": 4456.1171875,
+        "y": 2072.3404541015625,
         "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "108cc1af.4a86d6",
+        "id": "ff4bcdcd.b592",
         "type": "get-resource",
         "name": "get-resource src TTP",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"tunnel-termination-point\" \n\t\tkey=\"tunnel-termination-point.ttp-id = $tmp.destination.ttp-id \n\t\tAND depth = '0'\"\n        pfx='tmp.aai.destination-ttp' local-only='false' >\n\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 4432.1171875,
-        "y": 2073.3404541015625,
+        "x": 4453.1171875,
+        "y": 2111.3404541015625,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "b43fbaf.be38548"
+                "a8f23d1f.d221e8"
             ]
         ]
     },
     {
-        "id": "f0b0cdee.26542",
+        "id": "82369db7.8fbd4",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 4387.6171875,
-        "y": 2115.3404541015625,
+        "x": 4408.6171875,
+        "y": 2153.3404541015625,
         "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "b43fbaf.be38548",
+        "id": "a8f23d1f.d221e8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4612.6171875,
-        "y": 2072.3404541015625,
+        "x": 4633.6171875,
+        "y": 2110.3404541015625,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "f843935.e7b9ef"
+                "403d184.8f53468"
             ]
         ]
     },
     {
-        "id": "f843935.e7b9ef",
+        "id": "403d184.8f53468",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4770.6171875,
-        "y": 2072.3404541015625,
+        "x": 4791.6171875,
+        "y": 2110.3404541015625,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "2905073f.78af38"
+                "c7d0f697.2aea68"
             ]
         ]
     },
     {
-        "id": "2905073f.78af38",
+        "id": "c7d0f697.2aea68",
         "type": "set",
         "name": "set destination tunnel tp ip",
         "xml": "<set>\n<parameter name='destination.tunnel-tp-id' value=\"`$tmp.aai.destination-ttp.tunnel-tp-id`\" />\n",
         "comments": "",
-        "x": 4977.6171875,
-        "y": 2072.3404541015625,
+        "x": 4998.6171875,
+        "y": 2110.3404541015625,
         "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "47a3a765.16faa",
+        "id": "84749d0f.3038c8",
         "type": "set",
         "name": "set attachment_param domain B",
         "xml": "<set>\n<parameter name='request-id' value='`$prop.vpn-binding-domainB-uuid`' />\n<parameter name='otn-source-node' value='`$domain-B.node-id`' />\n<parameter name='otn-dest-node' value='`$param-prefix-domainB[$param-prefix-domainB_length -3]`' />\n<!--<parameter name='bw-odu' value='`$maximum-bandwidth /10`' />-->\n<parameter name='bw-odu' value=\"`'0,' + $gfp`\" />\n<parameter name='src-ttp-id' value='`$domain-B.tunnel-tp-id`' />\n<!--<parameter name='dst-ttp-id' value='`$destination.tunnel-tp-id`' />-->\n<parameter name='dst-ttp-id' value='' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n",
         "comments": "",
-        "x": 2353,
-        "y": 2999,
+        "x": 2374,
+        "y": 3037,
         "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "fca22b88.65f128",
+        "id": "68fbd6c1.ad0448",
         "type": "get-resource",
         "name": "get-resource src pnf",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.src.domainA.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 3508,
-        "y": 679,
+        "x": 3529,
+        "y": 717,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "26e1e178.44c626",
-                "748c5faa.9b8fd",
-                "7a23584.42cb7a8"
+                "69417d44.afb3fc",
+                "a15ac77e.798db8",
+                "3a89038d.704134"
             ]
         ]
     },
     {
-        "id": "26e1e178.44c626",
+        "id": "69417d44.afb3fc",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3703.5001220703125,
-        "y": 631,
+        "x": 3724.5001220703125,
+        "y": 669,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "4f3cfb5.bd9ae04"
+                "138b37c3.968d8"
             ]
         ]
     },
     {
-        "id": "748c5faa.9b8fd",
+        "id": "a15ac77e.798db8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3695.5001220703125,
-        "y": 686,
+        "x": 3716.5001220703125,
+        "y": 724,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "7374c1c1.b3ba38"
+                "5742f10e.dadab8"
             ]
         ]
     },
     {
-        "id": "7a23584.42cb7a8",
+        "id": "3a89038d.704134",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3700.5001220703125,
-        "y": 743,
+        "x": 3721.5001220703125,
+        "y": 781,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "bf06b166.7b1ab8"
+                "56dfcb3e.f8e3ac"
             ]
         ]
     },
     {
-        "id": "bf06b166.7b1ab8",
+        "id": "56dfcb3e.f8e3ac",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 3852.5001220703125,
-        "y": 744,
+        "x": 3873.5001220703125,
+        "y": 782,
         "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "7374c1c1.b3ba38",
+        "id": "5742f10e.dadab8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 3863.5001220703125,
-        "y": 689,
+        "x": 3884.5001220703125,
+        "y": 727,
         "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "4f3cfb5.bd9ae04",
+        "id": "138b37c3.968d8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3847.8824462890625,
-        "y": 628.6556701660156,
+        "x": 3868.8824462890625,
+        "y": 666.6556701660156,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "cc5e035f.d2ea7"
+                "b4d80ee.d93167"
             ]
         ]
     },
     {
-        "id": "71b56e6f.bcf72",
+        "id": "40dc3d01.0cfddc",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4430,
-        "y": 647,
+        "x": 4451,
+        "y": 685,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "894c8dc1.732e8"
+                "ce5ec787.25a25"
             ]
         ]
     },
     {
-        "id": "894c8dc1.732e8",
+        "id": "ce5ec787.25a25",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4607,
-        "y": 639,
+        "x": 4628,
+        "y": 677,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "47f97449.7cbbcc",
-                "7c6d32ec.4900b4"
+                "deda36.39eb45c8",
+                "2c916faf.da498"
             ]
         ]
     },
     {
-        "id": "cc5e035f.d2ea7",
+        "id": "b4d80ee.d93167",
         "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": 4032,
-        "y": 643,
+        "x": 4053,
+        "y": 681,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "611703bb.9151dc"
+                "83a731e6.aee9d8"
             ]
         ]
     },
     {
-        "id": "611703bb.9151dc",
+        "id": "83a731e6.aee9d8",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4227,
-        "y": 643,
+        "x": 4248,
+        "y": 681,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "71b56e6f.bcf72",
-                "bf1946eb.ee80a8"
+                "40dc3d01.0cfddc",
+                "556c2535.2cf6f4"
             ]
         ]
     },
     {
-        "id": "47f97449.7cbbcc",
+        "id": "deda36.39eb45c8",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domainA id",
         "xml": "<set>\n<parameter name='tmp.domainA.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 4845,
-        "y": 594,
+        "x": 4866,
+        "y": 632,
         "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "f99473bc.f6917",
+        "id": "883ac008.74f89",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5025,
-        "y": 637,
+        "x": 5046,
+        "y": 675,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "701e34ee.427b2c"
+                "5bb6445.b0cb1bc"
             ]
         ]
     },
     {
-        "id": "8ca213cb.13c578",
+        "id": "6cf958ca.c3e4a8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5017,
-        "y": 692,
+        "x": 5038,
+        "y": 730,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "2e4b614b.0c396e"
+                "f6420bc8.c6108"
             ]
         ]
     },
     {
-        "id": "73897c92.dacd5c",
+        "id": "e70b241a.97d7e8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5022,
-        "y": 749,
+        "x": 5043,
+        "y": 787,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "ce57e89b.dcf4b"
+                "e90b6e53.2dc61"
             ]
         ]
     },
     {
-        "id": "ce57e89b.dcf4b",
+        "id": "e90b6e53.2dc61",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 5174,
-        "y": 750,
+        "x": 5195,
+        "y": 788,
         "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "2e4b614b.0c396e",
+        "id": "f6420bc8.c6108",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 5185,
-        "y": 695,
+        "x": 5206,
+        "y": 733,
         "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "701e34ee.427b2c",
+        "id": "5bb6445.b0cb1bc",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5169.38232421875,
-        "y": 634.6556701660156,
+        "x": 5190.38232421875,
+        "y": 672.6556701660156,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "986be552.d67d4"
+                "36dcfa67.508606"
             ]
         ]
     },
     {
-        "id": "986be552.d67d4",
+        "id": "36dcfa67.508606",
         "type": "set",
         "name": "set controller domainA data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.url' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.user' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainA.password' value=\"`$tmp.aai.domainA.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
         "comments": "",
-        "x": 5384,
-        "y": 631,
+        "x": 5405,
+        "y": 669,
         "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "81398c99.8688f",
+        "id": "54817df4.67d484",
         "type": "get-resource",
         "name": "get-resource src pnf",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.dst.domainB.pnf-name\"\n        pfx='tmp.aai.destination-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 3549,
-        "y": 1520,
+        "x": 3570,
+        "y": 1558,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "4228d77e.297a48",
-                "f33d7dd3.e27df8",
-                "f25d8688.bde06"
+                "12332a8b.1f458d",
+                "e70d4463.7fed78",
+                "9e28dd86.32b368"
             ]
         ]
     },
     {
-        "id": "4228d77e.297a48",
+        "id": "12332a8b.1f458d",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3744.5001220703125,
-        "y": 1472,
+        "x": 3765.5001220703125,
+        "y": 1510,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "b81f1049.782548"
+                "97851436.c0f798"
             ]
         ]
     },
     {
-        "id": "f33d7dd3.e27df8",
+        "id": "e70d4463.7fed78",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3736.5001220703125,
-        "y": 1527,
+        "x": 3757.5001220703125,
+        "y": 1565,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "cb4038b7.689b5"
+                "9865196d.c10828"
             ]
         ]
     },
     {
-        "id": "f25d8688.bde06",
+        "id": "9e28dd86.32b368",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3741.5001220703125,
-        "y": 1584,
+        "x": 3762.5001220703125,
+        "y": 1622,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "9d53815.71bad"
+                "1636bf8.c7b9e41"
             ]
         ]
     },
     {
-        "id": "9d53815.71bad",
+        "id": "1636bf8.c7b9e41",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 3893.5001220703125,
-        "y": 1585,
+        "x": 3914.5001220703125,
+        "y": 1623,
         "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "cb4038b7.689b5",
+        "id": "9865196d.c10828",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 3904.5001220703125,
-        "y": 1530,
+        "x": 3925.5001220703125,
+        "y": 1568,
         "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "b81f1049.782548",
+        "id": "97851436.c0f798",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3888.8824462890625,
-        "y": 1469.6556701660156,
+        "x": 3909.8824462890625,
+        "y": 1507.6556701660156,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "3a1b087b.88796"
+                "601870d2.2269c8"
             ]
         ]
     },
     {
-        "id": "9eaf216b.504558",
+        "id": "358b8a93.9adabe",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4471,
-        "y": 1488,
+        "x": 4492,
+        "y": 1526,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "848ce8ba.8131a8"
+                "f1454db6.8dcaf8"
             ]
         ]
     },
     {
-        "id": "848ce8ba.8131a8",
+        "id": "f1454db6.8dcaf8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4648,
-        "y": 1480,
+        "x": 4669,
+        "y": 1518,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "91abee3d.323e5",
-                "a28d627d.aad29"
+                "1806e2c2.14485d",
+                "8cb20d6f.760bf"
             ]
         ]
     },
     {
-        "id": "3a1b087b.88796",
+        "id": "601870d2.2269c8",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='dpvidx' start='0' end='`$tmp.aai.destination-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 4073,
-        "y": 1484,
+        "x": 4094,
+        "y": 1522,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "75ba425.30354bc"
+                "4732f224.c95254"
             ]
         ]
     },
     {
-        "id": "75ba425.30354bc",
+        "id": "4732f224.c95254",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4268,
-        "y": 1484,
+        "x": 4289,
+        "y": 1522,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "9eaf216b.504558",
-                "f41408f6.625698"
+                "358b8a93.9adabe",
+                "3beefc43.434434"
             ]
         ]
     },
     {
-        "id": "a28d627d.aad29",
+        "id": "8cb20d6f.760bf",
         "type": "execute",
         "name": "get esr-thirdparty-sdnc",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainB.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainB.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
-        "x": 4856,
-        "y": 1487,
+        "x": 4877,
+        "y": 1525,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "2c1c230e.a8a514",
-                "77340ca1.3f4454",
-                "b69cbef8.164728"
+                "c4071110.82806",
+                "ce108d7.ad4977",
+                "c040099f.13bbf8"
             ]
         ]
     },
     {
-        "id": "91abee3d.323e5",
+        "id": "1806e2c2.14485d",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domainB id",
         "xml": "<set>\n<parameter name='tmp.domainB.esr-thirdparty-id' value=\"`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 4886,
-        "y": 1435,
+        "x": 4907,
+        "y": 1473,
         "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "2c1c230e.a8a514",
+        "id": "c4071110.82806",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5066,
-        "y": 1478,
+        "x": 5087,
+        "y": 1516,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "ea8a7330.3c6eb"
+                "c3f3513e.3d36c"
             ]
         ]
     },
     {
-        "id": "77340ca1.3f4454",
+        "id": "ce108d7.ad4977",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5058,
-        "y": 1533,
+        "x": 5079,
+        "y": 1571,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "5b6119be.e0e2e"
+                "98979539.818688"
             ]
         ]
     },
     {
-        "id": "b69cbef8.164728",
+        "id": "c040099f.13bbf8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5063,
-        "y": 1590,
+        "x": 5084,
+        "y": 1628,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "6e980a04.e6ca2c"
+                "45d3d695.c0cf2"
             ]
         ]
     },
     {
-        "id": "6e980a04.e6ca2c",
+        "id": "45d3d695.c0cf2",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 5215,
-        "y": 1591,
+        "x": 5236,
+        "y": 1629,
         "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "5b6119be.e0e2e",
+        "id": "98979539.818688",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 5226,
-        "y": 1536,
+        "x": 5247,
+        "y": 1574,
         "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "ea8a7330.3c6eb",
+        "id": "c3f3513e.3d36c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5210.38232421875,
-        "y": 1475.6556701660156,
+        "x": 5231.38232421875,
+        "y": 1513.6556701660156,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "6b04dce3.953014"
+                "90464df.06ab9b"
             ]
         ]
     },
     {
-        "id": "6b04dce3.953014",
+        "id": "90464df.06ab9b",
         "type": "set",
         "name": "set controller domainB data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.url' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.user' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainB.password' value=\"`$tmp.aai.domainB.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
         "comments": "",
-        "x": 5425,
-        "y": 1472,
+        "x": 5446,
+        "y": 1510,
         "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "8335f76.9af8388",
+        "id": "a5814717.4b953",
         "type": "execute",
         "name": "execute RestApiCallNode slice creation domainA",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.transport-slice-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/operations/ietf-optical-slice:create-optical-slice'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 2404,
-        "y": 2682,
+        "x": 2425,
+        "y": 2720,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "f515c1e9.93c64",
-                "49a0370a.e5f21"
+                "2242c3cc.13b1dc",
+                "2c8586d6.b70122"
             ]
         ]
     },
     {
-        "id": "49a0370a.e5f21",
+        "id": "2c8586d6.b70122",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2670,
-        "y": 2662,
+        "x": 2691,
+        "y": 2700,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "30dceb43.a4b4ac"
+                "8e14b997.54e1b8"
             ]
         ]
     },
     {
-        "id": "f515c1e9.93c64",
+        "id": "2242c3cc.13b1dc",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2671.000213623047,
-        "y": 2712.99990940094,
+        "x": 2692.000213623047,
+        "y": 2750.99990940094,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "e7a629da.88d0d8"
+                "72bda37b.1b4f84"
             ]
         ]
     },
     {
-        "id": "30dceb43.a4b4ac",
+        "id": "8e14b997.54e1b8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 2810.0002479553223,
-        "y": 2662.0000009536743,
+        "x": 2831.0002479553223,
+        "y": 2700.0000009536743,
         "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "e7a629da.88d0d8",
+        "id": "72bda37b.1b4f84",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2816.02725982666,
-        "y": 2710.745394706726,
+        "x": 2837.02725982666,
+        "y": 2748.745394706726,
         "z": "4d37a11.42c136",
         "wires": [
             []
         ]
     },
     {
-        "id": "5651ec55.50184c",
+        "id": "39b144a2.fc3a7c",
         "type": "execute",
         "name": "execute RestApiCallNode slice creation domainB",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.transport-slice-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/operations/ietf-optical-slice:create-optical-slice'`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 2404,
-        "y": 3054,
+        "x": 2425,
+        "y": 3092,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "55b8a548.7743b4",
-                "625f938a.695c34"
+                "23f4f16e.f2ab6e",
+                "8c667512.e5492"
             ]
         ]
     },
     {
-        "id": "625f938a.695c34",
+        "id": "8c667512.e5492",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2670,
-        "y": 3034,
+        "x": 2691,
+        "y": 3072,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "bcc07e6e.d74a18"
+                "1089012f.df48c7"
             ]
         ]
     },
     {
-        "id": "55b8a548.7743b4",
+        "id": "23f4f16e.f2ab6e",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2671.000213623047,
-        "y": 3084.99990940094,
+        "x": 2692.000213623047,
+        "y": 3122.99990940094,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "42c61fdb.9a2b6"
+                "199cfc4b.ed097c"
             ]
         ]
     },
     {
-        "id": "bcc07e6e.d74a18",
+        "id": "1089012f.df48c7",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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 B\" />\n",
         "comments": "",
-        "x": 2810.0002479553223,
-        "y": 3034.0000009536743,
+        "x": 2831.0002479553223,
+        "y": 3072.0000009536743,
         "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "42c61fdb.9a2b6",
+        "id": "199cfc4b.ed097c",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2816.02725982666,
-        "y": 3082.745394706726,
+        "x": 2837.02725982666,
+        "y": 3120.745394706726,
         "z": "4d37a11.42c136",
         "wires": [
             []
         ]
     },
     {
-        "id": "ccfe530c.696ee",
+        "id": "c14b8719.903d8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2509,
-        "y": 412,
+        "x": 2530,
+        "y": 450,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "7c0e5ba2.cb2954",
-                "338a39d3.a481ce"
+                "40603cb7.607bc4",
+                "7f3f76ad.e04ac8"
             ]
         ]
     },
     {
-        "id": "338a39d3.a481ce",
+        "id": "7f3f76ad.e04ac8",
         "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": 2790,
-        "y": 368,
+        "x": 2811,
+        "y": 406,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "e9d2da22.090e3"
+                "31eeaed6.c9c2d2"
             ]
         ]
     },
     {
-        "id": "e9d2da22.090e3",
+        "id": "31eeaed6.c9c2d2",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.allotted-resource.relationship-list.relationship[$idx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3052,
-        "y": 368,
+        "x": 3073,
+        "y": 406,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "ff4803af.9f0ab8"
+                "13452ae4.22e4ad"
             ]
         ]
     },
     {
-        "id": "bf1946eb.ee80a8",
+        "id": "556c2535.2cf6f4",
         "type": "outcome",
         "name": "network-resource",
         "xml": "<outcome value='network-resource'>",
         "comments": "",
         "outputs": 1,
-        "x": 4433,
-        "y": 721,
+        "x": 4454,
+        "y": 759,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "c3550750.f869a"
+                "8b677154.0c28b8"
             ]
         ]
     },
     {
-        "id": "c3550750.f869a",
+        "id": "8b677154.0c28b8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4610,
-        "y": 713,
+        "x": 4631,
+        "y": 751,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "775fd622.bb73b"
+                "dbe05c47.574588"
             ]
         ]
     },
     {
-        "id": "775fd622.bb73b",
+        "id": "dbe05c47.574588",
         "type": "set",
         "name": "set domainA ethernet layer network-id",
         "xml": "<set>\n<parameter name='tmp.domainA.eth-network-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 4845,
-        "y": 837,
+        "x": 4866,
+        "y": 875,
         "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "fd89b518.9f0b6",
+        "id": "e5346606.e9d9f",
         "type": "set",
         "name": "set domainB ethernet layer network-id",
         "xml": "<set>\n<parameter name='tmp.domainB.eth-network-id' value=\"`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 4885,
-        "y": 1677,
+        "x": 4906,
+        "y": 1715,
         "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "73a6ccfa.9f80e4",
+        "id": "279e5fe1.a8b868",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4650,
-        "y": 1553,
+        "x": 4671,
+        "y": 1591,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "fd89b518.9f0b6"
+                "e5346606.e9d9f"
             ]
         ]
     },
     {
-        "id": "f41408f6.625698",
+        "id": "3beefc43.434434",
         "type": "outcome",
         "name": "network-resource",
         "xml": "<outcome value='network-resource'>",
         "comments": "",
         "outputs": 1,
-        "x": 4473,
-        "y": 1561,
+        "x": 4494,
+        "y": 1599,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "73a6ccfa.9f80e4"
+                "279e5fe1.a8b868"
             ]
         ]
     },
     {
-        "id": "edb297b0.c9f328",
+        "id": "21292318.735edc",
         "type": "execute",
         "name": "execute RestApiCallNode domainA UNI Coloring",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-coloring-uni-port.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-network:networks/network=' + $tmp.domainA.eth-network-id + '/node=' + $tmp.src.pnf-name + '/ietf-network-topology:termination-point=' + $tmp.src.ltpId + '/ietf-te-topology:te' `\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 2406,
-        "y": 2815,
+        "x": 2427,
+        "y": 2853,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "cc44d1ea.6c2858",
-                "700c6956.d8abf8"
+                "aa98c0a5.978718",
+                "47316c0a.b315dc"
             ]
         ]
     },
     {
-        "id": "700c6956.d8abf8",
+        "id": "47316c0a.b315dc",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2672,
-        "y": 2795,
+        "x": 2693,
+        "y": 2833,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "b7581f37.075ad"
+                "a7504bbe.eb60e"
             ]
         ]
     },
     {
-        "id": "cc44d1ea.6c2858",
+        "id": "aa98c0a5.978718",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2673.000213623047,
-        "y": 2845.99990940094,
+        "x": 2694.000213623047,
+        "y": 2883.99990940094,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "f67d237f.4b41c"
+                "98c604c1.7b11b8"
             ]
         ]
     },
     {
-        "id": "b7581f37.075ad",
+        "id": "a7504bbe.eb60e",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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 UNI Coloring for domain A\" />\n",
         "comments": "",
-        "x": 2812.0002479553223,
-        "y": 2795.0000009536743,
+        "x": 2833.0002479553223,
+        "y": 2833.0000009536743,
         "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "f67d237f.4b41c",
+        "id": "98c604c1.7b11b8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2818.02725982666,
-        "y": 2843.745394706726,
+        "x": 2839.02725982666,
+        "y": 2881.745394706726,
         "z": "4d37a11.42c136",
         "wires": [
             []
         ]
     },
     {
-        "id": "91eba2f3.844de",
+        "id": "ce066c5d.e7734",
         "type": "execute",
         "name": "execute RestApiCallNode domainB UNI Coloring",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-coloring-uni-port.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.url + '/restconf/data/ietf-network:networks/network=' + $tmp.domainB.eth-network-id + '/node=' + $tmp.dst.pnf-name + '/ietf-network-topology:termination-point=' + $tmp.dst.ltpId + '/ietf-te-topology:te' `\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainB.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 2406,
-        "y": 3181,
+        "x": 2427,
+        "y": 3219,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "cf85f70c.9ad7a",
-                "da777837.c4e49"
+                "77909c9d.223f24",
+                "d69f9ea8.7be4"
             ]
         ]
     },
     {
-        "id": "da777837.c4e49",
+        "id": "d69f9ea8.7be4",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2672,
-        "y": 3161,
+        "x": 2693,
+        "y": 3199,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "382ee7c9.8791c8"
+                "f7f9f969.a37708"
             ]
         ]
     },
     {
-        "id": "cf85f70c.9ad7a",
+        "id": "77909c9d.223f24",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2673.000213623047,
-        "y": 3211.99990940094,
+        "x": 2694.000213623047,
+        "y": 3249.99990940094,
         "z": "4d37a11.42c136",
         "wires": [
             [
-                "f2adb059.12803"
+                "cf24be41.03bc48"
             ]
         ]
     },
     {
-        "id": "382ee7c9.8791c8",
+        "id": "f7f9f969.a37708",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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 UNI coloring for domain B\" />\n",
         "comments": "",
-        "x": 2812.0002479553223,
-        "y": 3161.0000009536743,
+        "x": 2833.0002479553223,
+        "y": 3199.0000009536743,
         "z": "4d37a11.42c136",
         "wires": []
     },
     {
-        "id": "f2adb059.12803",
+        "id": "cf24be41.03bc48",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 2818.02725982666,
-        "y": 3209.745394706726,
+        "x": 2839.02725982666,
+        "y": 3247.745394706726,
         "z": "4d37a11.42c136",
         "wires": [
             []
         ]
     },
     {
-        "id": "fae49c49.31b99",
+        "id": "c2e43483.a12bd",
         "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": 4091,
-        "y": 498,
+        "x": 4112,
+        "y": 536,
         "z": "4d37a11.42c136",
         "wires": []
+    },
+    {
+        "id": "303c5717.c426f",
+        "type": "execute",
+        "name": "execute UUID generator for ethernet-service-name",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.ethernet-service-name\"/>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2468,
+        "y": 730,
+        "z": "4d37a11.42c136",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "c19c2198.0de5c",
+        "type": "execute",
+        "name": "execute UUID generator for otn-tunnel-name",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >\n<parameter name=\"ctx-destination\" value=\"prop.otn-tunnel-name\"/>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 2448,
+        "y": 770,
+        "z": "4d37a11.42c136",
+        "wires": [
+            []
+        ]
     }
 ]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-activate.xml b/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-activate.xml
index bb6d1ae1..b94ac023 100644
--- a/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-activate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-activate.xml
@@ -174,7 +174,9 @@
                                                                                     </outcome>
                                                                                 </execute>
                                                                                 <set>
-                                                                                    <parameter name='eth-service-name' value='`$tmp.aai.connectivityA.connectivity-id`' />
+                                                                                    <!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->
+                                                                                    <parameter name='eth-service-name' value='`$tmp.aai.connectivityA.etht-svc-name`' />
+                                                                                    <parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />
                                                                                     <parameter name='provider-id' value='`$tmp.aai.connectivityA.access-provider-id`' />
                                                                                     <parameter name='client-id' value='`$tmp.aai.connectivityA.access-client-id`' />
                                                                                     <parameter name='topology-id' value='`$tmp.aai.connectivityA.access-topology-id`' />
@@ -183,6 +185,8 @@
                                                                                     <parameter name='index-number' value='0' />
                                                                                     <parameter name='eth-node-id' value='`$tmp.aai.connectivityA.access-node-id`' />
                                                                                     <parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityA.access-ltp-id`' />
+                                                                                    <parameter name='CIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />
+                                                                                    <parameter name='EIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />
                                                                                 </set>
                                                                                 <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
                                                                                     <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-ethernet-service.templatefile`" />
@@ -349,7 +353,9 @@
                                                                                             </outcome>
                                                                                         </execute>
                                                                                         <set>
-                                                                                            <parameter name='eth-service-name' value='`$tmp.aai.connectivityB.connectivity-id`' />
+                                                                                            <!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityB.connectivity-id`' />-->
+                                                                                            <parameter name='eth-service-name' value='`$tmp.aai.connectivityB.etht-svc-name`' />
+                                                                                            <parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />
                                                                                             <parameter name='provider-id' value='`$tmp.aai.connectivityB.access-provider-id`' />
                                                                                             <parameter name='client-id' value='`$tmp.aai.connectivityB.access-client-id`' />
                                                                                             <parameter name='topology-id' value='`$tmp.aai.connectivityB.access-topology-id`' />
@@ -358,6 +364,8 @@
                                                                                             <parameter name='index-number' value='0' />
                                                                                             <parameter name='eth-node-id' value='`$tmp.aai.connectivityB.access-node-id`' />
                                                                                             <parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityB.access-ltp-id`' />
+                                                                                            <parameter name='CIR' value='`$tmp.aai.vpn-bindingB.route-distinguisher *1000000`' />
+                                                                                            <parameter name='EIR' value='`$tmp.aai.vpn-bindingB.route-distinguisher *1000000`' />
                                                                                         </set>
                                                                                         <execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >
                                                                                             <parameter name="templateFileName" value="`$prop.restapi.templateDir + '/' + $prop.restapi.ts-ethernet-service.templatefile`" />
diff --git a/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-allocate.xml b/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-allocate.xml
index 02312230..ff238661 100644
--- a/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-allocate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-allocate.xml
@@ -162,6 +162,12 @@
                                                                                         </outcome>
                                                                                         <outcome value='success'>
                                                                                             <block>
+                                                                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
+                                                                                                    <parameter name="ctx-destination" value="prop.ethernet-service-name"/>
+                                                                                                </execute>
+                                                                                                <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='generateUUID' >
+                                                                                                    <parameter name="ctx-destination" value="prop.otn-tunnel-name"/>
+                                                                                                </execute>
                                                                                                 <set>
                                                                                                     <parameter name='network-route-A' value="`$tmp.aai.logical-link.link-name`" />
                                                                                                 </set>
@@ -339,6 +345,7 @@
                                                                                                                         <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
                                                                                                                               key='connectivity.connectivity-id = $uuid.connectivity-domainA-uuid'>
                                                                                                                             <parameter name='connectivity-id' value='`$uuid.connectivity-domainA-uuid`' />
+                                                                                                                            <parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />
                                                                                                                             <parameter name='operational-status' value='Created' />
                                                                                                                             <parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />
                                                                                                                             <parameter name='access-client-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -7]`' />
@@ -594,6 +601,7 @@
                                                                                                                         <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity'
                                                                                                                               key='connectivity.connectivity-id = $prop.connectivity-domainB-uuid'>
                                                                                                                             <parameter name='connectivity-id' value='`$prop.connectivity-domainB-uuid`' />
+                                                                                                                            <parameter name='etht-svc-name' value='`$prop.ethernet-service-name`' />
                                                                                                                             <parameter name='operational-status' value='Created' />
                                                                                                                             <parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />
                                                                                                                             <parameter name='access-client-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -7]`' />
@@ -702,7 +710,7 @@
                                                                                                 <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
                                                                                                       key='vpn-binding.vpn-id = $prop.vpn-binding-domainA-uuid' >
                                                                                                     <parameter name='vpn-id' value='`$prop.vpn-binding-domainA-uuid`' />
-                                                                                                    <parameter name='vpn-name' value='`$prop.vpn-binding-domainA-uuid`' />
+                                                                                                    <parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />
                                                                                                     <parameter name='access-provider-id' value='`$domain-A.provider-id`' />
                                                                                                     <!--<parameter name='access-provider-id' value='`$param-prefix-domainA[$param-prefix-domainA_length -9]`' />-->
                                                                                                     <parameter name='access-client-id' value='`$domain-A.client-id`' />
@@ -738,7 +746,7 @@
                                                                                                 <save plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding'
                                                                                                       key='vpn-binding.vpn-id = $prop.vpn-binding-domainB-uuid' >
                                                                                                     <parameter name='vpn-id' value='`$prop.vpn-binding-domainB-uuid`' />
-                                                                                                    <parameter name='vpn-name' value='`$prop.vpn-binding-domainB-uuid`' />
+                                                                                                    <parameter name='vpn-name' value='`$prop.otn-tunnel-name`' />
                                                                                                     <parameter name='access-provider-id' value='`$domain-B.provider-id`' />
                                                                                                     <!--<parameter name='access-provider-id' value='`$param-prefix-domainB[$param-prefix-domainB_length -9]`' />-->
                                                                                                     <parameter name='access-client-id' value='`$domain-B.client-id`' />
diff --git a/platform-logic/restapi-templates/src/main/json/ts-ethernet-service.json b/platform-logic/restapi-templates/src/main/json/ts-ethernet-service.json
index 50a82fb8..5842e0bb 100644
--- a/platform-logic/restapi-templates/src/main/json/ts-ethernet-service.json
+++ b/platform-logic/restapi-templates/src/main/json/ts-ethernet-service.json
@@ -3,6 +3,7 @@
         "etht-svc-instances":[
             {
                 "etht-svc-name": ${eth-service-name},
+                "ietf-optical-slice:slice-id": ${slice-id},
                 "etht-svc-descr": "Ethernet-over-OTN",
                 "etht-svc-type": "ietf-eth-tran-types:p2p-svc",
                 "te-topology-identifier":{
@@ -42,8 +43,8 @@
                         "service-classification-type":"ietf-eth-tran-types:vlan-classification",
                         "ingress-egress-bandwidth-profile":{
                             "bandwidth-profile-type":"ietf-eth-tran-types:mef-10-bwp",
-                            "CIR":5000,
-                            "EIR":5000
+                            "CIR": ${CIR},
+                            "EIR":${EIR}
                         }
                     }
                 ]
-- 
2.16.6