From: Hesam Rahimi <hesam.rahimi@huawei.com>
Date: Sun, 6 Feb 2022 15:05:53 +0000 (-0500)
Subject: - Support for the Transport Slicing use-case to work with the updated YANG models
X-Git-Tag: 2.3.0~7
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=sdnc%2Foam.git;a=commitdiff_plain;h=2a546f93ac1c3686f099549fc88cd8bf2d39bd20

- Support for the Transport Slicing use-case to work with the updated YANG models
and ACTN PNC simulator.
- Mark service-instance as "Activated" and "Deactivated" accordingly when a slice
is getting activated or deactivated.

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

Former-commit-id: b7aecf8c2e75f444d096f950cfdc0844610795aa
---

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 02a760d5..79f77462 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": "acf9e544.d632d8",
+        "id": "8976bcf1.70ac48",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 130,
-        "y": 80,
-        "z": "4996e636.3ea08",
+        "x": 233.75,
+        "y": 126.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "ca913714.8e299"
+                "b1b89c9d.983348"
             ]
         ]
     },
     {
-        "id": "ca913714.8e299",
+        "id": "b1b89c9d.983348",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,2326 +22,2356 @@
         "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": 261.2856903076172,
-        "y": 129.23810863494873,
-        "z": "4996e636.3ea08",
+        "x": 365.0356903076172,
+        "y": 175.98810863494873,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "fb417168.600308"
+                "b0c84a88.7eefc"
             ]
         ]
     },
     {
-        "id": "fb417168.600308",
+        "id": "b0c84a88.7eefc",
         "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": 264.4286193847656,
-        "y": 214.00003242492676,
-        "z": "4996e636.3ea08",
+        "x": 368.1786193847656,
+        "y": 260.75003242492676,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "b8f0421e.565ff8"
+                "d31d270a.ac188"
             ]
         ]
     },
     {
-        "id": "b8f0421e.565ff8",
+        "id": "d31d270a.ac188",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 414.238037109375,
-        "y": 343.6666564941406,
-        "z": "4996e636.3ea08",
+        "x": 517.988037109375,
+        "y": 390.4166564941406,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "77ab8d82.d7040c",
-                "161b3712.e40a99",
-                "441438f3.47d108"
+                "67b5a6fb.99f89",
+                "31666720.2f23b8",
+                "1b5adc13.083b6c"
             ]
         ]
     },
     {
-        "id": "77ab8d82.d7040c",
+        "id": "67b5a6fb.99f89",
         "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": 682.5716552734375,
-        "y": 730.59716796875,
-        "z": "4996e636.3ea08",
+        "x": 786.3216552734375,
+        "y": 777.34716796875,
+        "z": "21b8a150.843866",
         "wires": []
     },
     {
-        "id": "cd3b0e66.721858",
+        "id": "1bac3f01.eca921",
         "type": "comment",
         "name": "new for TransportSlicing",
         "info": "",
         "comments": "",
-        "x": 714,
-        "y": 405,
-        "z": "4996e636.3ea08",
+        "x": 817.75,
+        "y": 451.75,
+        "z": "21b8a150.843866",
         "wires": []
     },
     {
-        "id": "161b3712.e40a99",
+        "id": "31666720.2f23b8",
         "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": 734,
-        "y": 501,
-        "z": "4996e636.3ea08",
+        "x": 837.75,
+        "y": 547.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "a50bfd24.6ac44",
-                "3bd3a68e.896b3a",
-                "320764b6.9fa15c"
+                "963616f2.8f1aa8",
+                "d3eed549.904728",
+                "b7b5ac0a.4b96c"
             ]
         ]
     },
     {
-        "id": "a50bfd24.6ac44",
+        "id": "963616f2.8f1aa8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 953,
-        "y": 439,
-        "z": "4996e636.3ea08",
+        "x": 1056.75,
+        "y": 485.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "b122e042.5ab94"
+                "85a98f1d.b180e"
             ]
         ]
     },
     {
-        "id": "3bd3a68e.896b3a",
+        "id": "d3eed549.904728",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 962.490966796875,
-        "y": 481.57403564453125,
-        "z": "4996e636.3ea08",
+        "x": 1066.240966796875,
+        "y": 528.3240356445312,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "4e666373.42b6cc"
+                "bfe60f89.4e364"
             ]
         ]
     },
     {
-        "id": "320764b6.9fa15c",
+        "id": "b7b5ac0a.4b96c",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 951,
-        "y": 528,
-        "z": "4996e636.3ea08",
+        "x": 1054.75,
+        "y": 574.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "422b64b3.e06004"
+                "2df6c7e.346a038"
             ]
         ]
     },
     {
-        "id": "4e666373.42b6cc",
+        "id": "bfe60f89.4e364",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 1116.0623779296875,
-        "y": 484.8597717285156,
-        "z": "4996e636.3ea08",
+        "x": 1219.8123779296875,
+        "y": 531.6097717285156,
+        "z": "21b8a150.843866",
         "wires": []
     },
     {
-        "id": "422b64b3.e06004",
+        "id": "2df6c7e.346a038",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 1120,
-        "y": 529,
-        "z": "4996e636.3ea08",
+        "x": 1223.75,
+        "y": 575.75,
+        "z": "21b8a150.843866",
         "wires": []
     },
     {
-        "id": "b122e042.5ab94",
+        "id": "85a98f1d.b180e",
         "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": 1150,
-        "y": 435,
-        "z": "4996e636.3ea08",
+        "x": 1253.75,
+        "y": 481.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "111942fe.354315"
+                "58591981.123b78"
             ]
         ]
     },
     {
-        "id": "111942fe.354315",
+        "id": "58591981.123b78",
         "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": 1373.33349609375,
-        "y": 434.99993896484375,
-        "z": "4996e636.3ea08",
+        "x": 1477.08349609375,
+        "y": 481.74993896484375,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "ff15f851.7a7528"
+                "56e0d242.b4b17c"
             ]
         ]
     },
     {
-        "id": "ff15f851.7a7528",
+        "id": "56e0d242.b4b17c",
         "type": "outcome",
         "name": "connectivity",
         "xml": "<outcome value='connectivity'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1574.0001335144043,
-        "y": 436.00002098083496,
-        "z": "4996e636.3ea08",
+        "x": 1677.7501335144043,
+        "y": 482.75002098083496,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "cf901b65.835fc8"
+                "463ca820.11cf78"
             ]
         ]
     },
     {
-        "id": "72376cd1.cdcaec",
+        "id": "bda858bd.a9d128",
         "type": "set",
         "name": "set attachment_param for OTN A",
         "xml": "<set>\n<parameter name='src-node-id' value='`$tmp.aai.vpn-bindingA.src-access-node-id`' />\n<parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingA.dst-access-node-id`' />\n<!--<parameter name='dst-tpn-id' value='1' />-->\n<parameter name='dst-tpn-id' value='`$tmp.aai.vpn-bindingA.customer-vpn-id`' />\n<parameter name='dst-ttp-id' value='`$tmp.aai.vpn-bindingA.dst-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='otn-tunnel-name-src-domain' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n<parameter name='client-id' value='`$tmp.aai.vpn-bindingA.access-client-id`' />\n<parameter name='provider-id' value='`$tmp.aai.vpn-bindingA.access-provider-id`' />\n<parameter name='topology-id' value='`$tmp.aai.vpn-bindingA.access-topology-id`' />\n",
         "comments": "",
-        "x": 4393,
-        "y": 152,
-        "z": "4996e636.3ea08",
+        "x": 4496.75,
+        "y": 198.75,
+        "z": "21b8a150.843866",
         "wires": []
     },
     {
-        "id": "2a89aa53.8890b6",
+        "id": "be3c5cce.b55c98",
         "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": 4474,
-        "y": 467,
-        "z": "4996e636.3ea08",
+        "x": 4577.75,
+        "y": 513.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "40316706.17eb48",
-                "6c473f1b.946a08"
+                "a29e7e17.b5f91",
+                "3da90d10.f4de92"
             ]
         ]
     },
     {
-        "id": "40316706.17eb48",
+        "id": "a29e7e17.b5f91",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4783.5,
-        "y": 436,
-        "z": "4996e636.3ea08",
+        "x": 4887.25,
+        "y": 482.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "aea69973.33e85"
+                "878c441e.87326"
             ]
         ]
     },
     {
-        "id": "6c473f1b.946a08",
+        "id": "3da90d10.f4de92",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4788.5,
-        "y": 501,
-        "z": "4996e636.3ea08",
+        "x": 4892.25,
+        "y": 547.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "d21a082d.2cad68"
+                "d4311e2b.569f08"
             ]
         ]
     },
     {
-        "id": "aea69973.33e85",
+        "id": "878c441e.87326",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 4959.5,
-        "y": 436,
-        "z": "4996e636.3ea08",
+        "x": 5063.25,
+        "y": 482.75,
+        "z": "21b8a150.843866",
         "wires": []
     },
     {
-        "id": "d21a082d.2cad68",
+        "id": "d4311e2b.569f08",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4955,
-        "y": 501,
-        "z": "4996e636.3ea08",
+        "x": 5058.75,
+        "y": 547.75,
+        "z": "21b8a150.843866",
         "wires": [
             []
         ]
     },
     {
-        "id": "de94f6d4.eda0e",
+        "id": "3e803655.1b101a",
         "type": "set",
         "name": "set sotn_value",
         "xml": "<set>\n<!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.connectivity-id`' />-->\n<parameter name='eth-service-name' value='`$tmp.aai.connectivityA.etht-svc-name`' />\n<parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />\n<parameter name='provider-id' value='`$tmp.aai.connectivityA.access-provider-id`' />\n<parameter name='client-id' value='`$tmp.aai.connectivityA.access-client-id`' />\n<parameter name='topology-id' value='`$tmp.aai.connectivityA.access-topology-id`' />\n<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityA.connectivity-id`' />\n<parameter name='index-number' value='0' />\n<parameter name='eth-node-id' value='`$tmp.aai.connectivityA.access-node-id`' />\n<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityA.access-ltp-id`' />\n<parameter name='CIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />\n<parameter name='EIR' value='`$tmp.aai.vpn-bindingA.route-distinguisher *1000000`' />\n<parameter name='cvlan' value='`$tmp.aai.connectivityA.cvlan`' />\n",
         "comments": "",
-        "x": 4340.5,
-        "y": 655,
-        "z": "4996e636.3ea08",
+        "x": 4444.25,
+        "y": 701.75,
+        "z": "21b8a150.843866",
         "wires": []
     },
     {
-        "id": "342bfbf3.ee642c",
+        "id": "4c6ccd14.a8a574",
         "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": 4494.5,
-        "y": 703,
-        "z": "4996e636.3ea08",
+        "x": 4598.25,
+        "y": 749.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "8236b8ec.5fd17",
-                "51c5e2c3.871744"
+                "276414cf.b4df2c",
+                "64503714.72c7f8"
             ]
         ]
     },
     {
-        "id": "8236b8ec.5fd17",
+        "id": "276414cf.b4df2c",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4840,
-        "y": 684,
-        "z": "4996e636.3ea08",
+        "x": 4943.75,
+        "y": 730.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "b89e8953.c6ac88"
+                "102e191c.056cc7"
             ]
         ]
     },
     {
-        "id": "51c5e2c3.871744",
+        "id": "64503714.72c7f8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4844,
-        "y": 724,
-        "z": "4996e636.3ea08",
+        "x": 4947.75,
+        "y": 770.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "933ba47e.14e65"
+                "24862939.f8dc8e"
             ]
         ]
     },
     {
-        "id": "b89e8953.c6ac88",
+        "id": "102e191c.056cc7",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 4998,
-        "y": 684,
-        "z": "4996e636.3ea08",
+        "x": 5101.75,
+        "y": 730.75,
+        "z": "21b8a150.843866",
         "wires": []
     },
     {
-        "id": "933ba47e.14e65",
+        "id": "24862939.f8dc8e",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 5001.5,
-        "y": 724,
-        "z": "4996e636.3ea08",
+        "x": 5105.25,
+        "y": 770.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "363131ab.be28b6",
-                "fcee3485.dea4a"
+                "21b9b574.b5d392",
+                "9fb31567.2a4df8",
+                "88154427.646e5"
             ]
         ]
     },
     {
-        "id": "776cbd7.844f0c4",
+        "id": "a1a69def.dde488",
         "type": "comment",
         "name": "TODO: FIXME:",
         "info": "put proper values based on connectivity resource retrieved from AAI",
         "comments": "",
-        "x": 4338,
-        "y": 611,
-        "z": "4996e636.3ea08",
+        "x": 4441.75,
+        "y": 657.75,
+        "z": "21b8a150.843866",
         "wires": []
     },
     {
-        "id": "363131ab.be28b6",
+        "id": "21b9b574.b5d392",
         "type": "save",
         "name": "update vpn-binding A resource (aka. OTN domainA) in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingA.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-bindingA.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 5332,
-        "y": 689,
-        "z": "4996e636.3ea08",
+        "x": 5435.75,
+        "y": 735.75,
+        "z": "21b8a150.843866",
         "wires": [
             []
         ]
     },
     {
-        "id": "d8ba5ee6.a5736",
+        "id": "88c6cc39.d0a418",
         "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": 5196,
-        "y": 648,
-        "z": "4996e636.3ea08",
+        "x": 5299.75,
+        "y": 694.75,
+        "z": "21b8a150.843866",
         "wires": []
     },
     {
-        "id": "fcee3485.dea4a",
+        "id": "9fb31567.2a4df8",
         "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": 5259,
-        "y": 735,
-        "z": "4996e636.3ea08",
+        "x": 5362.75,
+        "y": 781.75,
+        "z": "21b8a150.843866",
         "wires": [
             []
         ]
     },
     {
-        "id": "9b9c3cba.716c78",
+        "id": "3c21bf12.e3cf58",
         "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": 4331,
-        "y": 200,
-        "z": "4996e636.3ea08",
+        "x": 4434.75,
+        "y": 246.75,
+        "z": "21b8a150.843866",
         "wires": []
     },
     {
-        "id": "5f8cf8c6.3002c8",
+        "id": "70ce80db.d98e2",
         "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": 4357,
-        "y": 317,
-        "z": "4996e636.3ea08",
+        "x": 4460.75,
+        "y": 363.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "33823e1a.9269c2",
-                "b38b9e38.f8c8a8",
-                "9f21383a.68cb9"
+                "cd855b12.4c7648",
+                "e908220c.f2eba8",
+                "9142c53.c51d0b8"
             ]
         ]
     },
     {
-        "id": "33823e1a.9269c2",
+        "id": "cd855b12.4c7648",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4552.5001220703125,
-        "y": 269,
-        "z": "4996e636.3ea08",
+        "x": 4656.2501220703125,
+        "y": 315.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "755b5bf3.347744"
+                "a4edf485.1b87b"
             ]
         ]
     },
     {
-        "id": "b38b9e38.f8c8a8",
+        "id": "e908220c.f2eba8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4544.5001220703125,
-        "y": 324,
-        "z": "4996e636.3ea08",
+        "x": 4648.2501220703125,
+        "y": 370.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "5d1291bc.3b9d5"
+                "9b453a42.4c355"
             ]
         ]
     },
     {
-        "id": "755b5bf3.347744",
+        "id": "a4edf485.1b87b",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4696.8824462890625,
-        "y": 268.6556701660156,
-        "z": "4996e636.3ea08",
+        "x": 4800.6324462890625,
+        "y": 315.4056701660156,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "5007d6bb.a571d"
+                "5c080425.067b9c"
             ]
         ]
     },
     {
-        "id": "c0da9575.eb2c6",
+        "id": "c0826996.0b6fb8",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5279,
-        "y": 271,
-        "z": "4996e636.3ea08",
+        "x": 5382.75,
+        "y": 317.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "1053f3a3.2846c4"
+                "2f8dc255.fe7e1e"
             ]
         ]
     },
     {
-        "id": "5007d6bb.a571d",
+        "id": "5c080425.067b9c",
         "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": 4881,
-        "y": 267,
-        "z": "4996e636.3ea08",
+        "x": 4984.75,
+        "y": 313.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "33b94d0d.c61ee2"
+                "495e68aa.ac002"
             ]
         ]
     },
     {
-        "id": "33b94d0d.c61ee2",
+        "id": "495e68aa.ac002",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5076,
-        "y": 267,
-        "z": "4996e636.3ea08",
+        "x": 5179.75,
+        "y": 313.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "c0da9575.eb2c6"
+                "c0826996.0b6fb8"
             ]
         ]
     },
     {
-        "id": "9f21383a.68cb9",
+        "id": "9142c53.c51d0b8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4549.5001220703125,
-        "y": 381,
-        "z": "4996e636.3ea08",
+        "x": 4653.2501220703125,
+        "y": 427.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "e621d08a.7d07a8"
+                "9ce4b617.939088"
             ]
         ]
     },
     {
-        "id": "e621d08a.7d07a8",
+        "id": "9ce4b617.939088",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 4701.5001220703125,
-        "y": 382,
-        "z": "4996e636.3ea08",
+        "x": 4805.2501220703125,
+        "y": 428.75,
+        "z": "21b8a150.843866",
         "wires": []
     },
     {
-        "id": "5d1291bc.3b9d5",
+        "id": "9b453a42.4c355",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 4712.5001220703125,
-        "y": 325,
-        "z": "4996e636.3ea08",
+        "x": 4816.2501220703125,
+        "y": 371.75,
+        "z": "21b8a150.843866",
         "wires": []
     },
     {
-        "id": "bace4f35.dcb4f",
+        "id": "e93c75e1.80ec18",
         "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": 5664,
-        "y": 284,
-        "z": "4996e636.3ea08",
+        "x": 5767.75,
+        "y": 330.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "41428f.b99c7d7",
-                "92b16ebc.198be8",
-                "47593c0a.609b2c"
+                "31d08ad5.ae1df6",
+                "38f9754c.f69992",
+                "31e3f0ee.1be648"
             ]
         ]
     },
     {
-        "id": "1053f3a3.2846c4",
+        "id": "2f8dc255.fe7e1e",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5458,
-        "y": 271,
-        "z": "4996e636.3ea08",
+        "x": 5561.75,
+        "y": 317.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "db2fdd1f.f44e1",
-                "bace4f35.dcb4f"
+                "35fe1089.09d838",
+                "e93c75e1.80ec18"
             ]
         ]
     },
     {
-        "id": "db2fdd1f.f44e1",
+        "id": "35fe1089.09d838",
         "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": 5694,
-        "y": 232,
-        "z": "4996e636.3ea08",
+        "x": 5797.75,
+        "y": 278.75,
+        "z": "21b8a150.843866",
         "wires": []
     },
     {
-        "id": "41428f.b99c7d7",
+        "id": "31d08ad5.ae1df6",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5874,
-        "y": 275,
-        "z": "4996e636.3ea08",
+        "x": 5977.75,
+        "y": 321.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "d8c57966.bba2b8"
+                "dcbf70b.fe9e51"
             ]
         ]
     },
     {
-        "id": "92b16ebc.198be8",
+        "id": "38f9754c.f69992",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5866,
-        "y": 330,
-        "z": "4996e636.3ea08",
+        "x": 5969.75,
+        "y": 376.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "bbecf65b.0991f"
+                "b70d6ea.910679"
             ]
         ]
     },
     {
-        "id": "47593c0a.609b2c",
+        "id": "31e3f0ee.1be648",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5871,
-        "y": 387,
-        "z": "4996e636.3ea08",
+        "x": 5974.75,
+        "y": 433.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "17aa566c.ce27ba"
+                "96cd1d2a.b041a"
             ]
         ]
     },
     {
-        "id": "17aa566c.ce27ba",
+        "id": "96cd1d2a.b041a",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 6023,
-        "y": 388,
-        "z": "4996e636.3ea08",
+        "x": 6126.75,
+        "y": 434.75,
+        "z": "21b8a150.843866",
         "wires": []
     },
     {
-        "id": "bbecf65b.0991f",
+        "id": "b70d6ea.910679",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 6034,
-        "y": 333,
-        "z": "4996e636.3ea08",
+        "x": 6137.75,
+        "y": 379.75,
+        "z": "21b8a150.843866",
         "wires": []
     },
     {
-        "id": "d8c57966.bba2b8",
+        "id": "dcbf70b.fe9e51",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 6018.38232421875,
-        "y": 272.6556701660156,
-        "z": "4996e636.3ea08",
+        "x": 6122.13232421875,
+        "y": 319.4056701660156,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "eeaaed9f.46288"
+                "b0be4e8c.83ee08"
             ]
         ]
     },
     {
-        "id": "eeaaed9f.46288",
+        "id": "b0be4e8c.83ee08",
         "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": 6233,
-        "y": 269,
-        "z": "4996e636.3ea08",
+        "x": 6336.75,
+        "y": 315.75,
+        "z": "21b8a150.843866",
         "wires": []
     },
     {
-        "id": "441438f3.47d108",
+        "id": "1b5adc13.083b6c",
         "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": 700,
-        "y": 449,
-        "z": "4996e636.3ea08",
+        "x": 803.75,
+        "y": 495.75,
+        "z": "21b8a150.843866",
         "wires": [
             []
         ]
     },
     {
-        "id": "48e88b1.fd2c9f4",
+        "id": "321a405b.7459b8",
         "type": "set",
         "name": "set attachment_param for OTN B",
         "xml": "<set>\n<parameter name='src-node-id' value='`$tmp.aai.vpn-bindingB.src-access-node-id`' />\n<parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingB.dst-access-node-id`' />\n<!--<parameter name='src-tpn-id' value='1' />-->\n<parameter name='src-tpn-id' value='`$tmp.aai.vpn-bindingB.customer-vpn-id`' />\n<parameter name='src-ttp-id' value='`$tmp.aai.vpn-bindingB.src-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='otn-tunnel-name-dst-domain' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n<parameter name='client-id' value='`$tmp.aai.vpn-bindingB.access-client-id`' />\n<parameter name='provider-id' value='`$tmp.aai.vpn-bindingB.access-provider-id`' />\n<parameter name='topology-id' value='`$tmp.aai.vpn-bindingB.access-topology-id`' />\n",
         "comments": "",
-        "x": 3800,
-        "y": 1609,
-        "z": "4996e636.3ea08",
+        "x": 3903.75,
+        "y": 1655.75,
+        "z": "21b8a150.843866",
         "wires": []
     },
     {
-        "id": "46863424.f49acc",
+        "id": "13cb6aa6.78d01d",
         "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": 3863,
-        "y": 1938,
-        "z": "4996e636.3ea08",
+        "x": 3966.75,
+        "y": 1984.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "dcc57379.86dfe8",
-                "c898077c.fa069"
+                "10d81799.8466e",
+                "67bbae69.f0649"
             ]
         ]
     },
     {
-        "id": "dcc57379.86dfe8",
+        "id": "10d81799.8466e",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4158.5,
-        "y": 1905,
-        "z": "4996e636.3ea08",
+        "x": 4262.25,
+        "y": 1951.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "abcd166d.ac4418"
+                "892eb025.ee91a8"
             ]
         ]
     },
     {
-        "id": "c898077c.fa069",
+        "id": "67bbae69.f0649",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4163.5,
-        "y": 1970,
-        "z": "4996e636.3ea08",
+        "x": 4267.25,
+        "y": 2016.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "a337c775.425078"
+                "f603d29b.ff0438"
             ]
         ]
     },
     {
-        "id": "abcd166d.ac4418",
+        "id": "892eb025.ee91a8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 4326.5,
-        "y": 1905,
-        "z": "4996e636.3ea08",
+        "x": 4430.25,
+        "y": 1951.75,
+        "z": "21b8a150.843866",
         "wires": []
     },
     {
-        "id": "a337c775.425078",
+        "id": "f603d29b.ff0438",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4337,
-        "y": 1970,
-        "z": "4996e636.3ea08",
+        "x": 4440.75,
+        "y": 2016.75,
+        "z": "21b8a150.843866",
         "wires": [
             []
         ]
     },
     {
-        "id": "402d5da7.084ecc",
+        "id": "88f53e94.6d0a1",
         "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": 3739,
-        "y": 1666,
-        "z": "4996e636.3ea08",
+        "x": 3842.75,
+        "y": 1712.75,
+        "z": "21b8a150.843866",
         "wires": []
     },
     {
-        "id": "600572d7.37f4f4",
+        "id": "3fa49f7e.accef8",
         "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": 3759,
-        "y": 1763,
-        "z": "4996e636.3ea08",
+        "x": 3862.75,
+        "y": 1809.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "a75ca9d.3439f58",
-                "399b40eb.8cb2c",
-                "c23ae6cb.c49a18"
+                "ebf12595.10e938",
+                "efabfdfe.5ba96",
+                "205446da.fa0a6a"
             ]
         ]
     },
     {
-        "id": "a75ca9d.3439f58",
+        "id": "ebf12595.10e938",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3961.5001220703125,
-        "y": 1716,
-        "z": "4996e636.3ea08",
+        "x": 4065.2501220703125,
+        "y": 1762.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "7c251cdc.702f24"
+                "3bb96014.a51678"
             ]
         ]
     },
     {
-        "id": "399b40eb.8cb2c",
+        "id": "efabfdfe.5ba96",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3953.5001220703125,
-        "y": 1771,
-        "z": "4996e636.3ea08",
+        "x": 4057.2501220703125,
+        "y": 1817.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "9ad884c8.666098"
+                "6194e30c.a75eac"
             ]
         ]
     },
     {
-        "id": "7c251cdc.702f24",
+        "id": "3bb96014.a51678",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4105.8824462890625,
-        "y": 1713.6556701660156,
-        "z": "4996e636.3ea08",
+        "x": 4209.6324462890625,
+        "y": 1760.4056701660156,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "cb9eeb5b.e8a49"
+                "60e39d5f.e73f74"
             ]
         ]
     },
     {
-        "id": "cb9eeb5b.e8a49",
+        "id": "60e39d5f.e73f74",
         "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": 4290,
-        "y": 1728,
-        "z": "4996e636.3ea08",
+        "x": 4393.75,
+        "y": 1774.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "3d062c6c.6ff5d4"
+                "f8535a31.25ce18"
             ]
         ]
     },
     {
-        "id": "c23ae6cb.c49a18",
+        "id": "205446da.fa0a6a",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3958.5001220703125,
-        "y": 1828,
-        "z": "4996e636.3ea08",
+        "x": 4062.2501220703125,
+        "y": 1874.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "c325aab2.4755e"
+                "126fd357.b0d735"
             ]
         ]
     },
     {
-        "id": "c325aab2.4755e",
+        "id": "126fd357.b0d735",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 4110.5001220703125,
-        "y": 1829,
-        "z": "4996e636.3ea08",
+        "x": 4214.2501220703125,
+        "y": 1875.75,
+        "z": "21b8a150.843866",
         "wires": []
     },
     {
-        "id": "9ad884c8.666098",
+        "id": "6194e30c.a75eac",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 4121.5001220703125,
-        "y": 1774,
-        "z": "4996e636.3ea08",
+        "x": 4225.2501220703125,
+        "y": 1820.75,
+        "z": "21b8a150.843866",
         "wires": []
     },
     {
-        "id": "34bca75e.e09988",
+        "id": "a4686eb2.3a15b8",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4688,
-        "y": 1732,
-        "z": "4996e636.3ea08",
+        "x": 4791.75,
+        "y": 1778.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "edc0cd69.586d38"
+                "dd82991b.5dd978"
             ]
         ]
     },
     {
-        "id": "3d062c6c.6ff5d4",
+        "id": "f8535a31.25ce18",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4485,
-        "y": 1728,
-        "z": "4996e636.3ea08",
+        "x": 4588.75,
+        "y": 1774.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "34bca75e.e09988"
+                "a4686eb2.3a15b8"
             ]
         ]
     },
     {
-        "id": "f5373d88.e0f4c",
+        "id": "ad6998e4.c7769",
         "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": 5073,
-        "y": 1731,
-        "z": "4996e636.3ea08",
+        "x": 5176.75,
+        "y": 1777.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "efe05c93.e4bd48",
-                "c004c915.8de7",
-                "8875f4b.bcb6f88"
+                "f50cc222.33dcd",
+                "8488316b.70cb5",
+                "804e8e55.127ce"
             ]
         ]
     },
     {
-        "id": "edc0cd69.586d38",
+        "id": "dd82991b.5dd978",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4865,
-        "y": 1724,
-        "z": "4996e636.3ea08",
+        "x": 4968.75,
+        "y": 1770.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "bd388c7d.2a51e",
-                "f5373d88.e0f4c"
+                "c219345a.333ee8",
+                "ad6998e4.c7769"
             ]
         ]
     },
     {
-        "id": "bd388c7d.2a51e",
+        "id": "c219345a.333ee8",
         "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": 5103,
-        "y": 1679,
-        "z": "4996e636.3ea08",
+        "x": 5206.75,
+        "y": 1725.75,
+        "z": "21b8a150.843866",
         "wires": []
     },
     {
-        "id": "c54d67f1.3a38c8",
+        "id": "5afc9335.91bec4",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 5432,
-        "y": 1835,
-        "z": "4996e636.3ea08",
+        "x": 5535.75,
+        "y": 1881.75,
+        "z": "21b8a150.843866",
         "wires": []
     },
     {
-        "id": "56448bab.caa82c",
+        "id": "bba1d37e.3ac768",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 5443,
-        "y": 1780,
-        "z": "4996e636.3ea08",
+        "x": 5546.75,
+        "y": 1826.75,
+        "z": "21b8a150.843866",
         "wires": []
     },
     {
-        "id": "97f3ba34.f2dc7",
+        "id": "4872e24d.b18cd4",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5427.38232421875,
-        "y": 1719.6556701660156,
-        "z": "4996e636.3ea08",
+        "x": 5531.13232421875,
+        "y": 1766.4056701660156,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "5b487de9.7c9484"
+                "4b7568ba.14d37"
             ]
         ]
     },
     {
-        "id": "5b487de9.7c9484",
+        "id": "4b7568ba.14d37",
         "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": 5642,
-        "y": 1716,
-        "z": "4996e636.3ea08",
+        "x": 5745.75,
+        "y": 1762.75,
+        "z": "21b8a150.843866",
         "wires": []
     },
     {
-        "id": "efe05c93.e4bd48",
+        "id": "f50cc222.33dcd",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5283,
-        "y": 1722,
-        "z": "4996e636.3ea08",
+        "x": 5386.75,
+        "y": 1768.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "97f3ba34.f2dc7"
+                "4872e24d.b18cd4"
             ]
         ]
     },
     {
-        "id": "c004c915.8de7",
+        "id": "8488316b.70cb5",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5275,
-        "y": 1777,
-        "z": "4996e636.3ea08",
+        "x": 5378.75,
+        "y": 1823.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "56448bab.caa82c"
+                "bba1d37e.3ac768"
             ]
         ]
     },
     {
-        "id": "8875f4b.bcb6f88",
+        "id": "804e8e55.127ce",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5280,
-        "y": 1834,
-        "z": "4996e636.3ea08",
+        "x": 5383.75,
+        "y": 1880.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "c54d67f1.3a38c8"
+                "5afc9335.91bec4"
             ]
         ]
     },
     {
-        "id": "cf901b65.835fc8",
+        "id": "463ca820.11cf78",
         "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": 1812,
-        "y": 438,
-        "z": "4996e636.3ea08",
+        "x": 1915.75,
+        "y": 484.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "a3e158df.aec638",
-                "28bc0271.0f9e9e",
-                "12a8a0b5.4084c7"
+                "2eb4dc08.7f1c34",
+                "fa210005.600e9",
+                "cf2c914d.6b904"
             ]
         ]
     },
     {
-        "id": "a3e158df.aec638",
+        "id": "2eb4dc08.7f1c34",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2020,
-        "y": 402,
-        "z": "4996e636.3ea08",
+        "x": 2123.75,
+        "y": 448.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "8651df9.9efa52"
+                "fdf5ae6d.1a01"
             ]
         ]
     },
     {
-        "id": "28bc0271.0f9e9e",
+        "id": "fa210005.600e9",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2020.490966796875,
-        "y": 447.57403564453125,
-        "z": "4996e636.3ea08",
+        "x": 2124.240966796875,
+        "y": 494.32403564453125,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "b3859ee9.a63778"
+                "f1f7e3b1.bd8ea8"
             ]
         ]
     },
     {
-        "id": "12a8a0b5.4084c7",
+        "id": "cf2c914d.6b904",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2018,
-        "y": 491,
-        "z": "4996e636.3ea08",
+        "x": 2121.75,
+        "y": 537.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "b1a3023.979458"
+                "da54cf61.ae1b78"
             ]
         ]
     },
     {
-        "id": "b3859ee9.a63778",
+        "id": "f1f7e3b1.bd8ea8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 2183.0623779296875,
-        "y": 447.8597717285156,
-        "z": "4996e636.3ea08",
+        "x": 2286.8123779296875,
+        "y": 494.6097717285156,
+        "z": "21b8a150.843866",
         "wires": []
     },
     {
-        "id": "b1a3023.979458",
+        "id": "da54cf61.ae1b78",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 2187,
-        "y": 492,
-        "z": "4996e636.3ea08",
+        "x": 2290.75,
+        "y": 538.75,
+        "z": "21b8a150.843866",
         "wires": []
     },
     {
-        "id": "e921a3d6.75f8b8",
+        "id": "7cc4f06d.7fdaa",
         "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": 2493,
-        "y": 491,
-        "z": "4996e636.3ea08",
+        "x": 2596.75,
+        "y": 537.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "19de242e.79b56c",
-                "e1533c2.9fadc4",
-                "da41548.4c59da8"
+                "48c45912.635ab8",
+                "a55b1245.6d5a98",
+                "5114317.7fef9d"
             ]
         ]
     },
     {
-        "id": "108df7f5.f0405",
+        "id": "f222a91f.adc5a8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2873,
-        "y": 579,
-        "z": "4996e636.3ea08",
+        "x": 2976.75,
+        "y": 625.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "19520422.b45d4c"
+                "941633f0.a03e2"
             ]
         ]
     },
     {
-        "id": "19de242e.79b56c",
+        "id": "48c45912.635ab8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2704,
-        "y": 580,
-        "z": "4996e636.3ea08",
+        "x": 2807.75,
+        "y": 626.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "108df7f5.f0405"
+                "f222a91f.adc5a8"
             ]
         ]
     },
     {
-        "id": "e1533c2.9fadc4",
+        "id": "a55b1245.6d5a98",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2706.490966796875,
-        "y": 475.57403564453125,
-        "z": "4996e636.3ea08",
+        "x": 2810.240966796875,
+        "y": 522.3240356445312,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "efbdd7a3.5958d8"
+                "c2aa70b6.4baf8"
             ]
         ]
     },
     {
-        "id": "da41548.4c59da8",
+        "id": "5114317.7fef9d",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2702,
-        "y": 520,
-        "z": "4996e636.3ea08",
+        "x": 2805.75,
+        "y": 566.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "e03f3a11.4be118"
+                "3cb9370e.446c48"
             ]
         ]
     },
     {
-        "id": "e03f3a11.4be118",
+        "id": "3cb9370e.446c48",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 2870,
-        "y": 520,
-        "z": "4996e636.3ea08",
+        "x": 2973.75,
+        "y": 566.75,
+        "z": "21b8a150.843866",
         "wires": []
     },
     {
-        "id": "efbdd7a3.5958d8",
+        "id": "c2aa70b6.4baf8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 2869.0625,
-        "y": 474.8597412109375,
-        "z": "4996e636.3ea08",
+        "x": 2972.8125,
+        "y": 521.6097412109375,
+        "z": "21b8a150.843866",
         "wires": []
     },
     {
-        "id": "8651df9.9efa52",
+        "id": "fdf5ae6d.1a01",
         "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": 2221,
-        "y": 397,
-        "z": "4996e636.3ea08",
+        "x": 2324.75,
+        "y": 443.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "6856373e.df8d5"
+                "de0f0110.005fa8"
             ]
         ]
     },
     {
-        "id": "6856373e.df8d5",
+        "id": "de0f0110.005fa8",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2426,
-        "y": 397,
-        "z": "4996e636.3ea08",
+        "x": 2529.75,
+        "y": 443.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "61b4f44b.e9282c"
+                "a755493f.53e5c"
             ]
         ]
     },
     {
-        "id": "61b4f44b.e9282c",
+        "id": "a755493f.53e5c",
         "type": "outcome",
         "name": "vpn-binding",
         "xml": "<outcome value='vpn-binding'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2592,
-        "y": 397,
-        "z": "4996e636.3ea08",
+        "x": 2695.75,
+        "y": 443.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "9aa1bdef.a85148"
+                "30deb2e6.ddbdde"
             ]
         ]
     },
     {
-        "id": "9aa1bdef.a85148",
+        "id": "30deb2e6.ddbdde",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2755,
-        "y": 397,
-        "z": "4996e636.3ea08",
+        "x": 2858.75,
+        "y": 443.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "e921a3d6.75f8b8",
-                "8b7a547c.5a78f8"
+                "7cc4f06d.7fdaa",
+                "5a3b76e5.927ca8"
             ]
         ]
     },
     {
-        "id": "61cd75bc.541bfc",
+        "id": "e892b304.06846",
         "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": 3314,
-        "y": 680,
-        "z": "4996e636.3ea08",
+        "x": 3417.75,
+        "y": 726.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "ce7e100e.65e8d8",
-                "978d0324.53a218"
+                "21602510.29ed62",
+                "bcc4ade6.f232"
             ]
         ]
     },
     {
-        "id": "ce7e100e.65e8d8",
+        "id": "21602510.29ed62",
         "type": "outcome",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3528,
-        "y": 717,
-        "z": "4996e636.3ea08",
+        "x": 3631.75,
+        "y": 763.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "d3a9cf8b.6d8898"
+                "134315e7.fd7042"
             ]
         ]
     },
     {
-        "id": "978d0324.53a218",
+        "id": "bcc4ade6.f232",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3530,
-        "y": 655,
-        "z": "4996e636.3ea08",
+        "x": 3633.75,
+        "y": 701.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "eacef09.695731"
+                "3ace6707.d27cb8"
             ]
         ]
     },
     {
-        "id": "d3a9cf8b.6d8898",
+        "id": "134315e7.fd7042",
         "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": 3108,
-        "y": 1960,
-        "z": "4996e636.3ea08",
+        "x": 3211.75,
+        "y": 2006.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "a298a9c0.8f44e8",
-                "ca55eca6.1cb808"
+                "36f11901.c669fe",
+                "3d3a4221.98f866"
             ]
         ]
     },
     {
-        "id": "a298a9c0.8f44e8",
+        "id": "36f11901.c669fe",
         "type": "outcome",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3361,
-        "y": 1994,
-        "z": "4996e636.3ea08",
+        "x": 3464.75,
+        "y": 2040.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "c785caf0.121d"
+                "861f9ff3.a542f8"
             ]
         ]
     },
     {
-        "id": "ca55eca6.1cb808",
+        "id": "3d3a4221.98f866",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3361,
-        "y": 1938,
-        "z": "4996e636.3ea08",
+        "x": 3464.75,
+        "y": 1984.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "6d0b6c95.2359f4"
+                "cd34c51c.32ff6"
             ]
         ]
     },
     {
-        "id": "c785caf0.121d",
+        "id": "861f9ff3.a542f8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3512,
-        "y": 1994,
-        "z": "4996e636.3ea08",
+        "x": 3615.75,
+        "y": 2040.75,
+        "z": "21b8a150.843866",
         "wires": []
     },
     {
-        "id": "2abfc3f7.2295e4",
+        "id": "37ab634e.8eb82c",
         "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": 4388,
-        "y": 92,
-        "z": "4996e636.3ea08",
+        "x": 4491.75,
+        "y": 138.75,
+        "z": "21b8a150.843866",
         "wires": []
     },
     {
-        "id": "ebb770b7.bb1a4",
+        "id": "e9288827.8d4e48",
         "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": 3796,
-        "y": 1551,
-        "z": "4996e636.3ea08",
+        "x": 3899.75,
+        "y": 1597.75,
+        "z": "21b8a150.843866",
         "wires": []
     },
     {
-        "id": "bcb6d938.081b58",
+        "id": "5833352c.36b4cc",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4079,
-        "y": 349,
-        "z": "4996e636.3ea08",
+        "x": 4182.75,
+        "y": 395.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "2abfc3f7.2295e4",
-                "72376cd1.cdcaec",
-                "9b9c3cba.716c78",
-                "5f8cf8c6.3002c8",
-                "de94f6d4.eda0e",
-                "342bfbf3.ee642c",
-                "2a89aa53.8890b6"
+                "37ab634e.8eb82c",
+                "bda858bd.a9d128",
+                "3c21bf12.e3cf58",
+                "70ce80db.d98e2",
+                "3e803655.1b101a",
+                "4c6ccd14.a8a574",
+                "be3c5cce.b55c98"
             ]
         ]
     },
     {
-        "id": "6d0b6c95.2359f4",
+        "id": "cd34c51c.32ff6",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3512,
-        "y": 1937,
-        "z": "4996e636.3ea08",
+        "x": 3615.75,
+        "y": 1983.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "ebb770b7.bb1a4",
-                "48e88b1.fd2c9f4",
-                "402d5da7.084ecc",
-                "600572d7.37f4f4",
-                "46863424.f49acc",
-                "4aa8bc15.43053c",
-                "295ad948.4ab50e"
+                "e9288827.8d4e48",
+                "321a405b.7459b8",
+                "88f53e94.6d0a1",
+                "3fa49f7e.accef8",
+                "13cb6aa6.78d01d",
+                "6887177c.ca96",
+                "4e3c7c24.641514"
             ]
         ]
     },
     {
-        "id": "4aa8bc15.43053c",
+        "id": "6887177c.ca96",
         "type": "set",
         "name": "set sotn_value",
         "xml": "<set>\n<!--<parameter name='eth-service-name' value='`$tmp.aai.connectivityB.connectivity-id`' />-->\n<parameter name='eth-service-name' value='`$tmp.aai.connectivityB.etht-svc-name`' />\n<parameter name='slice-id' value='`$vnf-topology-operation-input.service-information.service-instance-id`' />\n<parameter name='provider-id' value='`$tmp.aai.connectivityB.access-provider-id`' />\n<parameter name='client-id' value='`$tmp.aai.connectivityB.access-client-id`' />\n<parameter name='topology-id' value='`$tmp.aai.connectivityB.access-topology-id`' />\n<parameter name='otn-tunnel-name' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n<parameter name='ethernet-end-point-name' value='`$tmp.aai.connectivityB.connectivity-id`' />\n<parameter name='index-number' value='0' />\n<parameter name='eth-node-id' value='`$tmp.aai.connectivityB.access-node-id`' />\n<parameter name='eth-node-tp-id' value='`$tmp.aai.connectivityB.access-ltp-id`' />\n<parameter name='CIR' value='`$tmp.aai.vpn-bindingB.route-distinguisher *1000000`' />\n<parameter name='EIR' value='`$tmp.aai.vpn-bindingB.route-distinguisher *1000000`' />\n<parameter name='cvlan' value='`$tmp.aai.connectivityB.cvlan`' />\n\n",
         "comments": "",
-        "x": 3741,
-        "y": 2080,
-        "z": "4996e636.3ea08",
+        "x": 3844.75,
+        "y": 2126.75,
+        "z": "21b8a150.843866",
         "wires": []
     },
     {
-        "id": "295ad948.4ab50e",
+        "id": "4e3c7c24.641514",
         "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": 3895,
-        "y": 2128,
-        "z": "4996e636.3ea08",
+        "x": 3998.75,
+        "y": 2174.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "ec9bb97a.fa7b4",
-                "d7a86063.21272"
+                "a995cca0.79095",
+                "691eaa5b.460a8c"
             ]
         ]
     },
     {
-        "id": "ec9bb97a.fa7b4",
+        "id": "a995cca0.79095",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4240.5,
-        "y": 2109,
-        "z": "4996e636.3ea08",
+        "x": 4344.25,
+        "y": 2155.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "23e4ab97.fe6f5c"
+                "8dda8416.3500c"
             ]
         ]
     },
     {
-        "id": "d7a86063.21272",
+        "id": "691eaa5b.460a8c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4244.5,
-        "y": 2149,
-        "z": "4996e636.3ea08",
+        "x": 4348.25,
+        "y": 2195.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "3d3a171d.cfa4"
+                "12034c01.7a6e24"
             ]
         ]
     },
     {
-        "id": "23e4ab97.fe6f5c",
+        "id": "8dda8416.3500c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 4398.5,
-        "y": 2109,
-        "z": "4996e636.3ea08",
+        "x": 4502.25,
+        "y": 2155.75,
+        "z": "21b8a150.843866",
         "wires": []
     },
     {
-        "id": "3d3a171d.cfa4",
+        "id": "12034c01.7a6e24",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4402,
-        "y": 2149,
-        "z": "4996e636.3ea08",
+        "x": 4505.75,
+        "y": 2195.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "5d084d8a.b2f23c",
-                "44dbf2a2.960644"
+                "7af02db5.1d648c",
+                "7e35a72c.c5049",
+                "ed48bc59.3a7d1"
             ]
         ]
     },
     {
-        "id": "ce171a50.073f6",
+        "id": "8f84b99e.0eac8",
         "type": "comment",
         "name": "TODO: FIXME:",
         "info": "put proper values based on connectivity resource retrieved from AAI",
         "comments": "",
-        "x": 3738.5,
-        "y": 2036,
-        "z": "4996e636.3ea08",
+        "x": 3842.25,
+        "y": 2082.75,
+        "z": "21b8a150.843866",
         "wires": []
     },
     {
-        "id": "5d084d8a.b2f23c",
+        "id": "7af02db5.1d648c",
         "type": "save",
         "name": "update vpn-binding B resource (aka. OTN domainB) in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-bindingB.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-bindingB.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n\n<parameter name='operational-status' value='Activated' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 4742,
-        "y": 2148,
-        "z": "4996e636.3ea08",
+        "x": 4845.75,
+        "y": 2194.75,
+        "z": "21b8a150.843866",
         "wires": [
             []
         ]
     },
     {
-        "id": "e7b454fe.3b5cb",
+        "id": "1abb03b6.c2733c",
         "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": 4600,
-        "y": 2106,
-        "z": "4996e636.3ea08",
+        "x": 4703.75,
+        "y": 2152.75,
+        "z": "21b8a150.843866",
         "wires": []
     },
     {
-        "id": "44dbf2a2.960644",
+        "id": "7e35a72c.c5049",
         "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": 4671,
-        "y": 2197,
-        "z": "4996e636.3ea08",
+        "x": 4774.75,
+        "y": 2243.75,
+        "z": "21b8a150.843866",
         "wires": [
             []
         ]
     },
     {
-        "id": "dcf1d309.aad128",
+        "id": "7f9728ff.5a56d",
         "type": "set",
         "name": "set attachment_param (gfp-n) for OTN",
         "xml": "<set>\n<parameter name='gfp-n' value='`$tmp.aai.vpn-binding.route-distinguisher`' />\n",
         "comments": "",
-        "x": 3305,
-        "y": 620,
-        "z": "4996e636.3ea08",
+        "x": 3408.75,
+        "y": 666.75,
+        "z": "21b8a150.843866",
         "wires": []
     },
     {
-        "id": "8b7a547c.5a78f8",
+        "id": "5a3b76e5.927ca8",
         "type": "set",
         "name": "unset tmp.aai.vpn-binding",
         "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value='' />\n",
         "comments": "",
-        "x": 2939,
-        "y": 268,
-        "z": "4996e636.3ea08",
+        "x": 3042.75,
+        "y": 314.75,
+        "z": "21b8a150.843866",
         "wires": []
     },
     {
-        "id": "29539dcf.178a92",
+        "id": "5dc7fe07.3de0e",
         "type": "comment",
         "name": "only dst ttp exists. No src",
         "info": "",
         "comments": "",
-        "x": 3900,
-        "y": 306,
-        "z": "4996e636.3ea08",
+        "x": 4003.75,
+        "y": 352.75,
+        "z": "21b8a150.843866",
         "wires": []
     },
     {
-        "id": "5f3074d9.b389cc",
+        "id": "95f7053c.6e7e8",
         "type": "comment",
         "name": "only src ttp exists. No dst",
         "info": "",
         "comments": "",
-        "x": 3457,
-        "y": 1884,
-        "z": "4996e636.3ea08",
+        "x": 3560.75,
+        "y": 1930.75,
+        "z": "21b8a150.843866",
         "wires": []
     },
     {
-        "id": "eacef09.695731",
+        "id": "3ace6707.d27cb8",
         "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": 3636,
-        "y": 468,
-        "z": "4996e636.3ea08",
+        "x": 3739.75,
+        "y": 514.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "f62c1164.a0b8",
-                "81b54f08.97d86"
+                "784800ed.f5bf68",
+                "38254c71.c979d4"
             ]
         ]
     },
     {
-        "id": "81b54f08.97d86",
+        "id": "38254c71.c979d4",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3878,
-        "y": 1057,
-        "z": "4996e636.3ea08",
+        "x": 3981.75,
+        "y": 1103.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "efc62266.57c198"
+                "8cda2b7.f98f558"
             ]
         ]
     },
     {
-        "id": "f62c1164.a0b8",
+        "id": "784800ed.f5bf68",
         "type": "outcome",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3872,
-        "y": 348,
-        "z": "4996e636.3ea08",
+        "x": 3975.75,
+        "y": 394.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "bcb6d938.081b58"
+                "5833352c.36b4cc"
             ]
         ]
     },
     {
-        "id": "efc62266.57c198",
+        "id": "8cda2b7.f98f558",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4036,
-        "y": 1056,
-        "z": "4996e636.3ea08",
+        "x": 4139.75,
+        "y": 1102.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "cb6a953c.fa71e8",
-                "263d4572.ce34fa",
-                "2e78dd82.d5612a",
-                "c61e9a44.c762a8",
-                "8ae64ab7.a00a7"
+                "b7c2373e.9cd388",
+                "147ed25c.bf0c96",
+                "9a1eac1c.da1de8",
+                "2922d6af.6c9642",
+                "6061bd4e.a66dac"
             ]
         ]
     },
     {
-        "id": "263d4572.ce34fa",
+        "id": "147ed25c.bf0c96",
         "type": "set",
         "name": "set attachment_param for OTN G",
         "xml": "<set>\n<parameter name='src-node-id' value='`$tmp.aai.vpn-bindingG.src-access-node-id`' />\n<parameter name='dst-node-id' value='`$tmp.aai.vpn-bindingG.dst-access-node-id`' />\n<!--<parameter name='dst-tpn-id' value='1' />-->\n<parameter name='src-tpn-id' value='`$tmp.aai.vpn-bindingG.customer-vpn-id`' />\n<parameter name='dst-tpn-id' value='`$tmp.aai.vpn-bindingG.customer-vpn-id`' />\n<parameter name='src-ttp-id' value='`$tmp.aai.vpn-bindingG.src-access-ltp-id`' />\n<parameter name='dst-ttp-id' value='`$tmp.aai.vpn-bindingG.dst-access-ltp-id`' />\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='otn-tunnel-name-domainG' value='`$tmp.aai.vpn-bindingG.vpn-name`' />\n<parameter name='client-id' value='`$tmp.aai.vpn-bindingG.access-client-id`' />\n<parameter name='provider-id' value='`$tmp.aai.vpn-bindingG.access-provider-id`' />\n<parameter name='topology-id' value='`$tmp.aai.vpn-bindingG.access-topology-id`' />\n",
         "comments": "",
-        "x": 4300,
-        "y": 939,
-        "z": "4996e636.3ea08",
+        "x": 4403.75,
+        "y": 985.75,
+        "z": "21b8a150.843866",
         "wires": []
     },
     {
-        "id": "8ae64ab7.a00a7",
+        "id": "6061bd4e.a66dac",
         "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-domainG-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainG.url + '/restconf/data/ietf-te:te'`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainG.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainG.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"patch\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 4381,
-        "y": 1254,
-        "z": "4996e636.3ea08",
+        "x": 4484.75,
+        "y": 1300.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "bd008f9d.f02308",
-                "91d1e4e0.3cbb38"
+                "de634d2d.e7705",
+                "961ea997.f45bc"
             ]
         ]
     },
     {
-        "id": "bd008f9d.f02308",
+        "id": "de634d2d.e7705",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4690.5,
-        "y": 1223,
-        "z": "4996e636.3ea08",
+        "x": 4794.25,
+        "y": 1269.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "270fab9f.26c71c"
+                "4e3f5895.525ca8"
             ]
         ]
     },
     {
-        "id": "91d1e4e0.3cbb38",
+        "id": "961ea997.f45bc",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4695.5,
-        "y": 1288,
-        "z": "4996e636.3ea08",
+        "x": 4799.25,
+        "y": 1334.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "49e9447.128b63c"
+                "8c3ef243.d5f688"
             ]
         ]
     },
     {
-        "id": "270fab9f.26c71c",
+        "id": "4e3f5895.525ca8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 4866.5,
-        "y": 1223,
-        "z": "4996e636.3ea08",
+        "x": 4970.25,
+        "y": 1269.75,
+        "z": "21b8a150.843866",
         "wires": []
     },
     {
-        "id": "49e9447.128b63c",
+        "id": "8c3ef243.d5f688",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4862,
-        "y": 1288,
-        "z": "4996e636.3ea08",
+        "x": 4965.75,
+        "y": 1334.75,
+        "z": "21b8a150.843866",
         "wires": [
             []
         ]
     },
     {
-        "id": "2e78dd82.d5612a",
+        "id": "9a1eac1c.da1de8",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.domainG.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.vpn-bindingG.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.vpn-bindingG.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.vpn-bindingG.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.vpn-bindingG.src-access-node-id`\" />\n",
         "comments": "",
-        "x": 4238,
-        "y": 987,
-        "z": "4996e636.3ea08",
+        "x": 4341.75,
+        "y": 1033.75,
+        "z": "21b8a150.843866",
         "wires": []
     },
     {
-        "id": "c61e9a44.c762a8",
+        "id": "2922d6af.6c9642",
         "type": "get-resource",
         "name": "get-resource src pnf",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.domainG.pnf-name\"\n        pfx='tmp.aai.domainG-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 4264,
-        "y": 1104,
-        "z": "4996e636.3ea08",
+        "x": 4367.75,
+        "y": 1150.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "58640478.1eeefc",
-                "b15b9e00.631398",
-                "c5141964.109468"
+                "7da6d8ec.042ad",
+                "feb3e7e4.820368",
+                "c44e5f71.e84558"
             ]
         ]
     },
     {
-        "id": "58640478.1eeefc",
+        "id": "7da6d8ec.042ad",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4459.5001220703125,
-        "y": 1056,
-        "z": "4996e636.3ea08",
+        "x": 4563.2501220703125,
+        "y": 1102.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "9ec63af5.4a1a88"
+                "e38aeca.3dbc21"
             ]
         ]
     },
     {
-        "id": "b15b9e00.631398",
+        "id": "feb3e7e4.820368",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4451.5001220703125,
-        "y": 1111,
-        "z": "4996e636.3ea08",
+        "x": 4555.2501220703125,
+        "y": 1157.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "a4b9d6d5.39a2c8"
+                "7637358b.a7e4fc"
             ]
         ]
     },
     {
-        "id": "9ec63af5.4a1a88",
+        "id": "e38aeca.3dbc21",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4603.8824462890625,
-        "y": 1055.6556701660156,
-        "z": "4996e636.3ea08",
+        "x": 4707.6324462890625,
+        "y": 1102.4056701660156,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "f086ebfd.c8405"
+                "fc132576.25bf4"
             ]
         ]
     },
     {
-        "id": "f086ebfd.c8405",
+        "id": "fc132576.25bf4",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.domainG-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 4788,
-        "y": 1054,
-        "z": "4996e636.3ea08",
+        "x": 4891.75,
+        "y": 1100.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "b709cf8e.43e148"
+                "823913cb.fbad5"
             ]
         ]
     },
     {
-        "id": "b709cf8e.43e148",
+        "id": "823913cb.fbad5",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.domainG-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4983,
-        "y": 1054,
-        "z": "4996e636.3ea08",
+        "x": 5086.75,
+        "y": 1100.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "ad439d36.0ced9"
+                "ac47c77.0d50538"
             ]
         ]
     },
     {
-        "id": "c5141964.109468",
+        "id": "c44e5f71.e84558",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4456.5001220703125,
-        "y": 1168,
-        "z": "4996e636.3ea08",
+        "x": 4560.2501220703125,
+        "y": 1214.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "56d134ff.8e34ec"
+                "e748e54c.7c4d78"
             ]
         ]
     },
     {
-        "id": "56d134ff.8e34ec",
+        "id": "e748e54c.7c4d78",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 4608.5001220703125,
-        "y": 1169,
-        "z": "4996e636.3ea08",
+        "x": 4712.2501220703125,
+        "y": 1215.75,
+        "z": "21b8a150.843866",
         "wires": []
     },
     {
-        "id": "a4b9d6d5.39a2c8",
+        "id": "7637358b.a7e4fc",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 4619.5001220703125,
-        "y": 1112,
-        "z": "4996e636.3ea08",
+        "x": 4723.2501220703125,
+        "y": 1158.75,
+        "z": "21b8a150.843866",
         "wires": []
     },
     {
-        "id": "cb6a953c.fa71e8",
+        "id": "b7c2373e.9cd388",
         "type": "set",
         "name": "set vpn-bindingG and connectivityG",
         "xml": "<set>\n<parameter name='tmp.aai.vpn-bindingG.' value=\"`$tmp.aai.vpn-binding.`\" />\n<parameter name='tmp.aai.connectivityG.' value=\"`$tmp.aai.connectivity.`\" />\n",
         "comments": "",
-        "x": 4295,
-        "y": 879,
-        "z": "4996e636.3ea08",
+        "x": 4398.75,
+        "y": 925.75,
+        "z": "21b8a150.843866",
         "wires": []
     },
     {
-        "id": "ad439d36.0ced9",
+        "id": "ac47c77.0d50538",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5186,
-        "y": 1058,
-        "z": "4996e636.3ea08",
+        "x": 5289.75,
+        "y": 1104.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "cb537ad7.8928d8"
+                "ee4f92a0.59618"
             ]
         ]
     },
     {
-        "id": "e839cea.58e4f3",
+        "id": "afac86b6.9de7f8",
         "type": "execute",
         "name": "get esr-thirdparty-sdnc",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domainG.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domainG.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
-        "x": 5571,
-        "y": 1071,
-        "z": "4996e636.3ea08",
+        "x": 5674.75,
+        "y": 1117.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "9673ee8e.826088",
-                "87202e49.7cf198",
-                "ad5371c2.88c47"
+                "25aa1b1d.6db59c",
+                "a1092777.856c6",
+                "2b2036c0.eb7f62"
             ]
         ]
     },
     {
-        "id": "cb537ad7.8928d8",
+        "id": "ee4f92a0.59618",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 5365,
-        "y": 1058,
-        "z": "4996e636.3ea08",
+        "x": 5468.75,
+        "y": 1104.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "2fa33243.987c8e",
-                "e839cea.58e4f3"
+                "e370a3c1.84639",
+                "afac86b6.9de7f8"
             ]
         ]
     },
     {
-        "id": "2fa33243.987c8e",
+        "id": "e370a3c1.84639",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domainG id",
         "xml": "<set>\n<parameter name='tmp.domainG.esr-thirdparty-id' value=\"`$tmp.aai.domainG-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 5601,
-        "y": 1019,
-        "z": "4996e636.3ea08",
+        "x": 5704.75,
+        "y": 1065.75,
+        "z": "21b8a150.843866",
         "wires": []
     },
     {
-        "id": "9673ee8e.826088",
+        "id": "25aa1b1d.6db59c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5781,
-        "y": 1062,
-        "z": "4996e636.3ea08",
+        "x": 5884.75,
+        "y": 1108.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "3788c181.11c43e"
+                "345ab0d6.763128"
             ]
         ]
     },
     {
-        "id": "87202e49.7cf198",
+        "id": "a1092777.856c6",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5773,
-        "y": 1117,
-        "z": "4996e636.3ea08",
+        "x": 5876.75,
+        "y": 1163.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "3691dbb8.1b2bf4"
+                "42378f39.6fe7f"
             ]
         ]
     },
     {
-        "id": "ad5371c2.88c47",
+        "id": "2b2036c0.eb7f62",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 5778,
-        "y": 1174,
-        "z": "4996e636.3ea08",
+        "x": 5881.75,
+        "y": 1220.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "c7f3058f.182658"
+                "cd65837d.e470e"
             ]
         ]
     },
     {
-        "id": "c7f3058f.182658",
+        "id": "cd65837d.e470e",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 5930,
-        "y": 1175,
-        "z": "4996e636.3ea08",
+        "x": 6033.75,
+        "y": 1221.75,
+        "z": "21b8a150.843866",
         "wires": []
     },
     {
-        "id": "3691dbb8.1b2bf4",
+        "id": "42378f39.6fe7f",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 5941,
-        "y": 1120,
-        "z": "4996e636.3ea08",
+        "x": 6044.75,
+        "y": 1166.75,
+        "z": "21b8a150.843866",
         "wires": []
     },
     {
-        "id": "3788c181.11c43e",
+        "id": "345ab0d6.763128",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 5925.38232421875,
-        "y": 1059.6556701660156,
-        "z": "4996e636.3ea08",
+        "x": 6029.13232421875,
+        "y": 1106.4056701660156,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "a3c8eb2b.95af8"
+                "50b0a43e.7ed78c"
             ]
         ]
     },
     {
-        "id": "a3c8eb2b.95af8",
+        "id": "50b0a43e.7ed78c",
         "type": "set",
         "name": "set controller domainG data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.url' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.user' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domainG.password' value=\"`$tmp.aai.domainG.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
         "comments": "",
-        "x": 6140,
-        "y": 1056,
-        "z": "4996e636.3ea08",
+        "x": 6243.75,
+        "y": 1102.75,
+        "z": "21b8a150.843866",
         "wires": []
     },
     {
-        "id": "2ac9f039.bfa9a8",
+        "id": "73d673d.bf12a0c",
         "type": "comment",
         "name": "both src and dst exist",
         "info": "",
         "comments": "",
-        "x": 3914,
-        "y": 997,
-        "z": "4996e636.3ea08",
+        "x": 4017.75,
+        "y": 1043.75,
+        "z": "21b8a150.843866",
         "wires": []
     },
     {
-        "id": "19520422.b45d4c",
+        "id": "941633f0.a03e2",
         "type": "switchNode",
         "name": "switch vpn-binding is not already Activated (i.e. is either Created or Modified)",
         "xml": "<switch test=\"`$tmp.aai.vpn-binding.operational-status != 'Activated' `\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 2476,
-        "y": 724,
-        "z": "4996e636.3ea08",
+        "x": 2579.75,
+        "y": 770.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "fc6dfa43.dee44",
-                "90381d7.56caa6"
+                "cee45ed9.f16768",
+                "eb58c452.cd625"
             ]
         ]
     },
     {
-        "id": "90381d7.56caa6",
+        "id": "eb58c452.cd625",
         "type": "outcomeFalse",
         "name": "false",
         "xml": "<outcome value='false'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2883,
-        "y": 742,
-        "z": "4996e636.3ea08",
+        "x": 2986.75,
+        "y": 788.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "d486bdc8.981f98"
+                "736cb25.e089b4c"
             ]
         ]
     },
     {
-        "id": "fc6dfa43.dee44",
+        "id": "cee45ed9.f16768",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2883,
-        "y": 687,
-        "z": "4996e636.3ea08",
+        "x": 2986.75,
+        "y": 733.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "7563c99.56d39b8"
+                "ba60006d.870c1"
             ]
         ]
     },
     {
-        "id": "7563c99.56d39b8",
+        "id": "ba60006d.870c1",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3039,
-        "y": 685,
-        "z": "4996e636.3ea08",
+        "x": 3142.75,
+        "y": 731.75,
+        "z": "21b8a150.843866",
         "wires": [
             [
-                "dcf1d309.aad128",
-                "61cd75bc.541bfc"
+                "7f9728ff.5a56d",
+                "e892b304.06846"
             ]
         ]
     },
     {
-        "id": "d486bdc8.981f98",
+        "id": "736cb25.e089b4c",
         "type": "block",
         "name": "block",
         "xml": "<block>",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3016,
-        "y": 743,
-        "z": "4996e636.3ea08",
+        "x": 3119.75,
+        "y": 789.75,
+        "z": "21b8a150.843866",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "88154427.646e5",
+        "type": "save",
+        "name": "update service-instance resource in AAI",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance' \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<parameter name='service-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='orchestration-status' value='Activated' />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 5382.5,
+        "y": 842.25,
+        "z": "21b8a150.843866",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "ed48bc59.3a7d1",
+        "type": "save",
+        "name": "update service-instance resource in AAI",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance' \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<parameter name='service-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='orchestration-status' value='Activated' />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4794.25,
+        "y": 2310,
+        "z": "21b8a150.843866",
         "wires": [
             []
         ]
diff --git a/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-deactivate.json b/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-deactivate.json
index a03f1578..c9a977f4 100644
--- a/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-deactivate.json
+++ b/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-deactivate.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "aff24c57.82823",
+        "id": "7987293a.445a38",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 137,
-        "y": 87,
-        "z": "973adb8c.e1e518",
+        "x": 167.75,
+        "y": 154,
+        "z": "316d1be5.aa32c4",
         "wires": [
             [
-                "cead96fb.e8dbd8"
+                "45444450.d7f6dc"
             ]
         ]
     },
     {
-        "id": "cead96fb.e8dbd8",
+        "id": "45444450.d7f6dc",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,1024 +22,1039 @@
         "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": 268.2856903076172,
-        "y": 136.23810863494873,
-        "z": "973adb8c.e1e518",
+        "x": 299.0356903076172,
+        "y": 203.23810863494873,
+        "z": "316d1be5.aa32c4",
         "wires": [
             [
-                "f33f007a.ddfeb"
+                "ae3ab411.371d58"
             ]
         ]
     },
     {
-        "id": "f33f007a.ddfeb",
+        "id": "ae3ab411.371d58",
         "type": "method",
         "name": "method tsli-vnf-topology-operation-trans-slice-deactivate",
         "xml": "<method rpc='tsli-vnf-topology-operation-trans-slice-deactivate' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 271.4286193847656,
-        "y": 221.00003242492676,
-        "z": "973adb8c.e1e518",
+        "x": 302.1786193847656,
+        "y": 288.00003242492676,
+        "z": "316d1be5.aa32c4",
         "wires": [
             [
-                "c2692281.2e03c"
+                "d12b8d84.55791"
             ]
         ]
     },
     {
-        "id": "c2692281.2e03c",
+        "id": "d12b8d84.55791",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 421.238037109375,
-        "y": 350.6666564941406,
-        "z": "973adb8c.e1e518",
+        "x": 451.988037109375,
+        "y": 417.6666564941406,
+        "z": "316d1be5.aa32c4",
         "wires": [
             [
-                "114b6c5d.64d20c",
-                "f27e6da1.6477",
-                "5bf17e9d.d43418"
+                "1c123ec2.4b5549",
+                "134fd372.6771b5",
+                "ab4d5dd1.8ac7f"
             ]
         ]
     },
     {
-        "id": "114b6c5d.64d20c",
+        "id": "1c123ec2.4b5549",
         "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": 695.5716552734375,
-        "y": 617.59716796875,
-        "z": "973adb8c.e1e518",
+        "x": 726.3216552734375,
+        "y": 684.59716796875,
+        "z": "316d1be5.aa32c4",
         "wires": []
     },
     {
-        "id": "f470d27.b1be9b",
+        "id": "901e34f6.602458",
         "type": "comment",
         "name": "new for TransportSlicing",
         "info": "",
         "comments": "",
-        "x": 727,
-        "y": 292,
-        "z": "973adb8c.e1e518",
+        "x": 757.75,
+        "y": 359,
+        "z": "316d1be5.aa32c4",
         "wires": []
     },
     {
-        "id": "f27e6da1.6477",
+        "id": "134fd372.6771b5",
         "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": 747,
-        "y": 388,
-        "z": "973adb8c.e1e518",
+        "x": 777.75,
+        "y": 455,
+        "z": "316d1be5.aa32c4",
         "wires": [
             [
-                "7269ea10.8ecaa4",
-                "518c2c34.9a6a14",
-                "d42c62ff.6bda7"
+                "2d1d6b25.d0297c",
+                "507ea16f.c4686",
+                "afd8f070.eec4e8"
             ]
         ]
     },
     {
-        "id": "7269ea10.8ecaa4",
+        "id": "2d1d6b25.d0297c",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 966,
-        "y": 326,
-        "z": "973adb8c.e1e518",
+        "x": 996.75,
+        "y": 393,
+        "z": "316d1be5.aa32c4",
         "wires": [
             [
-                "8e953b49.9b6fc"
+                "97138a32.2f3f5"
             ]
         ]
     },
     {
-        "id": "518c2c34.9a6a14",
+        "id": "507ea16f.c4686",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 975.490966796875,
-        "y": 368.57403564453125,
-        "z": "973adb8c.e1e518",
+        "x": 1006.240966796875,
+        "y": 435.57403564453125,
+        "z": "316d1be5.aa32c4",
         "wires": [
             [
-                "bbd8fc13.968688"
+                "888faa2.34cabd8"
             ]
         ]
     },
     {
-        "id": "d42c62ff.6bda7",
+        "id": "afd8f070.eec4e8",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 964,
-        "y": 415,
-        "z": "973adb8c.e1e518",
+        "x": 994.75,
+        "y": 482,
+        "z": "316d1be5.aa32c4",
         "wires": [
             [
-                "67ddbb99.6b0b84"
+                "50c527ec.505a7"
             ]
         ]
     },
     {
-        "id": "bbd8fc13.968688",
+        "id": "888faa2.34cabd8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 1129.0623779296875,
-        "y": 371.8597717285156,
-        "z": "973adb8c.e1e518",
+        "x": 1159.8123779296875,
+        "y": 438.8597717285156,
+        "z": "316d1be5.aa32c4",
         "wires": []
     },
     {
-        "id": "67ddbb99.6b0b84",
+        "id": "50c527ec.505a7",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 1133,
-        "y": 416,
-        "z": "973adb8c.e1e518",
+        "x": 1163.75,
+        "y": 483,
+        "z": "316d1be5.aa32c4",
         "wires": []
     },
     {
-        "id": "8e953b49.9b6fc",
+        "id": "97138a32.2f3f5",
         "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": 1163,
-        "y": 322,
-        "z": "973adb8c.e1e518",
+        "x": 1193.75,
+        "y": 389,
+        "z": "316d1be5.aa32c4",
         "wires": [
             [
-                "7bc604b0.a688bc"
+                "73002c56.e20dcc"
             ]
         ]
     },
     {
-        "id": "7bc604b0.a688bc",
+        "id": "73002c56.e20dcc",
         "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": 1386.33349609375,
-        "y": 321.99993896484375,
-        "z": "973adb8c.e1e518",
+        "x": 1417.08349609375,
+        "y": 388.99993896484375,
+        "z": "316d1be5.aa32c4",
         "wires": [
             [
-                "5063b203.704cc4"
+                "f5ce1b9b.6f43c"
             ]
         ]
     },
     {
-        "id": "5063b203.704cc4",
+        "id": "f5ce1b9b.6f43c",
         "type": "outcome",
         "name": "connectivity",
         "xml": "<outcome value='connectivity'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1587.0001335144043,
-        "y": 323.00002098083496,
-        "z": "973adb8c.e1e518",
+        "x": 1617.7501335144043,
+        "y": 390.00002098083496,
+        "z": "316d1be5.aa32c4",
         "wires": [
             [
-                "a9f2d74.cd545a8"
+                "5b31678.585da18"
             ]
         ]
     },
     {
-        "id": "5bf17e9d.d43418",
+        "id": "ab4d5dd1.8ac7f",
         "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": 713,
-        "y": 336,
-        "z": "973adb8c.e1e518",
+        "x": 743.75,
+        "y": 403,
+        "z": "316d1be5.aa32c4",
         "wires": [
             []
         ]
     },
     {
-        "id": "a9f2d74.cd545a8",
+        "id": "5b31678.585da18",
         "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": 1825,
-        "y": 325,
-        "z": "973adb8c.e1e518",
+        "x": 1855.75,
+        "y": 392,
+        "z": "316d1be5.aa32c4",
         "wires": [
             [
-                "7c83a2e6.7b4dd4",
-                "a7cc478b.7d146",
-                "a8bc27c3.c77fc8"
+                "7e6bd44c.4a0d84",
+                "3c965ca8.a0aa94",
+                "a01cc737.c0329"
             ]
         ]
     },
     {
-        "id": "7c83a2e6.7b4dd4",
+        "id": "7e6bd44c.4a0d84",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2033,
-        "y": 289,
-        "z": "973adb8c.e1e518",
+        "x": 2063.75,
+        "y": 356,
+        "z": "316d1be5.aa32c4",
         "wires": [
             [
-                "9d15862c.acb858"
+                "acdeaad5.a6cc1"
             ]
         ]
     },
     {
-        "id": "a7cc478b.7d146",
+        "id": "3c965ca8.a0aa94",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2033.490966796875,
-        "y": 334.57403564453125,
-        "z": "973adb8c.e1e518",
+        "x": 2064.240966796875,
+        "y": 401.57403564453125,
+        "z": "316d1be5.aa32c4",
         "wires": [
             [
-                "c922168b.4d46c"
+                "905f7b79.76f648"
             ]
         ]
     },
     {
-        "id": "a8bc27c3.c77fc8",
+        "id": "a01cc737.c0329",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2031,
-        "y": 378,
-        "z": "973adb8c.e1e518",
+        "x": 2061.75,
+        "y": 445,
+        "z": "316d1be5.aa32c4",
         "wires": [
             [
-                "b9e1cde3.aaa95"
+                "76441f4c.a06df"
             ]
         ]
     },
     {
-        "id": "c922168b.4d46c",
+        "id": "905f7b79.76f648",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 2196.0623779296875,
-        "y": 334.8597717285156,
-        "z": "973adb8c.e1e518",
+        "x": 2226.8123779296875,
+        "y": 401.8597717285156,
+        "z": "316d1be5.aa32c4",
         "wires": []
     },
     {
-        "id": "b9e1cde3.aaa95",
+        "id": "76441f4c.a06df",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 2200,
-        "y": 379,
-        "z": "973adb8c.e1e518",
+        "x": 2230.75,
+        "y": 446,
+        "z": "316d1be5.aa32c4",
         "wires": []
     },
     {
-        "id": "2b1e22a1.17a9f6",
+        "id": "40981562.d0dc0c",
         "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": 2506,
-        "y": 378,
-        "z": "973adb8c.e1e518",
+        "x": 2536.75,
+        "y": 445,
+        "z": "316d1be5.aa32c4",
         "wires": [
             [
-                "18102e44.c2508a",
-                "21816052.be64e8",
-                "241de628.b25112"
+                "b886e1a9.d43df",
+                "4c757dd3.2c3a1c",
+                "490d4ff6.7bfb2"
             ]
         ]
     },
     {
-        "id": "93757346.0f3e2",
+        "id": "29ed7f6b.7ef5c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2890,
-        "y": 378,
-        "z": "973adb8c.e1e518",
+        "x": 2920.75,
+        "y": 445,
+        "z": "316d1be5.aa32c4",
         "wires": [
             [
-                "77e4f011.15fc4",
-                "2c86ef39.d526a",
-                "76429f4b.07b2a8",
-                "6cc7e2bb.560604"
+                "dbce8d50.3a5c2",
+                "697b34e.12e544c",
+                "595bb85e.e54e8",
+                "e28e0e7a.57d778"
             ]
         ]
     },
     {
-        "id": "18102e44.c2508a",
+        "id": "b886e1a9.d43df",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2717,
-        "y": 380,
-        "z": "973adb8c.e1e518",
+        "x": 2747.75,
+        "y": 447,
+        "z": "316d1be5.aa32c4",
         "wires": [
             [
-                "93757346.0f3e2"
+                "29ed7f6b.7ef5c"
             ]
         ]
     },
     {
-        "id": "21816052.be64e8",
+        "id": "4c757dd3.2c3a1c",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2717.490966796875,
-        "y": 425.57403564453125,
-        "z": "973adb8c.e1e518",
+        "x": 2748.240966796875,
+        "y": 492.57403564453125,
+        "z": "316d1be5.aa32c4",
         "wires": [
             [
-                "f6b9e29.dd4472"
+                "cd02fceb.e80ee8"
             ]
         ]
     },
     {
-        "id": "241de628.b25112",
+        "id": "490d4ff6.7bfb2",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2715,
-        "y": 469,
-        "z": "973adb8c.e1e518",
+        "x": 2745.75,
+        "y": 536,
+        "z": "316d1be5.aa32c4",
         "wires": [
             [
-                "d2d6733.abb0d9"
+                "10b6485e.f13c18"
             ]
         ]
     },
     {
-        "id": "d2d6733.abb0d9",
+        "id": "10b6485e.f13c18",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 2882,
-        "y": 468,
-        "z": "973adb8c.e1e518",
+        "x": 2912.75,
+        "y": 535,
+        "z": "316d1be5.aa32c4",
         "wires": []
     },
     {
-        "id": "f6b9e29.dd4472",
+        "id": "cd02fceb.e80ee8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 2880.0623779296875,
-        "y": 425.8597717285156,
-        "z": "973adb8c.e1e518",
+        "x": 2910.8123779296875,
+        "y": 492.8597717285156,
+        "z": "316d1be5.aa32c4",
         "wires": []
     },
     {
-        "id": "9d15862c.acb858",
+        "id": "acdeaad5.a6cc1",
         "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": 2234,
-        "y": 284,
-        "z": "973adb8c.e1e518",
+        "x": 2264.75,
+        "y": 351,
+        "z": "316d1be5.aa32c4",
         "wires": [
             [
-                "732b4cc0.91b37c"
+                "590f481d.6deaf8"
             ]
         ]
     },
     {
-        "id": "732b4cc0.91b37c",
+        "id": "590f481d.6deaf8",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2439,
-        "y": 284,
-        "z": "973adb8c.e1e518",
+        "x": 2469.75,
+        "y": 351,
+        "z": "316d1be5.aa32c4",
         "wires": [
             [
-                "cb7e44a7.8a59"
+                "3e88a914.31d29e"
             ]
         ]
     },
     {
-        "id": "cb7e44a7.8a59",
+        "id": "3e88a914.31d29e",
         "type": "outcome",
         "name": "vpn-binding",
         "xml": "<outcome value='vpn-binding'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2605,
-        "y": 284,
-        "z": "973adb8c.e1e518",
+        "x": 2635.75,
+        "y": 351,
+        "z": "316d1be5.aa32c4",
         "wires": [
             [
-                "3789a9eb.0ef24e"
+                "d5611bfd.8b5ba8"
             ]
         ]
     },
     {
-        "id": "3789a9eb.0ef24e",
+        "id": "d5611bfd.8b5ba8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2768,
-        "y": 284,
-        "z": "973adb8c.e1e518",
+        "x": 2798.75,
+        "y": 351,
+        "z": "316d1be5.aa32c4",
         "wires": [
             [
-                "2b1e22a1.17a9f6"
+                "40981562.d0dc0c"
             ]
         ]
     },
     {
-        "id": "77e4f011.15fc4",
+        "id": "dbce8d50.3a5c2",
         "type": "set",
         "name": "set pnf-name",
         "xml": "<set>\n<parameter name='tmp.domain.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.vpn-binding.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.vpn-binding.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.vpn-binding.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.vpn-binding.src-access-node-id`\" />\n",
         "comments": "",
-        "x": 3105,
-        "y": 88,
-        "z": "973adb8c.e1e518",
+        "x": 3135.75,
+        "y": 155,
+        "z": "316d1be5.aa32c4",
         "wires": []
     },
     {
-        "id": "2c86ef39.d526a",
+        "id": "697b34e.12e544c",
         "type": "get-resource",
         "name": "get-resource src pnf",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.domain.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",
         "comments": "",
         "outputs": 1,
-        "x": 3131,
-        "y": 205,
-        "z": "973adb8c.e1e518",
+        "x": 3161.75,
+        "y": 272,
+        "z": "316d1be5.aa32c4",
         "wires": [
             [
-                "dca54f5.5973b3",
-                "fc504d63.ef84",
-                "13ebc65.3fdb33a"
+                "d00072ef.37f678",
+                "e25ba00b.85ab78",
+                "af08c977.c21ff8"
             ]
         ]
     },
     {
-        "id": "dca54f5.5973b3",
+        "id": "d00072ef.37f678",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3326.5001220703125,
-        "y": 157,
-        "z": "973adb8c.e1e518",
+        "x": 3357.2501220703125,
+        "y": 224,
+        "z": "316d1be5.aa32c4",
         "wires": [
             [
-                "77882641.430388"
+                "5add0fc2.e455a8"
             ]
         ]
     },
     {
-        "id": "fc504d63.ef84",
+        "id": "e25ba00b.85ab78",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3318.5001220703125,
-        "y": 212,
-        "z": "973adb8c.e1e518",
+        "x": 3349.2501220703125,
+        "y": 279,
+        "z": "316d1be5.aa32c4",
         "wires": [
             [
-                "a8ee2b92.3df2"
+                "e5b74ae2.bf4d7"
             ]
         ]
     },
     {
-        "id": "77882641.430388",
+        "id": "5add0fc2.e455a8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3470.8824462890625,
-        "y": 156.65567016601562,
-        "z": "973adb8c.e1e518",
+        "x": 3501.6324462890625,
+        "y": 223.65567016601562,
+        "z": "316d1be5.aa32c4",
         "wires": [
             [
-                "cc921f58.3bd8b8"
+                "7c91c82b.801f4"
             ]
         ]
     },
     {
-        "id": "cc921f58.3bd8b8",
+        "id": "7c91c82b.801f4",
         "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": 3655,
-        "y": 155,
-        "z": "973adb8c.e1e518",
+        "x": 3685.75,
+        "y": 222,
+        "z": "316d1be5.aa32c4",
         "wires": [
             [
-                "72a85062.4c34f8"
+                "40f3da44.52c9bc"
             ]
         ]
     },
     {
-        "id": "72a85062.4c34f8",
+        "id": "40f3da44.52c9bc",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3850,
-        "y": 155,
-        "z": "973adb8c.e1e518",
+        "x": 3880.75,
+        "y": 222,
+        "z": "316d1be5.aa32c4",
         "wires": [
             [
-                "2455d1ba.682ede"
+                "ec33b794.fa679"
             ]
         ]
     },
     {
-        "id": "13ebc65.3fdb33a",
+        "id": "af08c977.c21ff8",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3323.5001220703125,
-        "y": 269,
-        "z": "973adb8c.e1e518",
+        "x": 3354.2501220703125,
+        "y": 336,
+        "z": "316d1be5.aa32c4",
         "wires": [
             [
-                "5ec35efc.fc0da8"
+                "d0c572d6.450d98"
             ]
         ]
     },
     {
-        "id": "5ec35efc.fc0da8",
+        "id": "d0c572d6.450d98",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 3475.5001220703125,
-        "y": 270,
-        "z": "973adb8c.e1e518",
+        "x": 3506.2501220703125,
+        "y": 337,
+        "z": "316d1be5.aa32c4",
         "wires": []
     },
     {
-        "id": "a8ee2b92.3df2",
+        "id": "e5b74ae2.bf4d7",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 3486.5001220703125,
-        "y": 213,
-        "z": "973adb8c.e1e518",
+        "x": 3517.2501220703125,
+        "y": 280,
+        "z": "316d1be5.aa32c4",
         "wires": []
     },
     {
-        "id": "c867d9b4.e35b28",
+        "id": "5f838eee.116ce",
         "type": "execute",
         "name": "get esr-thirdparty-sdnc",
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domain.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domain.esr-thirdparty-sdnc' local-only='false' >",
         "comments": "",
         "outputs": 1,
-        "x": 4438,
-        "y": 172,
-        "z": "973adb8c.e1e518",
+        "x": 4468.75,
+        "y": 239,
+        "z": "316d1be5.aa32c4",
         "wires": [
             [
-                "d6e555b3.ae89f8",
-                "ff096fed.6932c",
-                "507b0c57.90eac4"
+                "50b81d5a.269cfc",
+                "baecba51.c84f4",
+                "3764c57a.2235a2"
             ]
         ]
     },
     {
-        "id": "e8e1d1d2.3bd27",
+        "id": "c9bd9c8c.3dcca",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 4232,
-        "y": 159,
-        "z": "973adb8c.e1e518",
+        "x": 4262.75,
+        "y": 226,
+        "z": "316d1be5.aa32c4",
         "wires": [
             [
-                "984b6b80.85eb28",
-                "c867d9b4.e35b28",
-                "ad75bc9f.423928"
+                "df5cc029.1b2a68",
+                "5f838eee.116ce",
+                "7167c2a2.e60ca4"
             ]
         ]
     },
     {
-        "id": "984b6b80.85eb28",
+        "id": "df5cc029.1b2a68",
         "type": "set",
         "name": "set esr-thirdparty-sdnc domain id",
         "xml": "<set>\n<parameter name='tmp.domain.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",
         "comments": "",
-        "x": 4468,
-        "y": 120,
-        "z": "973adb8c.e1e518",
+        "x": 4498.75,
+        "y": 187,
+        "z": "316d1be5.aa32c4",
         "wires": []
     },
     {
-        "id": "d6e555b3.ae89f8",
+        "id": "50b81d5a.269cfc",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4648,
-        "y": 163,
-        "z": "973adb8c.e1e518",
+        "x": 4678.75,
+        "y": 230,
+        "z": "316d1be5.aa32c4",
         "wires": [
             [
-                "c77140eb.28cae"
+                "cd3637d1.c154d8"
             ]
         ]
     },
     {
-        "id": "ff096fed.6932c",
+        "id": "baecba51.c84f4",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4640,
-        "y": 218,
-        "z": "973adb8c.e1e518",
+        "x": 4670.75,
+        "y": 285,
+        "z": "316d1be5.aa32c4",
         "wires": [
             [
-                "398208f1.a535d"
+                "47ed2855.6b69a"
             ]
         ]
     },
     {
-        "id": "507b0c57.90eac4",
+        "id": "3764c57a.2235a2",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4645,
-        "y": 275,
-        "z": "973adb8c.e1e518",
+        "x": 4675.75,
+        "y": 342,
+        "z": "316d1be5.aa32c4",
         "wires": [
             [
-                "5db92f44.b3b368"
+                "c2dbfa93.1077a"
             ]
         ]
     },
     {
-        "id": "5db92f44.b3b368",
+        "id": "c2dbfa93.1077a",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return 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": 4797,
-        "y": 276,
-        "z": "973adb8c.e1e518",
+        "x": 4827.75,
+        "y": 343,
+        "z": "316d1be5.aa32c4",
         "wires": []
     },
     {
-        "id": "398208f1.a535d",
+        "id": "47ed2855.6b69a",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<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": 4808,
-        "y": 221,
-        "z": "973adb8c.e1e518",
+        "x": 4838.75,
+        "y": 288,
+        "z": "316d1be5.aa32c4",
         "wires": []
     },
     {
-        "id": "c77140eb.28cae",
+        "id": "cd3637d1.c154d8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 4792.38232421875,
-        "y": 160.65567016601562,
-        "z": "973adb8c.e1e518",
+        "x": 4823.13232421875,
+        "y": 227.65567016601562,
+        "z": "316d1be5.aa32c4",
         "wires": [
             [
-                "a91b7f99.6e2d28"
+                "a315466.e353338"
             ]
         ]
     },
     {
-        "id": "2455d1ba.682ede",
+        "id": "ec33b794.fa679",
         "type": "outcome",
         "name": "esr-thirdparty-sdnc",
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4053,
-        "y": 159,
-        "z": "973adb8c.e1e518",
+        "x": 4083.75,
+        "y": 226,
+        "z": "316d1be5.aa32c4",
         "wires": [
             [
-                "e8e1d1d2.3bd27"
+                "c9bd9c8c.3dcca"
             ]
         ]
     },
     {
-        "id": "a91b7f99.6e2d28",
+        "id": "a315466.e353338",
         "type": "set",
         "name": "set controller domain data",
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.url' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.user' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.password' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",
         "comments": "",
-        "x": 5007,
-        "y": 157,
-        "z": "973adb8c.e1e518",
+        "x": 5037.75,
+        "y": 224,
+        "z": "316d1be5.aa32c4",
         "wires": []
     },
     {
-        "id": "ad75bc9f.423928",
+        "id": "7167c2a2.e60ca4",
         "type": "break",
         "name": "break",
         "xml": "<break>\n",
         "comments": "",
-        "x": 4388,
-        "y": 236,
-        "z": "973adb8c.e1e518",
+        "x": 4418.75,
+        "y": 303,
+        "z": "316d1be5.aa32c4",
         "wires": []
     },
     {
-        "id": "166b8d0a.b5831b",
+        "id": "921a6da5.facfa8",
         "type": "execute",
         "name": "execute RestApiCallNode Delete ethernet Service without token",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.aai.connectivity.etht-svc-name`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<!--<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3766,
-        "y": 585,
-        "z": "973adb8c.e1e518",
+        "x": 3796.75,
+        "y": 652,
+        "z": "316d1be5.aa32c4",
         "wires": [
             [
-                "b8398bf9.b49e9",
-                "27d2dbd5.61793c"
+                "f23ad1ae.7a421",
+                "2e318f27.a95f18"
             ]
         ]
     },
     {
-        "id": "b8398bf9.b49e9",
+        "id": "f23ad1ae.7a421",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4112.5,
-        "y": 578,
-        "z": "973adb8c.e1e518",
+        "x": 4143.25,
+        "y": 645,
+        "z": "316d1be5.aa32c4",
         "wires": [
             [
-                "3e628567.b7364a"
+                "e679ed8f.b4a3b"
             ]
         ]
     },
     {
-        "id": "27d2dbd5.61793c",
+        "id": "2e318f27.a95f18",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4116.5,
-        "y": 618,
-        "z": "973adb8c.e1e518",
+        "x": 4147.25,
+        "y": 685,
+        "z": "316d1be5.aa32c4",
         "wires": [
             [
-                "7168ea95.0ebd84"
+                "85d951e1.733df8"
             ]
         ]
     },
     {
-        "id": "7168ea95.0ebd84",
+        "id": "85d951e1.733df8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4274,
-        "y": 618,
-        "z": "973adb8c.e1e518",
+        "x": 4304.75,
+        "y": 685,
+        "z": "316d1be5.aa32c4",
         "wires": [
             [
-                "f83800f1.842c8",
-                "f7f5fb91.6043d8"
+                "cd6438e5.f17948",
+                "9dae1cfd.fe5bb8",
+                "c8b6c5b0.42c5d"
             ]
         ]
     },
     {
-        "id": "3e628567.b7364a",
+        "id": "e679ed8f.b4a3b",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing delete ethernet service rest api\" />\n",
         "comments": "",
-        "x": 4270.5,
-        "y": 578,
-        "z": "973adb8c.e1e518",
+        "x": 4301.25,
+        "y": 645,
+        "z": "316d1be5.aa32c4",
         "wires": []
     },
     {
-        "id": "f83800f1.842c8",
+        "id": "cd6438e5.f17948",
         "type": "save",
         "name": "update vpn-binding resource (aka. OTN domainA) in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-binding.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-binding.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-binding.vpn-name`' />\n\n<parameter name='operational-status' value='Deactivated' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 4602.5,
-        "y": 618,
-        "z": "973adb8c.e1e518",
+        "x": 4633.25,
+        "y": 685,
+        "z": "316d1be5.aa32c4",
         "wires": [
             []
         ]
     },
     {
-        "id": "f7f5fb91.6043d8",
+        "id": "9dae1cfd.fe5bb8",
         "type": "save",
         "name": "update connectivity resource in AAI",
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Deactivated' />\n",
         "comments": "",
         "outputs": 1,
-        "x": 4529.5,
-        "y": 664,
-        "z": "973adb8c.e1e518",
+        "x": 4560.25,
+        "y": 731,
+        "z": "316d1be5.aa32c4",
         "wires": [
             []
         ]
     },
     {
-        "id": "76429f4b.07b2a8",
+        "id": "595bb85e.e54e8",
         "type": "execute",
         "name": "execute RestApiCallNode Delete OTN tunnel with token",
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<!--<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-otn-src-domain-creation.templatefile`\" />-->\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-te:te/tunnels/tunnel=' + $tmp.aai.vpn-binding.vpn-name`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
         "comments": "",
         "outputs": 1,
-        "x": 3234,
-        "y": 472,
-        "z": "973adb8c.e1e518",
+        "x": 3264.75,
+        "y": 539,
+        "z": "316d1be5.aa32c4",
         "wires": [
             [
-                "a5d8b39e.03bbe",
-                "dd9b666a.742b78"
+                "3b1365ed.b0919a",
+                "2f6c4f0a.446848"
             ]
         ]
     },
     {
-        "id": "a5d8b39e.03bbe",
+        "id": "3b1365ed.b0919a",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3566.5,
-        "y": 442,
-        "z": "973adb8c.e1e518",
+        "x": 3597.25,
+        "y": 509,
+        "z": "316d1be5.aa32c4",
         "wires": [
             [
-                "2667a800.f5f9"
+                "fc7e9165.b22f48"
             ]
         ]
     },
     {
-        "id": "dd9b666a.742b78",
+        "id": "2f6c4f0a.446848",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3571.5,
-        "y": 507,
-        "z": "973adb8c.e1e518",
+        "x": 3602.25,
+        "y": 574,
+        "z": "316d1be5.aa32c4",
         "wires": [
             [
-                "91bc4eb8.d42b1"
+                "12d60626.768032"
             ]
         ]
     },
     {
-        "id": "2667a800.f5f9",
+        "id": "fc7e9165.b22f48",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing delete OTN tunnel rest api\" />\n",
         "comments": "",
-        "x": 3742.5,
-        "y": 442,
-        "z": "973adb8c.e1e518",
+        "x": 3773.25,
+        "y": 509,
+        "z": "316d1be5.aa32c4",
         "wires": []
     },
     {
-        "id": "91bc4eb8.d42b1",
+        "id": "12d60626.768032",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 3738,
-        "y": 507,
-        "z": "973adb8c.e1e518",
+        "x": 3768.75,
+        "y": 574,
+        "z": "316d1be5.aa32c4",
         "wires": [
             []
         ]
     },
     {
-        "id": "6cc7e2bb.560604",
+        "id": "e28e0e7a.57d778",
         "type": "switchNode",
         "name": "switch connectivity has ethernet service",
         "xml": "<switch test='`$tmp.aai.connectivity.etht-svc-name`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3172,
-        "y": 607,
-        "z": "973adb8c.e1e518",
+        "x": 3202.75,
+        "y": 674,
+        "z": "316d1be5.aa32c4",
         "wires": [
             [
-                "7c7f58f1.31378",
-                "4913f8dd.a3519"
+                "58217adc.044174",
+                "7dc25247.ea55a4"
             ]
         ]
     },
     {
-        "id": "4913f8dd.a3519",
+        "id": "7dc25247.ea55a4",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3425,
-        "y": 585,
-        "z": "973adb8c.e1e518",
+        "x": 3455.75,
+        "y": 652,
+        "z": "316d1be5.aa32c4",
         "wires": [
             [
-                "166b8d0a.b5831b"
+                "921a6da5.facfa8"
             ]
         ]
     },
     {
-        "id": "7c7f58f1.31378",
+        "id": "58217adc.044174",
         "type": "outcome",
         "name": "Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3425,
-        "y": 641,
-        "z": "973adb8c.e1e518",
+        "x": 3455.75,
+        "y": 708,
+        "z": "316d1be5.aa32c4",
+        "wires": [
+            []
+        ]
+    },
+    {
+        "id": "c8b6c5b0.42c5d",
+        "type": "save",
+        "name": "update service-instance resource in AAI",
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance' \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<parameter name='service-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='orchestration-status' value='Deactivated' />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 4578,
+        "y": 784.75,
+        "z": "316d1be5.aa32c4",
         "wires": [
             []
         ]
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 787741e9..b01a60c9 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
@@ -242,6 +242,13 @@
                                                                                                                     <parameter name='connectivity-id' value='`$tmp.aai.connectivityA.connectivity-id`' />
                                                                                                                     <parameter name='operational-status' value='Activated' />
                                                                                                                 </update>
+                                                                                                                <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance'
+                                                                                                                        key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id
+         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id
+         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'>
+                                                                                                                    <parameter name='service-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />
+                                                                                                                    <parameter name='orchestration-status' value='Activated' />
+                                                                                                                </update>
                                                                                                             </block>
                                                                                                         </outcome>
                                                                                                     </execute>
@@ -553,6 +560,13 @@
                                                                                                                     <parameter name='connectivity-id' value='`$tmp.aai.connectivityB.connectivity-id`' />
                                                                                                                     <parameter name='operational-status' value='Activated' />
                                                                                                                 </update>
+                                                                                                                <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance'
+                                                                                                                        key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id
+         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id
+         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'>
+                                                                                                                    <parameter name='service-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />
+                                                                                                                    <parameter name='orchestration-status' value='Activated' />
+                                                                                                                </update>
                                                                                                             </block>
                                                                                                         </outcome>
                                                                                                     </execute>
diff --git a/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-deactivate.xml b/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-deactivate.xml
index 6f263361..3997add7 100644
--- a/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-deactivate.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-deactivate.xml
@@ -186,6 +186,13 @@
                                                                                             <parameter name='connectivity-id' value='`$tmp.aai.connectivity.connectivity-id`' />
                                                                                             <parameter name='operational-status' value='Deactivated' />
                                                                                         </update>
+                                                                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance'
+                                                                                                key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id
+         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id
+         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'>
+                                                                                            <parameter name='service-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />
+                                                                                            <parameter name='orchestration-status' value='Deactivated' />
+                                                                                        </update>
                                                                                     </block>
                                                                                 </outcome>
                                                                             </execute>
diff --git a/platform-logic/restapi-templates/src/main/json/ts-otn-tunnel-domainG.json b/platform-logic/restapi-templates/src/main/json/ts-otn-tunnel-domainG.json
index 465b9545..7cd0d528 100644
--- a/platform-logic/restapi-templates/src/main/json/ts-otn-tunnel-domainG.json
+++ b/platform-logic/restapi-templates/src/main/json/ts-otn-tunnel-domainG.json
@@ -3,36 +3,65 @@
     "tunnels": {
       "tunnel": [
         {
-          "source": ${src-node-id},
-          "destination": ${dst-node-id},
-          "ietf-otn-tunnel:src-tpn": ${src-tpn-id},
-          "src-ttp-id": ${src-ttp-id},
-          "ietf-otn-tunnel:dst-tpn": ${dst-tpn-id},
-          "dst-ttp-id": ${dst-ttp-id},
-          "te-bandwidth": {
-            "ietf-otn-tunnel:odu-type": "ietf-otn-types:prot-ODUFlex-gfp",
-            "ietf-otn-tunnel:gfp-n": ${gfp-n}
-          },
-          "ietf-otn-tunnel:dst-tributary-slot-count": 1,
-          "ietf-optical-slice:slice-id": ${slice-instance-id},
-          "encoding": "ietf-te-types:lsp-encoding-oduk",
           "name": ${otn-tunnel-name-domainG},
-          "restoration": {
-            "enable": "false",
-            "hold-off-time": "0",
-            "restoration-reversion-disable": "true",
-            "restoration-type": "ietf-te-types:lsp-restoration-restore-any",
-            "wait-to-revert": "0"
-          },
-          "switching-type": "ietf-te-types:switching-otn",
-          "te-topology-identifier": {
-            "client-id": ${client-id},
-            "provider-id": ${provider-id},
-            "topology-id": ${topology-id}
-          },
-          "provisioning-state": "ietf-te-types:tunnel-state-up"
+        "source": ${src-node-id},
+        "destination": ${dst-node-id},
+        "src-tunnel-tp-id": ${src-ttp-id},
+        "dst-tunnel-tp-id": ${dst-ttp-id},
+        "te-bandwidth": {
+          "ietf-otn-tunnel:otn": {
+            "ietf-otn-tunnel:odu-type": "ietf-layer1-types:ODUflex",
+            "ietf-otn-tunnel:gfp-n": ${gfp-n}
+      }
+      },
+        "encoding": "ietf-te-types:lsp-encoding-oduk",
+        "switching-type": "ietf-te-types:switching-otn",
+        "protection": {
+          "enable": "true",
+          "hold-off-time": "0",
+          "protection-reversion-disable": "true",
+          "protection-type": "ietf-te-types:lsp-protection-unprotected",
+          "wait-to-revert": "0"
+        },
+        "admin-state": "ietf-te-types:tunnel-admin-state-up",
+        "primary-paths":{
+          "primary-path" :[
+            {
+              "name":"primary",
+              "path-in-segment":{
+                "label-restrictions":{
+                  "label-restriction":[
+                    {
+                      "index" :1,
+                      "label-start":{
+                        "te-label":{
+                          "ietf-otn-tunnel:otn-tpn": ${src-tpn-id}
+                  }
+                  }
+                  }
+                  ]
+                }
+              },
+              "path-out-segment":{
+                "label-restrictions":{
+                  "label-restriction":[
+                    {
+                      "index" :1,
+                      "label-start":{
+                        "te-label":{
+                          "ietf-otn-tunnel:otn-tpn": ${dst-tpn-id}
+                  }
+                  }
+                  }
+                  ]
+                }
+              }
+            }
+          ]
         }
+      }
       ]
     }
   }
 }
+
diff --git a/platform-logic/restapi-templates/src/main/json/ts-otn-tunnel-dst-domain.json b/platform-logic/restapi-templates/src/main/json/ts-otn-tunnel-dst-domain.json
index 40b1888e..29d19e04 100644
--- a/platform-logic/restapi-templates/src/main/json/ts-otn-tunnel-dst-domain.json
+++ b/platform-logic/restapi-templates/src/main/json/ts-otn-tunnel-dst-domain.json
@@ -3,33 +3,48 @@
     "tunnels": {
       "tunnel": [
         {
-          "source": ${src-node-id},
-          "destination": ${dst-node-id},
-          "ietf-otn-tunnel:src-tpn": ${src-tpn-id},
-          "src-ttp-id": ${src-ttp-id},
-          "te-bandwidth": {
-            "ietf-otn-tunnel:odu-type": "ietf-otn-types:prot-ODUFlex-gfp",
-            "ietf-otn-tunnel:gfp-n": ${gfp-n}
-          },
-          "ietf-otn-tunnel:dst-tributary-slot-count": 1,
-          "ietf-optical-slice:slice-id": ${slice-instance-id},
-          "encoding": "ietf-te-types:lsp-encoding-oduk",
           "name": ${otn-tunnel-name-dst-domain},
-          "restoration": {
-            "enable": "false",
-            "hold-off-time": "0",
-            "restoration-reversion-disable": "true",
-            "restoration-type": "ietf-te-types:lsp-restoration-restore-any",
-            "wait-to-revert": "0"
-          },
-          "switching-type": "ietf-te-types:switching-otn",
-          "te-topology-identifier": {
-            "client-id": ${client-id},
-            "provider-id": ${provider-id},
-            "topology-id": ${topology-id}
-          },
-          "provisioning-state": "ietf-te-types:tunnel-state-up"
+        "source": ${src-node-id},
+        "destination": ${dst-node-id},
+        "src-tunnel-tp-id": ${src-ttp-id},
+        "te-bandwidth": {
+          "ietf-otn-tunnel:otn": {
+            "ietf-otn-tunnel:odu-type": "ietf-layer1-types:ODUflex",
+            "ietf-otn-tunnel:gfp-n": ${gfp-n}
+      }
+      },
+        "encoding": "ietf-te-types:lsp-encoding-oduk",
+        "switching-type": "ietf-te-types:switching-otn",
+        "protection": {
+          "enable": "true",
+          "hold-off-time": "0",
+          "protection-reversion-disable": "true",
+          "protection-type": "ietf-te-types:lsp-protection-unprotected",
+          "wait-to-revert": "0"
+        },
+        "admin-state": "ietf-te-types:tunnel-admin-state-up",
+        "primary-paths":{
+          "primary-path" :[
+            {
+              "name":"primary",
+              "path-in-segment":{
+                "label-restrictions":{
+                  "label-restriction":[
+                    {
+                      "index" :1,
+                      "label-start":{
+                        "te-label":{
+                          "ietf-otn-tunnel:otn-tpn": ${src-tpn-id}
+                  }
+                  }
+                  }
+                  ]
+                }
+              }
+            }
+          ]
         }
+      }
       ]
     }
   }
diff --git a/platform-logic/restapi-templates/src/main/json/ts-otn-tunnel-src-domain.json b/platform-logic/restapi-templates/src/main/json/ts-otn-tunnel-src-domain.json
index cbfde9f4..85fc53dd 100644
--- a/platform-logic/restapi-templates/src/main/json/ts-otn-tunnel-src-domain.json
+++ b/platform-logic/restapi-templates/src/main/json/ts-otn-tunnel-src-domain.json
@@ -3,33 +3,48 @@
     "tunnels": {
       "tunnel": [
         {
-          "source": ${src-node-id},
+          "name": ${otn-tunnel-name-src-domain},
+        "source": ${src-node-id},
         "destination": ${dst-node-id},
-        "ietf-otn-tunnel:dst-tpn": ${dst-tpn-id},
-        "dst-ttp-id": ${dst-ttp-id},
+        "dst-tunnel-tp-id": ${dst-ttp-id},
         "te-bandwidth": {
-          "ietf-otn-tunnel:odu-type": "ietf-otn-types:prot-ODUFlex-gfp",
-          "ietf-otn-tunnel:gfp-n": ${gfp-n}
-        },
-        "ietf-otn-tunnel:dst-tributary-slot-count": 1,
-        "ietf-optical-slice:slice-id": ${slice-instance-id},
+          "ietf-otn-tunnel:otn": {
+            "ietf-otn-tunnel:odu-type": "ietf-layer1-types:ODUflex",
+            "ietf-otn-tunnel:gfp-n": ${gfp-n}
+      }
+      },
         "encoding": "ietf-te-types:lsp-encoding-oduk",
-        "name": ${otn-tunnel-name-src-domain},
-        "restoration": {
-          "enable": "false",
+        "switching-type": "ietf-te-types:switching-otn",
+        "protection": {
+          "enable": "true",
           "hold-off-time": "0",
-          "restoration-reversion-disable": "true",
-          "restoration-type": "ietf-te-types:lsp-restoration-restore-any",
+          "protection-reversion-disable": "true",
+          "protection-type": "ietf-te-types:lsp-protection-unprotected",
           "wait-to-revert": "0"
         },
-        "switching-type": "ietf-te-types:switching-otn",
-        "te-topology-identifier": {
-          "client-id": ${client-id},
-        "provider-id": ${provider-id},
-        "topology-id": ${topology-id}
-      },
-        "provisioning-state": "ietf-te-types:tunnel-state-up"
+        "admin-state": "ietf-te-types:tunnel-admin-state-up",
+        "primary-paths":{
+          "primary-path" :[
+            {
+              "name":"primary",
+              "path-out-segment":{
+                "label-restrictions":{
+                  "label-restriction":[
+                    {
+                      "index" :1,
+                      "label-start":{
+                        "te-label":{
+                          "ietf-otn-tunnel:otn-tpn": ${dst-tpn-id}
+                  }
+                  }
+                  }
+                  ]
+                }
+              }
+            }
+          ]
         }
+      }
       ]
     }
   }