- 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 02a760d..79f7746 100644 (file)
--- 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 @@
 [\r
     {\r
-        "id": "acf9e544.d632d8",\r
+        "id": "8976bcf1.70ac48",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 130,\r
-        "y": 80,\r
-        "z": "4996e636.3ea08",\r
+        "x": 233.75,\r
+        "y": 126.75,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "ca913714.8e299"\r
+                "b1b89c9d.983348"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ca913714.8e299",\r
+        "id": "b1b89c9d.983348",\r
         "type": "service-logic",\r
         "name": "GENERIC-RESOURCE-API ${project.version}",\r
         "module": "GENERIC-RESOURCE-API",\r
@@ -22,2326 +22,2356 @@
         "comments": "",\r
         "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}'>",\r
         "outputs": 1,\r
-        "x": 261.2856903076172,\r
-        "y": 129.23810863494873,\r
-        "z": "4996e636.3ea08",\r
+        "x": 365.0356903076172,\r
+        "y": 175.98810863494873,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "fb417168.600308"\r
+                "b0c84a88.7eefc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fb417168.600308",\r
+        "id": "b0c84a88.7eefc",\r
         "type": "method",\r
         "name": "method tsli-vnf-topology-operation-trans-slice-activate",\r
         "xml": "<method rpc='tsli-vnf-topology-operation-trans-slice-activate' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 264.4286193847656,\r
-        "y": 214.00003242492676,\r
-        "z": "4996e636.3ea08",\r
+        "x": 368.1786193847656,\r
+        "y": 260.75003242492676,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "b8f0421e.565ff8"\r
+                "d31d270a.ac188"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b8f0421e.565ff8",\r
+        "id": "d31d270a.ac188",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 414.238037109375,\r
-        "y": 343.6666564941406,\r
-        "z": "4996e636.3ea08",\r
+        "x": 517.988037109375,\r
+        "y": 390.4166564941406,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "77ab8d82.d7040c",\r
-                "161b3712.e40a99",\r
-                "441438f3.47d108"\r
+                "67b5a6fb.99f89",\r
+                "31666720.2f23b8",\r
+                "1b5adc13.083b6c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "77ab8d82.d7040c",\r
+        "id": "67b5a6fb.99f89",\r
         "type": "returnSuccess",\r
         "name": "return success",\r
         "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",\r
         "comments": "",\r
-        "x": 682.5716552734375,\r
-        "y": 730.59716796875,\r
-        "z": "4996e636.3ea08",\r
+        "x": 786.3216552734375,\r
+        "y": 777.34716796875,\r
+        "z": "21b8a150.843866",\r
         "wires": []\r
     },\r
     {\r
-        "id": "cd3b0e66.721858",\r
+        "id": "1bac3f01.eca921",\r
         "type": "comment",\r
         "name": "new for TransportSlicing",\r
         "info": "",\r
         "comments": "",\r
-        "x": 714,\r
-        "y": 405,\r
-        "z": "4996e636.3ea08",\r
+        "x": 817.75,\r
+        "y": 451.75,\r
+        "z": "21b8a150.843866",\r
         "wires": []\r
     },\r
     {\r
-        "id": "161b3712.e40a99",\r
+        "id": "31666720.2f23b8",\r
         "type": "save",\r
         "name": "get service-instance from aai",\r
         "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-->",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 734,\r
-        "y": 501,\r
-        "z": "4996e636.3ea08",\r
+        "x": 837.75,\r
+        "y": 547.75,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "a50bfd24.6ac44",\r
-                "3bd3a68e.896b3a",\r
-                "320764b6.9fa15c"\r
+                "963616f2.8f1aa8",\r
+                "d3eed549.904728",\r
+                "b7b5ac0a.4b96c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a50bfd24.6ac44",\r
+        "id": "963616f2.8f1aa8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 953,\r
-        "y": 439,\r
-        "z": "4996e636.3ea08",\r
+        "x": 1056.75,\r
+        "y": 485.75,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "b122e042.5ab94"\r
+                "85a98f1d.b180e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3bd3a68e.896b3a",\r
+        "id": "d3eed549.904728",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 962.490966796875,\r
-        "y": 481.57403564453125,\r
-        "z": "4996e636.3ea08",\r
+        "x": 1066.240966796875,\r
+        "y": 528.3240356445312,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "4e666373.42b6cc"\r
+                "bfe60f89.4e364"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "320764b6.9fa15c",\r
+        "id": "b7b5ac0a.4b96c",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 951,\r
-        "y": 528,\r
-        "z": "4996e636.3ea08",\r
+        "x": 1054.75,\r
+        "y": 574.75,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "422b64b3.e06004"\r
+                "2df6c7e.346a038"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4e666373.42b6cc",\r
+        "id": "bfe60f89.4e364",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return 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",\r
         "comments": "",\r
-        "x": 1116.0623779296875,\r
-        "y": 484.8597717285156,\r
-        "z": "4996e636.3ea08",\r
+        "x": 1219.8123779296875,\r
+        "y": 531.6097717285156,\r
+        "z": "21b8a150.843866",\r
         "wires": []\r
     },\r
     {\r
-        "id": "422b64b3.e06004",\r
+        "id": "2df6c7e.346a038",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
-        "x": 1120,\r
-        "y": 529,\r
-        "z": "4996e636.3ea08",\r
+        "x": 1223.75,\r
+        "y": 575.75,\r
+        "z": "21b8a150.843866",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b122e042.5ab94",\r
+        "id": "85a98f1d.b180e",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for index='rel-index' start='0' end='`$tmp.aai.service-instance.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1150,\r
-        "y": 435,\r
-        "z": "4996e636.3ea08",\r
+        "x": 1253.75,\r
+        "y": 481.75,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "111942fe.354315"\r
+                "58591981.123b78"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "111942fe.354315",\r
+        "id": "58591981.123b78",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.service-instance.relationship-list.relationship[$rel-index].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1373.33349609375,\r
-        "y": 434.99993896484375,\r
-        "z": "4996e636.3ea08",\r
+        "x": 1477.08349609375,\r
+        "y": 481.74993896484375,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "ff15f851.7a7528"\r
+                "56e0d242.b4b17c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ff15f851.7a7528",\r
+        "id": "56e0d242.b4b17c",\r
         "type": "outcome",\r
         "name": "connectivity",\r
         "xml": "<outcome value='connectivity'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1574.0001335144043,\r
-        "y": 436.00002098083496,\r
-        "z": "4996e636.3ea08",\r
+        "x": 1677.7501335144043,\r
+        "y": 482.75002098083496,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "cf901b65.835fc8"\r
+                "463ca820.11cf78"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "72376cd1.cdcaec",\r
+        "id": "bda858bd.a9d128",\r
         "type": "set",\r
         "name": "set attachment_param for OTN A",\r
         "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",\r
         "comments": "",\r
-        "x": 4393,\r
-        "y": 152,\r
-        "z": "4996e636.3ea08",\r
+        "x": 4496.75,\r
+        "y": 198.75,\r
+        "z": "21b8a150.843866",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2a89aa53.8890b6",\r
+        "id": "be3c5cce.b55c98",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode Create OTN tunnel with token",\r
         "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`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4474,\r
-        "y": 467,\r
-        "z": "4996e636.3ea08",\r
+        "x": 4577.75,\r
+        "y": 513.75,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "40316706.17eb48",\r
-                "6c473f1b.946a08"\r
+                "a29e7e17.b5f91",\r
+                "3da90d10.f4de92"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "40316706.17eb48",\r
+        "id": "a29e7e17.b5f91",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4783.5,\r
-        "y": 436,\r
-        "z": "4996e636.3ea08",\r
+        "x": 4887.25,\r
+        "y": 482.75,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "aea69973.33e85"\r
+                "878c441e.87326"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6c473f1b.946a08",\r
+        "id": "3da90d10.f4de92",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4788.5,\r
-        "y": 501,\r
-        "z": "4996e636.3ea08",\r
+        "x": 4892.25,\r
+        "y": 547.75,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "d21a082d.2cad68"\r
+                "d4311e2b.569f08"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "aea69973.33e85",\r
+        "id": "878c441e.87326",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return 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",\r
         "comments": "",\r
-        "x": 4959.5,\r
-        "y": 436,\r
-        "z": "4996e636.3ea08",\r
+        "x": 5063.25,\r
+        "y": 482.75,\r
+        "z": "21b8a150.843866",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d21a082d.2cad68",\r
+        "id": "d4311e2b.569f08",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4955,\r
-        "y": 501,\r
-        "z": "4996e636.3ea08",\r
+        "x": 5058.75,\r
+        "y": 547.75,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "de94f6d4.eda0e",\r
+        "id": "3e803655.1b101a",\r
         "type": "set",\r
         "name": "set sotn_value",\r
         "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",\r
         "comments": "",\r
-        "x": 4340.5,\r
-        "y": 655,\r
-        "z": "4996e636.3ea08",\r
+        "x": 4444.25,\r
+        "y": 701.75,\r
+        "z": "21b8a150.843866",\r
         "wires": []\r
     },\r
     {\r
-        "id": "342bfbf3.ee642c",\r
+        "id": "4c6ccd14.a8a574",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode Create ethernet Service without token",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4494.5,\r
-        "y": 703,\r
-        "z": "4996e636.3ea08",\r
+        "x": 4598.25,\r
+        "y": 749.75,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "8236b8ec.5fd17",\r
-                "51c5e2c3.871744"\r
+                "276414cf.b4df2c",\r
+                "64503714.72c7f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8236b8ec.5fd17",\r
+        "id": "276414cf.b4df2c",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4840,\r
-        "y": 684,\r
-        "z": "4996e636.3ea08",\r
+        "x": 4943.75,\r
+        "y": 730.75,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "b89e8953.c6ac88"\r
+                "102e191c.056cc7"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "51c5e2c3.871744",\r
+        "id": "64503714.72c7f8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4844,\r
-        "y": 724,\r
-        "z": "4996e636.3ea08",\r
+        "x": 4947.75,\r
+        "y": 770.75,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "933ba47e.14e65"\r
+                "24862939.f8dc8e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b89e8953.c6ac88",\r
+        "id": "102e191c.056cc7",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return 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",\r
         "comments": "",\r
-        "x": 4998,\r
-        "y": 684,\r
-        "z": "4996e636.3ea08",\r
+        "x": 5101.75,\r
+        "y": 730.75,\r
+        "z": "21b8a150.843866",\r
         "wires": []\r
     },\r
     {\r
-        "id": "933ba47e.14e65",\r
+        "id": "24862939.f8dc8e",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5001.5,\r
-        "y": 724,\r
-        "z": "4996e636.3ea08",\r
+        "x": 5105.25,\r
+        "y": 770.75,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "363131ab.be28b6",\r
-                "fcee3485.dea4a"\r
+                "21b9b574.b5d392",\r
+                "9fb31567.2a4df8",\r
+                "88154427.646e5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "776cbd7.844f0c4",\r
+        "id": "a1a69def.dde488",\r
         "type": "comment",\r
         "name": "TODO: FIXME:",\r
         "info": "put proper values based on connectivity resource retrieved from AAI",\r
         "comments": "",\r
-        "x": 4338,\r
-        "y": 611,\r
-        "z": "4996e636.3ea08",\r
+        "x": 4441.75,\r
+        "y": 657.75,\r
+        "z": "21b8a150.843866",\r
         "wires": []\r
     },\r
     {\r
-        "id": "363131ab.be28b6",\r
+        "id": "21b9b574.b5d392",\r
         "type": "save",\r
         "name": "update vpn-binding A resource (aka. OTN domainA) in AAI",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5332,\r
-        "y": 689,\r
-        "z": "4996e636.3ea08",\r
+        "x": 5435.75,\r
+        "y": 735.75,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "d8ba5ee6.a5736",\r
+        "id": "88c6cc39.d0a418",\r
         "type": "comment",\r
         "name": "TODO: FIXME",\r
         "info": "use proper vpn-binding id and connectivity id\n\nAlso, does CCSDK support \"update\" operation for vpn-binding and connectivity?",\r
         "comments": "",\r
-        "x": 5196,\r
-        "y": 648,\r
-        "z": "4996e636.3ea08",\r
+        "x": 5299.75,\r
+        "y": 694.75,\r
+        "z": "21b8a150.843866",\r
         "wires": []\r
     },\r
     {\r
-        "id": "fcee3485.dea4a",\r
+        "id": "9fb31567.2a4df8",\r
         "type": "save",\r
         "name": "update connectivity resource in AAI",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5259,\r
-        "y": 735,\r
-        "z": "4996e636.3ea08",\r
+        "x": 5362.75,\r
+        "y": 781.75,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "9b9c3cba.716c78",\r
+        "id": "3c21bf12.e3cf58",\r
         "type": "set",\r
         "name": "set pnf-name",\r
         "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",\r
         "comments": "",\r
-        "x": 4331,\r
-        "y": 200,\r
-        "z": "4996e636.3ea08",\r
+        "x": 4434.75,\r
+        "y": 246.75,\r
+        "z": "21b8a150.843866",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5f8cf8c6.3002c8",\r
+        "id": "70ce80db.d98e2",\r
         "type": "get-resource",\r
         "name": "get-resource src pnf",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4357,\r
-        "y": 317,\r
-        "z": "4996e636.3ea08",\r
+        "x": 4460.75,\r
+        "y": 363.75,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "33823e1a.9269c2",\r
-                "b38b9e38.f8c8a8",\r
-                "9f21383a.68cb9"\r
+                "cd855b12.4c7648",\r
+                "e908220c.f2eba8",\r
+                "9142c53.c51d0b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "33823e1a.9269c2",\r
+        "id": "cd855b12.4c7648",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4552.5001220703125,\r
-        "y": 269,\r
-        "z": "4996e636.3ea08",\r
+        "x": 4656.2501220703125,\r
+        "y": 315.75,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "755b5bf3.347744"\r
+                "a4edf485.1b87b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b38b9e38.f8c8a8",\r
+        "id": "e908220c.f2eba8",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4544.5001220703125,\r
-        "y": 324,\r
-        "z": "4996e636.3ea08",\r
+        "x": 4648.2501220703125,\r
+        "y": 370.75,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "5d1291bc.3b9d5"\r
+                "9b453a42.4c355"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "755b5bf3.347744",\r
+        "id": "a4edf485.1b87b",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4696.8824462890625,\r
-        "y": 268.6556701660156,\r
-        "z": "4996e636.3ea08",\r
+        "x": 4800.6324462890625,\r
+        "y": 315.4056701660156,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "5007d6bb.a571d"\r
+                "5c080425.067b9c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c0da9575.eb2c6",\r
+        "id": "c0826996.0b6fb8",\r
         "type": "outcome",\r
         "name": "esr-thirdparty-sdnc",\r
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5279,\r
-        "y": 271,\r
-        "z": "4996e636.3ea08",\r
+        "x": 5382.75,\r
+        "y": 317.75,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "1053f3a3.2846c4"\r
+                "2f8dc255.fe7e1e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5007d6bb.a571d",\r
+        "id": "5c080425.067b9c",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4881,\r
-        "y": 267,\r
-        "z": "4996e636.3ea08",\r
+        "x": 4984.75,\r
+        "y": 313.75,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "33b94d0d.c61ee2"\r
+                "495e68aa.ac002"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "33b94d0d.c61ee2",\r
+        "id": "495e68aa.ac002",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5076,\r
-        "y": 267,\r
-        "z": "4996e636.3ea08",\r
+        "x": 5179.75,\r
+        "y": 313.75,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "c0da9575.eb2c6"\r
+                "c0826996.0b6fb8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9f21383a.68cb9",\r
+        "id": "9142c53.c51d0b8",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4549.5001220703125,\r
-        "y": 381,\r
-        "z": "4996e636.3ea08",\r
+        "x": 4653.2501220703125,\r
+        "y": 427.75,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "e621d08a.7d07a8"\r
+                "9ce4b617.939088"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e621d08a.7d07a8",\r
+        "id": "9ce4b617.939088",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return 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",\r
         "comments": "",\r
-        "x": 4701.5001220703125,\r
-        "y": 382,\r
-        "z": "4996e636.3ea08",\r
+        "x": 4805.2501220703125,\r
+        "y": 428.75,\r
+        "z": "21b8a150.843866",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5d1291bc.3b9d5",\r
+        "id": "9b453a42.4c355",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return 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",\r
         "comments": "",\r
-        "x": 4712.5001220703125,\r
-        "y": 325,\r
-        "z": "4996e636.3ea08",\r
+        "x": 4816.2501220703125,\r
+        "y": 371.75,\r
+        "z": "21b8a150.843866",\r
         "wires": []\r
     },\r
     {\r
-        "id": "bace4f35.dcb4f",\r
+        "id": "e93c75e1.80ec18",\r
         "type": "execute",\r
         "name": "get esr-thirdparty-sdnc",\r
         "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' >",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5664,\r
-        "y": 284,\r
-        "z": "4996e636.3ea08",\r
+        "x": 5767.75,\r
+        "y": 330.75,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "41428f.b99c7d7",\r
-                "92b16ebc.198be8",\r
-                "47593c0a.609b2c"\r
+                "31d08ad5.ae1df6",\r
+                "38f9754c.f69992",\r
+                "31e3f0ee.1be648"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1053f3a3.2846c4",\r
+        "id": "2f8dc255.fe7e1e",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 5458,\r
-        "y": 271,\r
-        "z": "4996e636.3ea08",\r
+        "x": 5561.75,\r
+        "y": 317.75,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "db2fdd1f.f44e1",\r
-                "bace4f35.dcb4f"\r
+                "35fe1089.09d838",\r
+                "e93c75e1.80ec18"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "db2fdd1f.f44e1",\r
+        "id": "35fe1089.09d838",\r
         "type": "set",\r
         "name": "set esr-thirdparty-sdnc domainA id",\r
         "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",\r
         "comments": "",\r
-        "x": 5694,\r
-        "y": 232,\r
-        "z": "4996e636.3ea08",\r
+        "x": 5797.75,\r
+        "y": 278.75,\r
+        "z": "21b8a150.843866",\r
         "wires": []\r
     },\r
     {\r
-        "id": "41428f.b99c7d7",\r
+        "id": "31d08ad5.ae1df6",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5874,\r
-        "y": 275,\r
-        "z": "4996e636.3ea08",\r
+        "x": 5977.75,\r
+        "y": 321.75,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "d8c57966.bba2b8"\r
+                "dcbf70b.fe9e51"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "92b16ebc.198be8",\r
+        "id": "38f9754c.f69992",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5866,\r
-        "y": 330,\r
-        "z": "4996e636.3ea08",\r
+        "x": 5969.75,\r
+        "y": 376.75,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "bbecf65b.0991f"\r
+                "b70d6ea.910679"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "47593c0a.609b2c",\r
+        "id": "31e3f0ee.1be648",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5871,\r
-        "y": 387,\r
-        "z": "4996e636.3ea08",\r
+        "x": 5974.75,\r
+        "y": 433.75,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "17aa566c.ce27ba"\r
+                "96cd1d2a.b041a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "17aa566c.ce27ba",\r
+        "id": "96cd1d2a.b041a",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return 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",\r
         "comments": "",\r
-        "x": 6023,\r
-        "y": 388,\r
-        "z": "4996e636.3ea08",\r
+        "x": 6126.75,\r
+        "y": 434.75,\r
+        "z": "21b8a150.843866",\r
         "wires": []\r
     },\r
     {\r
-        "id": "bbecf65b.0991f",\r
+        "id": "b70d6ea.910679",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return 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",\r
         "comments": "",\r
-        "x": 6034,\r
-        "y": 333,\r
-        "z": "4996e636.3ea08",\r
+        "x": 6137.75,\r
+        "y": 379.75,\r
+        "z": "21b8a150.843866",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d8c57966.bba2b8",\r
+        "id": "dcbf70b.fe9e51",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 6018.38232421875,\r
-        "y": 272.6556701660156,\r
-        "z": "4996e636.3ea08",\r
+        "x": 6122.13232421875,\r
+        "y": 319.4056701660156,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "eeaaed9f.46288"\r
+                "b0be4e8c.83ee08"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "eeaaed9f.46288",\r
+        "id": "b0be4e8c.83ee08",\r
         "type": "set",\r
         "name": "set controller domainA data",\r
         "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",\r
         "comments": "",\r
-        "x": 6233,\r
-        "y": 269,\r
-        "z": "4996e636.3ea08",\r
+        "x": 6336.75,\r
+        "y": 315.75,\r
+        "z": "21b8a150.843866",\r
         "wires": []\r
     },\r
     {\r
-        "id": "441438f3.47d108",\r
+        "id": "1b5adc13.083b6c",\r
         "type": "execute",\r
         "name": "execute properties",\r
         "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' />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 700,\r
-        "y": 449,\r
-        "z": "4996e636.3ea08",\r
+        "x": 803.75,\r
+        "y": 495.75,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "48e88b1.fd2c9f4",\r
+        "id": "321a405b.7459b8",\r
         "type": "set",\r
         "name": "set attachment_param for OTN B",\r
         "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",\r
         "comments": "",\r
-        "x": 3800,\r
-        "y": 1609,\r
-        "z": "4996e636.3ea08",\r
+        "x": 3903.75,\r
+        "y": 1655.75,\r
+        "z": "21b8a150.843866",\r
         "wires": []\r
     },\r
     {\r
-        "id": "46863424.f49acc",\r
+        "id": "13cb6aa6.78d01d",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode Create OTN tunnel with token",\r
         "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`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3863,\r
-        "y": 1938,\r
-        "z": "4996e636.3ea08",\r
+        "x": 3966.75,\r
+        "y": 1984.75,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "dcc57379.86dfe8",\r
-                "c898077c.fa069"\r
+                "10d81799.8466e",\r
+                "67bbae69.f0649"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "dcc57379.86dfe8",\r
+        "id": "10d81799.8466e",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4158.5,\r
-        "y": 1905,\r
-        "z": "4996e636.3ea08",\r
+        "x": 4262.25,\r
+        "y": 1951.75,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "abcd166d.ac4418"\r
+                "892eb025.ee91a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c898077c.fa069",\r
+        "id": "67bbae69.f0649",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4163.5,\r
-        "y": 1970,\r
-        "z": "4996e636.3ea08",\r
+        "x": 4267.25,\r
+        "y": 2016.75,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "a337c775.425078"\r
+                "f603d29b.ff0438"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "abcd166d.ac4418",\r
+        "id": "892eb025.ee91a8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return 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",\r
         "comments": "",\r
-        "x": 4326.5,\r
-        "y": 1905,\r
-        "z": "4996e636.3ea08",\r
+        "x": 4430.25,\r
+        "y": 1951.75,\r
+        "z": "21b8a150.843866",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a337c775.425078",\r
+        "id": "f603d29b.ff0438",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4337,\r
-        "y": 1970,\r
-        "z": "4996e636.3ea08",\r
+        "x": 4440.75,\r
+        "y": 2016.75,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "402d5da7.084ecc",\r
+        "id": "88f53e94.6d0a1",\r
         "type": "set",\r
         "name": "set pnf-name",\r
         "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",\r
         "comments": "",\r
-        "x": 3739,\r
-        "y": 1666,\r
-        "z": "4996e636.3ea08",\r
+        "x": 3842.75,\r
+        "y": 1712.75,\r
+        "z": "21b8a150.843866",\r
         "wires": []\r
     },\r
     {\r
-        "id": "600572d7.37f4f4",\r
+        "id": "3fa49f7e.accef8",\r
         "type": "get-resource",\r
         "name": "get-resource dst pnf",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3759,\r
-        "y": 1763,\r
-        "z": "4996e636.3ea08",\r
+        "x": 3862.75,\r
+        "y": 1809.75,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "a75ca9d.3439f58",\r
-                "399b40eb.8cb2c",\r
-                "c23ae6cb.c49a18"\r
+                "ebf12595.10e938",\r
+                "efabfdfe.5ba96",\r
+                "205446da.fa0a6a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a75ca9d.3439f58",\r
+        "id": "ebf12595.10e938",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3961.5001220703125,\r
-        "y": 1716,\r
-        "z": "4996e636.3ea08",\r
+        "x": 4065.2501220703125,\r
+        "y": 1762.75,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "7c251cdc.702f24"\r
+                "3bb96014.a51678"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "399b40eb.8cb2c",\r
+        "id": "efabfdfe.5ba96",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3953.5001220703125,\r
-        "y": 1771,\r
-        "z": "4996e636.3ea08",\r
+        "x": 4057.2501220703125,\r
+        "y": 1817.75,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "9ad884c8.666098"\r
+                "6194e30c.a75eac"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7c251cdc.702f24",\r
+        "id": "3bb96014.a51678",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4105.8824462890625,\r
-        "y": 1713.6556701660156,\r
-        "z": "4996e636.3ea08",\r
+        "x": 4209.6324462890625,\r
+        "y": 1760.4056701660156,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "cb9eeb5b.e8a49"\r
+                "60e39d5f.e73f74"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cb9eeb5b.e8a49",\r
+        "id": "60e39d5f.e73f74",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='dpvidx' start='0' end='`$tmp.aai.destination-pnf.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4290,\r
-        "y": 1728,\r
-        "z": "4996e636.3ea08",\r
+        "x": 4393.75,\r
+        "y": 1774.75,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "3d062c6c.6ff5d4"\r
+                "f8535a31.25ce18"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c23ae6cb.c49a18",\r
+        "id": "205446da.fa0a6a",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3958.5001220703125,\r
-        "y": 1828,\r
-        "z": "4996e636.3ea08",\r
+        "x": 4062.2501220703125,\r
+        "y": 1874.75,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "c325aab2.4755e"\r
+                "126fd357.b0d735"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c325aab2.4755e",\r
+        "id": "126fd357.b0d735",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return 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",\r
         "comments": "",\r
-        "x": 4110.5001220703125,\r
-        "y": 1829,\r
-        "z": "4996e636.3ea08",\r
+        "x": 4214.2501220703125,\r
+        "y": 1875.75,\r
+        "z": "21b8a150.843866",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9ad884c8.666098",\r
+        "id": "6194e30c.a75eac",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return 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",\r
         "comments": "",\r
-        "x": 4121.5001220703125,\r
-        "y": 1774,\r
-        "z": "4996e636.3ea08",\r
+        "x": 4225.2501220703125,\r
+        "y": 1820.75,\r
+        "z": "21b8a150.843866",\r
         "wires": []\r
     },\r
     {\r
-        "id": "34bca75e.e09988",\r
+        "id": "a4686eb2.3a15b8",\r
         "type": "outcome",\r
         "name": "esr-thirdparty-sdnc",\r
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4688,\r
-        "y": 1732,\r
-        "z": "4996e636.3ea08",\r
+        "x": 4791.75,\r
+        "y": 1778.75,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "edc0cd69.586d38"\r
+                "dd82991b.5dd978"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3d062c6c.6ff5d4",\r
+        "id": "f8535a31.25ce18",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.destination-pnf.relationship-list.relationship[$dpvidx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4485,\r
-        "y": 1728,\r
-        "z": "4996e636.3ea08",\r
+        "x": 4588.75,\r
+        "y": 1774.75,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "34bca75e.e09988"\r
+                "a4686eb2.3a15b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f5373d88.e0f4c",\r
+        "id": "ad6998e4.c7769",\r
         "type": "execute",\r
         "name": "get esr-thirdparty-sdnc",\r
         "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' >",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5073,\r
-        "y": 1731,\r
-        "z": "4996e636.3ea08",\r
+        "x": 5176.75,\r
+        "y": 1777.75,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "efe05c93.e4bd48",\r
-                "c004c915.8de7",\r
-                "8875f4b.bcb6f88"\r
+                "f50cc222.33dcd",\r
+                "8488316b.70cb5",\r
+                "804e8e55.127ce"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "edc0cd69.586d38",\r
+        "id": "dd82991b.5dd978",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 4865,\r
-        "y": 1724,\r
-        "z": "4996e636.3ea08",\r
+        "x": 4968.75,\r
+        "y": 1770.75,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "bd388c7d.2a51e",\r
-                "f5373d88.e0f4c"\r
+                "c219345a.333ee8",\r
+                "ad6998e4.c7769"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bd388c7d.2a51e",\r
+        "id": "c219345a.333ee8",\r
         "type": "set",\r
         "name": "set esr-thirdparty-sdnc domainB id",\r
         "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",\r
         "comments": "",\r
-        "x": 5103,\r
-        "y": 1679,\r
-        "z": "4996e636.3ea08",\r
+        "x": 5206.75,\r
+        "y": 1725.75,\r
+        "z": "21b8a150.843866",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c54d67f1.3a38c8",\r
+        "id": "5afc9335.91bec4",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return 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",\r
         "comments": "",\r
-        "x": 5432,\r
-        "y": 1835,\r
-        "z": "4996e636.3ea08",\r
+        "x": 5535.75,\r
+        "y": 1881.75,\r
+        "z": "21b8a150.843866",\r
         "wires": []\r
     },\r
     {\r
-        "id": "56448bab.caa82c",\r
+        "id": "bba1d37e.3ac768",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return 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",\r
         "comments": "",\r
-        "x": 5443,\r
-        "y": 1780,\r
-        "z": "4996e636.3ea08",\r
+        "x": 5546.75,\r
+        "y": 1826.75,\r
+        "z": "21b8a150.843866",\r
         "wires": []\r
     },\r
     {\r
-        "id": "97f3ba34.f2dc7",\r
+        "id": "4872e24d.b18cd4",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5427.38232421875,\r
-        "y": 1719.6556701660156,\r
-        "z": "4996e636.3ea08",\r
+        "x": 5531.13232421875,\r
+        "y": 1766.4056701660156,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "5b487de9.7c9484"\r
+                "4b7568ba.14d37"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5b487de9.7c9484",\r
+        "id": "4b7568ba.14d37",\r
         "type": "set",\r
         "name": "set controller domainB data",\r
         "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",\r
         "comments": "",\r
-        "x": 5642,\r
-        "y": 1716,\r
-        "z": "4996e636.3ea08",\r
+        "x": 5745.75,\r
+        "y": 1762.75,\r
+        "z": "21b8a150.843866",\r
         "wires": []\r
     },\r
     {\r
-        "id": "efe05c93.e4bd48",\r
+        "id": "f50cc222.33dcd",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5283,\r
-        "y": 1722,\r
-        "z": "4996e636.3ea08",\r
+        "x": 5386.75,\r
+        "y": 1768.75,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "97f3ba34.f2dc7"\r
+                "4872e24d.b18cd4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c004c915.8de7",\r
+        "id": "8488316b.70cb5",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5275,\r
-        "y": 1777,\r
-        "z": "4996e636.3ea08",\r
+        "x": 5378.75,\r
+        "y": 1823.75,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "56448bab.caa82c"\r
+                "bba1d37e.3ac768"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8875f4b.bcb6f88",\r
+        "id": "804e8e55.127ce",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5280,\r
-        "y": 1834,\r
-        "z": "4996e636.3ea08",\r
+        "x": 5383.75,\r
+        "y": 1880.75,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "c54d67f1.3a38c8"\r
+                "5afc9335.91bec4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cf901b65.835fc8",\r
+        "id": "463ca820.11cf78",\r
         "type": "save",\r
         "name": "get connectivity from aai",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1812,\r
-        "y": 438,\r
-        "z": "4996e636.3ea08",\r
+        "x": 1915.75,\r
+        "y": 484.75,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "a3e158df.aec638",\r
-                "28bc0271.0f9e9e",\r
-                "12a8a0b5.4084c7"\r
+                "2eb4dc08.7f1c34",\r
+                "fa210005.600e9",\r
+                "cf2c914d.6b904"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a3e158df.aec638",\r
+        "id": "2eb4dc08.7f1c34",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2020,\r
-        "y": 402,\r
-        "z": "4996e636.3ea08",\r
+        "x": 2123.75,\r
+        "y": 448.75,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "8651df9.9efa52"\r
+                "fdf5ae6d.1a01"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "28bc0271.0f9e9e",\r
+        "id": "fa210005.600e9",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2020.490966796875,\r
-        "y": 447.57403564453125,\r
-        "z": "4996e636.3ea08",\r
+        "x": 2124.240966796875,\r
+        "y": 494.32403564453125,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "b3859ee9.a63778"\r
+                "f1f7e3b1.bd8ea8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "12a8a0b5.4084c7",\r
+        "id": "cf2c914d.6b904",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2018,\r
-        "y": 491,\r
-        "z": "4996e636.3ea08",\r
+        "x": 2121.75,\r
+        "y": 537.75,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "b1a3023.979458"\r
+                "da54cf61.ae1b78"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b3859ee9.a63778",\r
+        "id": "f1f7e3b1.bd8ea8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return 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",\r
         "comments": "",\r
-        "x": 2183.0623779296875,\r
-        "y": 447.8597717285156,\r
-        "z": "4996e636.3ea08",\r
+        "x": 2286.8123779296875,\r
+        "y": 494.6097717285156,\r
+        "z": "21b8a150.843866",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b1a3023.979458",\r
+        "id": "da54cf61.ae1b78",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
-        "x": 2187,\r
-        "y": 492,\r
-        "z": "4996e636.3ea08",\r
+        "x": 2290.75,\r
+        "y": 538.75,\r
+        "z": "21b8a150.843866",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e921a3d6.75f8b8",\r
+        "id": "7cc4f06d.7fdaa",\r
         "type": "save",\r
         "name": "get vpn-binding from aai",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2493,\r
-        "y": 491,\r
-        "z": "4996e636.3ea08",\r
+        "x": 2596.75,\r
+        "y": 537.75,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "19de242e.79b56c",\r
-                "e1533c2.9fadc4",\r
-                "da41548.4c59da8"\r
+                "48c45912.635ab8",\r
+                "a55b1245.6d5a98",\r
+                "5114317.7fef9d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "108df7f5.f0405",\r
+        "id": "f222a91f.adc5a8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2873,\r
-        "y": 579,\r
-        "z": "4996e636.3ea08",\r
+        "x": 2976.75,\r
+        "y": 625.75,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "19520422.b45d4c"\r
+                "941633f0.a03e2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "19de242e.79b56c",\r
+        "id": "48c45912.635ab8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2704,\r
-        "y": 580,\r
-        "z": "4996e636.3ea08",\r
+        "x": 2807.75,\r
+        "y": 626.75,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "108df7f5.f0405"\r
+                "f222a91f.adc5a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e1533c2.9fadc4",\r
+        "id": "a55b1245.6d5a98",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2706.490966796875,\r
-        "y": 475.57403564453125,\r
-        "z": "4996e636.3ea08",\r
+        "x": 2810.240966796875,\r
+        "y": 522.3240356445312,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "efbdd7a3.5958d8"\r
+                "c2aa70b6.4baf8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "da41548.4c59da8",\r
+        "id": "5114317.7fef9d",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2702,\r
-        "y": 520,\r
-        "z": "4996e636.3ea08",\r
+        "x": 2805.75,\r
+        "y": 566.75,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "e03f3a11.4be118"\r
+                "3cb9370e.446c48"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e03f3a11.4be118",\r
+        "id": "3cb9370e.446c48",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
-        "x": 2870,\r
-        "y": 520,\r
-        "z": "4996e636.3ea08",\r
+        "x": 2973.75,\r
+        "y": 566.75,\r
+        "z": "21b8a150.843866",\r
         "wires": []\r
     },\r
     {\r
-        "id": "efbdd7a3.5958d8",\r
+        "id": "c2aa70b6.4baf8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return 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",\r
         "comments": "",\r
-        "x": 2869.0625,\r
-        "y": 474.8597412109375,\r
-        "z": "4996e636.3ea08",\r
+        "x": 2972.8125,\r
+        "y": 521.6097412109375,\r
+        "z": "21b8a150.843866",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8651df9.9efa52",\r
+        "id": "fdf5ae6d.1a01",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.connectivity.relationship-list.relationship_length`' >\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2221,\r
-        "y": 397,\r
-        "z": "4996e636.3ea08",\r
+        "x": 2324.75,\r
+        "y": 443.75,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "6856373e.df8d5"\r
+                "de0f0110.005fa8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6856373e.df8d5",\r
+        "id": "de0f0110.005fa8",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2426,\r
-        "y": 397,\r
-        "z": "4996e636.3ea08",\r
+        "x": 2529.75,\r
+        "y": 443.75,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "61b4f44b.e9282c"\r
+                "a755493f.53e5c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "61b4f44b.e9282c",\r
+        "id": "a755493f.53e5c",\r
         "type": "outcome",\r
         "name": "vpn-binding",\r
         "xml": "<outcome value='vpn-binding'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2592,\r
-        "y": 397,\r
-        "z": "4996e636.3ea08",\r
+        "x": 2695.75,\r
+        "y": 443.75,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "9aa1bdef.a85148"\r
+                "30deb2e6.ddbdde"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9aa1bdef.a85148",\r
+        "id": "30deb2e6.ddbdde",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2755,\r
-        "y": 397,\r
-        "z": "4996e636.3ea08",\r
+        "x": 2858.75,\r
+        "y": 443.75,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "e921a3d6.75f8b8",\r
-                "8b7a547c.5a78f8"\r
+                "7cc4f06d.7fdaa",\r
+                "5a3b76e5.927ca8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "61cd75bc.541bfc",\r
+        "id": "e892b304.06846",\r
         "type": "switchNode",\r
         "name": "switch vpn-binding has dst-access-ltp",\r
         "xml": "<switch test='`$tmp.aai.vpn-binding.dst-access-ltp-id`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3314,\r
-        "y": 680,\r
-        "z": "4996e636.3ea08",\r
+        "x": 3417.75,\r
+        "y": 726.75,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "ce7e100e.65e8d8",\r
-                "978d0324.53a218"\r
+                "21602510.29ed62",\r
+                "bcc4ade6.f232"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ce7e100e.65e8d8",\r
+        "id": "21602510.29ed62",\r
         "type": "outcome",\r
         "name": "Null",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3528,\r
-        "y": 717,\r
-        "z": "4996e636.3ea08",\r
+        "x": 3631.75,\r
+        "y": 763.75,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "d3a9cf8b.6d8898"\r
+                "134315e7.fd7042"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "978d0324.53a218",\r
+        "id": "bcc4ade6.f232",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3530,\r
-        "y": 655,\r
-        "z": "4996e636.3ea08",\r
+        "x": 3633.75,\r
+        "y": 701.75,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "eacef09.695731"\r
+                "3ace6707.d27cb8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d3a9cf8b.6d8898",\r
+        "id": "134315e7.fd7042",\r
         "type": "switchNode",\r
         "name": "switch vpn-binding has src-access-ltp",\r
         "xml": "<switch test='`$tmp.aai.vpn-binding.src-access-ltp-id`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3108,\r
-        "y": 1960,\r
-        "z": "4996e636.3ea08",\r
+        "x": 3211.75,\r
+        "y": 2006.75,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "a298a9c0.8f44e8",\r
-                "ca55eca6.1cb808"\r
+                "36f11901.c669fe",\r
+                "3d3a4221.98f866"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a298a9c0.8f44e8",\r
+        "id": "36f11901.c669fe",\r
         "type": "outcome",\r
         "name": "Null",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3361,\r
-        "y": 1994,\r
-        "z": "4996e636.3ea08",\r
+        "x": 3464.75,\r
+        "y": 2040.75,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "c785caf0.121d"\r
+                "861f9ff3.a542f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ca55eca6.1cb808",\r
+        "id": "3d3a4221.98f866",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3361,\r
-        "y": 1938,\r
-        "z": "4996e636.3ea08",\r
+        "x": 3464.75,\r
+        "y": 1984.75,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "6d0b6c95.2359f4"\r
+                "cd34c51c.32ff6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c785caf0.121d",\r
+        "id": "861f9ff3.a542f8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
-        "x": 3512,\r
-        "y": 1994,\r
-        "z": "4996e636.3ea08",\r
+        "x": 3615.75,\r
+        "y": 2040.75,\r
+        "z": "21b8a150.843866",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2abfc3f7.2295e4",\r
+        "id": "37ab634e.8eb82c",\r
         "type": "set",\r
         "name": "set vpn-bindingA and connectivityA",\r
         "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",\r
         "comments": "",\r
-        "x": 4388,\r
-        "y": 92,\r
-        "z": "4996e636.3ea08",\r
+        "x": 4491.75,\r
+        "y": 138.75,\r
+        "z": "21b8a150.843866",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ebb770b7.bb1a4",\r
+        "id": "e9288827.8d4e48",\r
         "type": "set",\r
         "name": "set vpn-bindingB and connectivityB",\r
         "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",\r
         "comments": "",\r
-        "x": 3796,\r
-        "y": 1551,\r
-        "z": "4996e636.3ea08",\r
+        "x": 3899.75,\r
+        "y": 1597.75,\r
+        "z": "21b8a150.843866",\r
         "wires": []\r
     },\r
     {\r
-        "id": "bcb6d938.081b58",\r
+        "id": "5833352c.36b4cc",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4079,\r
-        "y": 349,\r
-        "z": "4996e636.3ea08",\r
+        "x": 4182.75,\r
+        "y": 395.75,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "2abfc3f7.2295e4",\r
-                "72376cd1.cdcaec",\r
-                "9b9c3cba.716c78",\r
-                "5f8cf8c6.3002c8",\r
-                "de94f6d4.eda0e",\r
-                "342bfbf3.ee642c",\r
-                "2a89aa53.8890b6"\r
+                "37ab634e.8eb82c",\r
+                "bda858bd.a9d128",\r
+                "3c21bf12.e3cf58",\r
+                "70ce80db.d98e2",\r
+                "3e803655.1b101a",\r
+                "4c6ccd14.a8a574",\r
+                "be3c5cce.b55c98"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6d0b6c95.2359f4",\r
+        "id": "cd34c51c.32ff6",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3512,\r
-        "y": 1937,\r
-        "z": "4996e636.3ea08",\r
+        "x": 3615.75,\r
+        "y": 1983.75,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "ebb770b7.bb1a4",\r
-                "48e88b1.fd2c9f4",\r
-                "402d5da7.084ecc",\r
-                "600572d7.37f4f4",\r
-                "46863424.f49acc",\r
-                "4aa8bc15.43053c",\r
-                "295ad948.4ab50e"\r
+                "e9288827.8d4e48",\r
+                "321a405b.7459b8",\r
+                "88f53e94.6d0a1",\r
+                "3fa49f7e.accef8",\r
+                "13cb6aa6.78d01d",\r
+                "6887177c.ca96",\r
+                "4e3c7c24.641514"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4aa8bc15.43053c",\r
+        "id": "6887177c.ca96",\r
         "type": "set",\r
         "name": "set sotn_value",\r
         "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",\r
         "comments": "",\r
-        "x": 3741,\r
-        "y": 2080,\r
-        "z": "4996e636.3ea08",\r
+        "x": 3844.75,\r
+        "y": 2126.75,\r
+        "z": "21b8a150.843866",\r
         "wires": []\r
     },\r
     {\r
-        "id": "295ad948.4ab50e",\r
+        "id": "4e3c7c24.641514",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode Create ethernet Service without token",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3895,\r
-        "y": 2128,\r
-        "z": "4996e636.3ea08",\r
+        "x": 3998.75,\r
+        "y": 2174.75,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "ec9bb97a.fa7b4",\r
-                "d7a86063.21272"\r
+                "a995cca0.79095",\r
+                "691eaa5b.460a8c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ec9bb97a.fa7b4",\r
+        "id": "a995cca0.79095",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4240.5,\r
-        "y": 2109,\r
-        "z": "4996e636.3ea08",\r
+        "x": 4344.25,\r
+        "y": 2155.75,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "23e4ab97.fe6f5c"\r
+                "8dda8416.3500c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d7a86063.21272",\r
+        "id": "691eaa5b.460a8c",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4244.5,\r
-        "y": 2149,\r
-        "z": "4996e636.3ea08",\r
+        "x": 4348.25,\r
+        "y": 2195.75,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "3d3a171d.cfa4"\r
+                "12034c01.7a6e24"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "23e4ab97.fe6f5c",\r
+        "id": "8dda8416.3500c",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return 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",\r
         "comments": "",\r
-        "x": 4398.5,\r
-        "y": 2109,\r
-        "z": "4996e636.3ea08",\r
+        "x": 4502.25,\r
+        "y": 2155.75,\r
+        "z": "21b8a150.843866",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3d3a171d.cfa4",\r
+        "id": "12034c01.7a6e24",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4402,\r
-        "y": 2149,\r
-        "z": "4996e636.3ea08",\r
+        "x": 4505.75,\r
+        "y": 2195.75,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "5d084d8a.b2f23c",\r
-                "44dbf2a2.960644"\r
+                "7af02db5.1d648c",\r
+                "7e35a72c.c5049",\r
+                "ed48bc59.3a7d1"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ce171a50.073f6",\r
+        "id": "8f84b99e.0eac8",\r
         "type": "comment",\r
         "name": "TODO: FIXME:",\r
         "info": "put proper values based on connectivity resource retrieved from AAI",\r
         "comments": "",\r
-        "x": 3738.5,\r
-        "y": 2036,\r
-        "z": "4996e636.3ea08",\r
+        "x": 3842.25,\r
+        "y": 2082.75,\r
+        "z": "21b8a150.843866",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5d084d8a.b2f23c",\r
+        "id": "7af02db5.1d648c",\r
         "type": "save",\r
         "name": "update vpn-binding B resource (aka. OTN domainB) in AAI",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4742,\r
-        "y": 2148,\r
-        "z": "4996e636.3ea08",\r
+        "x": 4845.75,\r
+        "y": 2194.75,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "e7b454fe.3b5cb",\r
+        "id": "1abb03b6.c2733c",\r
         "type": "comment",\r
         "name": "TODO: FIXME",\r
         "info": "use proper vpn-binding id and connectivity\n\nAlso, does CCSDK support \"update\" operation for vpn-binding and connectivity?",\r
         "comments": "",\r
-        "x": 4600,\r
-        "y": 2106,\r
-        "z": "4996e636.3ea08",\r
+        "x": 4703.75,\r
+        "y": 2152.75,\r
+        "z": "21b8a150.843866",\r
         "wires": []\r
     },\r
     {\r
-        "id": "44dbf2a2.960644",\r
+        "id": "7e35a72c.c5049",\r
         "type": "save",\r
         "name": "update connectivity resource in AAI",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4671,\r
-        "y": 2197,\r
-        "z": "4996e636.3ea08",\r
+        "x": 4774.75,\r
+        "y": 2243.75,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "dcf1d309.aad128",\r
+        "id": "7f9728ff.5a56d",\r
         "type": "set",\r
         "name": "set attachment_param (gfp-n) for OTN",\r
         "xml": "<set>\n<parameter name='gfp-n' value='`$tmp.aai.vpn-binding.route-distinguisher`' />\n",\r
         "comments": "",\r
-        "x": 3305,\r
-        "y": 620,\r
-        "z": "4996e636.3ea08",\r
+        "x": 3408.75,\r
+        "y": 666.75,\r
+        "z": "21b8a150.843866",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8b7a547c.5a78f8",\r
+        "id": "5a3b76e5.927ca8",\r
         "type": "set",\r
         "name": "unset tmp.aai.vpn-binding",\r
         "xml": "<set>\n<parameter name='tmp.aai.vpn-binding.' value='' />\n",\r
         "comments": "",\r
-        "x": 2939,\r
-        "y": 268,\r
-        "z": "4996e636.3ea08",\r
+        "x": 3042.75,\r
+        "y": 314.75,\r
+        "z": "21b8a150.843866",\r
         "wires": []\r
     },\r
     {\r
-        "id": "29539dcf.178a92",\r
+        "id": "5dc7fe07.3de0e",\r
         "type": "comment",\r
         "name": "only dst ttp exists. No src",\r
         "info": "",\r
         "comments": "",\r
-        "x": 3900,\r
-        "y": 306,\r
-        "z": "4996e636.3ea08",\r
+        "x": 4003.75,\r
+        "y": 352.75,\r
+        "z": "21b8a150.843866",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5f3074d9.b389cc",\r
+        "id": "95f7053c.6e7e8",\r
         "type": "comment",\r
         "name": "only src ttp exists. No dst",\r
         "info": "",\r
         "comments": "",\r
-        "x": 3457,\r
-        "y": 1884,\r
-        "z": "4996e636.3ea08",\r
+        "x": 3560.75,\r
+        "y": 1930.75,\r
+        "z": "21b8a150.843866",\r
         "wires": []\r
     },\r
     {\r
-        "id": "eacef09.695731",\r
+        "id": "3ace6707.d27cb8",\r
         "type": "switchNode",\r
         "name": "switch vpn-binding has src-access-ltp",\r
         "xml": "<switch test='`$tmp.aai.vpn-binding.src-access-ltp-id`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3636,\r
-        "y": 468,\r
-        "z": "4996e636.3ea08",\r
+        "x": 3739.75,\r
+        "y": 514.75,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "f62c1164.a0b8",\r
-                "81b54f08.97d86"\r
+                "784800ed.f5bf68",\r
+                "38254c71.c979d4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "81b54f08.97d86",\r
+        "id": "38254c71.c979d4",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3878,\r
-        "y": 1057,\r
-        "z": "4996e636.3ea08",\r
+        "x": 3981.75,\r
+        "y": 1103.75,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "efc62266.57c198"\r
+                "8cda2b7.f98f558"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f62c1164.a0b8",\r
+        "id": "784800ed.f5bf68",\r
         "type": "outcome",\r
         "name": "Null",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3872,\r
-        "y": 348,\r
-        "z": "4996e636.3ea08",\r
+        "x": 3975.75,\r
+        "y": 394.75,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "bcb6d938.081b58"\r
+                "5833352c.36b4cc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "efc62266.57c198",\r
+        "id": "8cda2b7.f98f558",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 4036,\r
-        "y": 1056,\r
-        "z": "4996e636.3ea08",\r
+        "x": 4139.75,\r
+        "y": 1102.75,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "cb6a953c.fa71e8",\r
-                "263d4572.ce34fa",\r
-                "2e78dd82.d5612a",\r
-                "c61e9a44.c762a8",\r
-                "8ae64ab7.a00a7"\r
+                "b7c2373e.9cd388",\r
+                "147ed25c.bf0c96",\r
+                "9a1eac1c.da1de8",\r
+                "2922d6af.6c9642",\r
+                "6061bd4e.a66dac"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "263d4572.ce34fa",\r
+        "id": "147ed25c.bf0c96",\r
         "type": "set",\r
         "name": "set attachment_param for OTN G",\r
         "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",\r
         "comments": "",\r
-        "x": 4300,\r
-        "y": 939,\r
-        "z": "4996e636.3ea08",\r
+        "x": 4403.75,\r
+        "y": 985.75,\r
+        "z": "21b8a150.843866",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8ae64ab7.a00a7",\r
+        "id": "6061bd4e.a66dac",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode Create OTN tunnel with token",\r
         "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`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4381,\r
-        "y": 1254,\r
-        "z": "4996e636.3ea08",\r
+        "x": 4484.75,\r
+        "y": 1300.75,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "bd008f9d.f02308",\r
-                "91d1e4e0.3cbb38"\r
+                "de634d2d.e7705",\r
+                "961ea997.f45bc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bd008f9d.f02308",\r
+        "id": "de634d2d.e7705",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4690.5,\r
-        "y": 1223,\r
-        "z": "4996e636.3ea08",\r
+        "x": 4794.25,\r
+        "y": 1269.75,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "270fab9f.26c71c"\r
+                "4e3f5895.525ca8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "91d1e4e0.3cbb38",\r
+        "id": "961ea997.f45bc",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4695.5,\r
-        "y": 1288,\r
-        "z": "4996e636.3ea08",\r
+        "x": 4799.25,\r
+        "y": 1334.75,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "49e9447.128b63c"\r
+                "8c3ef243.d5f688"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "270fab9f.26c71c",\r
+        "id": "4e3f5895.525ca8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return 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",\r
         "comments": "",\r
-        "x": 4866.5,\r
-        "y": 1223,\r
-        "z": "4996e636.3ea08",\r
+        "x": 4970.25,\r
+        "y": 1269.75,\r
+        "z": "21b8a150.843866",\r
         "wires": []\r
     },\r
     {\r
-        "id": "49e9447.128b63c",\r
+        "id": "8c3ef243.d5f688",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4862,\r
-        "y": 1288,\r
-        "z": "4996e636.3ea08",\r
+        "x": 4965.75,\r
+        "y": 1334.75,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "2e78dd82.d5612a",\r
+        "id": "9a1eac1c.da1de8",\r
         "type": "set",\r
         "name": "set pnf-name",\r
         "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",\r
         "comments": "",\r
-        "x": 4238,\r
-        "y": 987,\r
-        "z": "4996e636.3ea08",\r
+        "x": 4341.75,\r
+        "y": 1033.75,\r
+        "z": "21b8a150.843866",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c61e9a44.c762a8",\r
+        "id": "2922d6af.6c9642",\r
         "type": "get-resource",\r
         "name": "get-resource src pnf",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4264,\r
-        "y": 1104,\r
-        "z": "4996e636.3ea08",\r
+        "x": 4367.75,\r
+        "y": 1150.75,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "58640478.1eeefc",\r
-                "b15b9e00.631398",\r
-                "c5141964.109468"\r
+                "7da6d8ec.042ad",\r
+                "feb3e7e4.820368",\r
+                "c44e5f71.e84558"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "58640478.1eeefc",\r
+        "id": "7da6d8ec.042ad",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4459.5001220703125,\r
-        "y": 1056,\r
-        "z": "4996e636.3ea08",\r
+        "x": 4563.2501220703125,\r
+        "y": 1102.75,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "9ec63af5.4a1a88"\r
+                "e38aeca.3dbc21"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b15b9e00.631398",\r
+        "id": "feb3e7e4.820368",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4451.5001220703125,\r
-        "y": 1111,\r
-        "z": "4996e636.3ea08",\r
+        "x": 4555.2501220703125,\r
+        "y": 1157.75,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "a4b9d6d5.39a2c8"\r
+                "7637358b.a7e4fc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9ec63af5.4a1a88",\r
+        "id": "e38aeca.3dbc21",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4603.8824462890625,\r
-        "y": 1055.6556701660156,\r
-        "z": "4996e636.3ea08",\r
+        "x": 4707.6324462890625,\r
+        "y": 1102.4056701660156,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "f086ebfd.c8405"\r
+                "fc132576.25bf4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f086ebfd.c8405",\r
+        "id": "fc132576.25bf4",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.domainG-pnf.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4788,\r
-        "y": 1054,\r
-        "z": "4996e636.3ea08",\r
+        "x": 4891.75,\r
+        "y": 1100.75,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "b709cf8e.43e148"\r
+                "823913cb.fbad5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b709cf8e.43e148",\r
+        "id": "823913cb.fbad5",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.domainG-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4983,\r
-        "y": 1054,\r
-        "z": "4996e636.3ea08",\r
+        "x": 5086.75,\r
+        "y": 1100.75,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "ad439d36.0ced9"\r
+                "ac47c77.0d50538"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c5141964.109468",\r
+        "id": "c44e5f71.e84558",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4456.5001220703125,\r
-        "y": 1168,\r
-        "z": "4996e636.3ea08",\r
+        "x": 4560.2501220703125,\r
+        "y": 1214.75,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "56d134ff.8e34ec"\r
+                "e748e54c.7c4d78"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "56d134ff.8e34ec",\r
+        "id": "e748e54c.7c4d78",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return 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",\r
         "comments": "",\r
-        "x": 4608.5001220703125,\r
-        "y": 1169,\r
-        "z": "4996e636.3ea08",\r
+        "x": 4712.2501220703125,\r
+        "y": 1215.75,\r
+        "z": "21b8a150.843866",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a4b9d6d5.39a2c8",\r
+        "id": "7637358b.a7e4fc",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return 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",\r
         "comments": "",\r
-        "x": 4619.5001220703125,\r
-        "y": 1112,\r
-        "z": "4996e636.3ea08",\r
+        "x": 4723.2501220703125,\r
+        "y": 1158.75,\r
+        "z": "21b8a150.843866",\r
         "wires": []\r
     },\r
     {\r
-        "id": "cb6a953c.fa71e8",\r
+        "id": "b7c2373e.9cd388",\r
         "type": "set",\r
         "name": "set vpn-bindingG and connectivityG",\r
         "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",\r
         "comments": "",\r
-        "x": 4295,\r
-        "y": 879,\r
-        "z": "4996e636.3ea08",\r
+        "x": 4398.75,\r
+        "y": 925.75,\r
+        "z": "21b8a150.843866",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ad439d36.0ced9",\r
+        "id": "ac47c77.0d50538",\r
         "type": "outcome",\r
         "name": "esr-thirdparty-sdnc",\r
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5186,\r
-        "y": 1058,\r
-        "z": "4996e636.3ea08",\r
+        "x": 5289.75,\r
+        "y": 1104.75,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "cb537ad7.8928d8"\r
+                "ee4f92a0.59618"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e839cea.58e4f3",\r
+        "id": "afac86b6.9de7f8",\r
         "type": "execute",\r
         "name": "get esr-thirdparty-sdnc",\r
         "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' >",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5571,\r
-        "y": 1071,\r
-        "z": "4996e636.3ea08",\r
+        "x": 5674.75,\r
+        "y": 1117.75,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "9673ee8e.826088",\r
-                "87202e49.7cf198",\r
-                "ad5371c2.88c47"\r
+                "25aa1b1d.6db59c",\r
+                "a1092777.856c6",\r
+                "2b2036c0.eb7f62"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cb537ad7.8928d8",\r
+        "id": "ee4f92a0.59618",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 5365,\r
-        "y": 1058,\r
-        "z": "4996e636.3ea08",\r
+        "x": 5468.75,\r
+        "y": 1104.75,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "2fa33243.987c8e",\r
-                "e839cea.58e4f3"\r
+                "e370a3c1.84639",\r
+                "afac86b6.9de7f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2fa33243.987c8e",\r
+        "id": "e370a3c1.84639",\r
         "type": "set",\r
         "name": "set esr-thirdparty-sdnc domainG id",\r
         "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",\r
         "comments": "",\r
-        "x": 5601,\r
-        "y": 1019,\r
-        "z": "4996e636.3ea08",\r
+        "x": 5704.75,\r
+        "y": 1065.75,\r
+        "z": "21b8a150.843866",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9673ee8e.826088",\r
+        "id": "25aa1b1d.6db59c",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5781,\r
-        "y": 1062,\r
-        "z": "4996e636.3ea08",\r
+        "x": 5884.75,\r
+        "y": 1108.75,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "3788c181.11c43e"\r
+                "345ab0d6.763128"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "87202e49.7cf198",\r
+        "id": "a1092777.856c6",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5773,\r
-        "y": 1117,\r
-        "z": "4996e636.3ea08",\r
+        "x": 5876.75,\r
+        "y": 1163.75,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "3691dbb8.1b2bf4"\r
+                "42378f39.6fe7f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ad5371c2.88c47",\r
+        "id": "2b2036c0.eb7f62",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5778,\r
-        "y": 1174,\r
-        "z": "4996e636.3ea08",\r
+        "x": 5881.75,\r
+        "y": 1220.75,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "c7f3058f.182658"\r
+                "cd65837d.e470e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c7f3058f.182658",\r
+        "id": "cd65837d.e470e",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return 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",\r
         "comments": "",\r
-        "x": 5930,\r
-        "y": 1175,\r
-        "z": "4996e636.3ea08",\r
+        "x": 6033.75,\r
+        "y": 1221.75,\r
+        "z": "21b8a150.843866",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3691dbb8.1b2bf4",\r
+        "id": "42378f39.6fe7f",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return 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",\r
         "comments": "",\r
-        "x": 5941,\r
-        "y": 1120,\r
-        "z": "4996e636.3ea08",\r
+        "x": 6044.75,\r
+        "y": 1166.75,\r
+        "z": "21b8a150.843866",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3788c181.11c43e",\r
+        "id": "345ab0d6.763128",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 5925.38232421875,\r
-        "y": 1059.6556701660156,\r
-        "z": "4996e636.3ea08",\r
+        "x": 6029.13232421875,\r
+        "y": 1106.4056701660156,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "a3c8eb2b.95af8"\r
+                "50b0a43e.7ed78c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a3c8eb2b.95af8",\r
+        "id": "50b0a43e.7ed78c",\r
         "type": "set",\r
         "name": "set controller domainG data",\r
         "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",\r
         "comments": "",\r
-        "x": 6140,\r
-        "y": 1056,\r
-        "z": "4996e636.3ea08",\r
+        "x": 6243.75,\r
+        "y": 1102.75,\r
+        "z": "21b8a150.843866",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2ac9f039.bfa9a8",\r
+        "id": "73d673d.bf12a0c",\r
         "type": "comment",\r
         "name": "both src and dst exist",\r
         "info": "",\r
         "comments": "",\r
-        "x": 3914,\r
-        "y": 997,\r
-        "z": "4996e636.3ea08",\r
+        "x": 4017.75,\r
+        "y": 1043.75,\r
+        "z": "21b8a150.843866",\r
         "wires": []\r
     },\r
     {\r
-        "id": "19520422.b45d4c",\r
+        "id": "941633f0.a03e2",\r
         "type": "switchNode",\r
         "name": "switch vpn-binding is not already Activated (i.e. is either Created or Modified)",\r
         "xml": "<switch test=\"`$tmp.aai.vpn-binding.operational-status != 'Activated' `\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2476,\r
-        "y": 724,\r
-        "z": "4996e636.3ea08",\r
+        "x": 2579.75,\r
+        "y": 770.75,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "fc6dfa43.dee44",\r
-                "90381d7.56caa6"\r
+                "cee45ed9.f16768",\r
+                "eb58c452.cd625"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "90381d7.56caa6",\r
+        "id": "eb58c452.cd625",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2883,\r
-        "y": 742,\r
-        "z": "4996e636.3ea08",\r
+        "x": 2986.75,\r
+        "y": 788.75,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "d486bdc8.981f98"\r
+                "736cb25.e089b4c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fc6dfa43.dee44",\r
+        "id": "cee45ed9.f16768",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2883,\r
-        "y": 687,\r
-        "z": "4996e636.3ea08",\r
+        "x": 2986.75,\r
+        "y": 733.75,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "7563c99.56d39b8"\r
+                "ba60006d.870c1"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7563c99.56d39b8",\r
+        "id": "ba60006d.870c1",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3039,\r
-        "y": 685,\r
-        "z": "4996e636.3ea08",\r
+        "x": 3142.75,\r
+        "y": 731.75,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             [\r
-                "dcf1d309.aad128",\r
-                "61cd75bc.541bfc"\r
+                "7f9728ff.5a56d",\r
+                "e892b304.06846"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d486bdc8.981f98",\r
+        "id": "736cb25.e089b4c",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3016,\r
-        "y": 743,\r
-        "z": "4996e636.3ea08",\r
+        "x": 3119.75,\r
+        "y": 789.75,\r
+        "z": "21b8a150.843866",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "88154427.646e5",\r
+        "type": "save",\r
+        "name": "update service-instance resource in AAI",\r
+        "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",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 5382.5,\r
+        "y": 842.25,\r
+        "z": "21b8a150.843866",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "ed48bc59.3a7d1",\r
+        "type": "save",\r
+        "name": "update service-instance resource in AAI",\r
+        "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",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4794.25,\r
+        "y": 2310,\r
+        "z": "21b8a150.843866",\r
         "wires": [\r
             []\r
         ]\r

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 a03f157..c9a977f 100644 (file)
--- 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 @@
 [\r
     {\r
-        "id": "aff24c57.82823",\r
+        "id": "7987293a.445a38",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 137,\r
-        "y": 87,\r
-        "z": "973adb8c.e1e518",\r
+        "x": 167.75,\r
+        "y": 154,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             [\r
-                "cead96fb.e8dbd8"\r
+                "45444450.d7f6dc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cead96fb.e8dbd8",\r
+        "id": "45444450.d7f6dc",\r
         "type": "service-logic",\r
         "name": "GENERIC-RESOURCE-API ${project.version}",\r
         "module": "GENERIC-RESOURCE-API",\r
@@ -22,1024 +22,1039 @@
         "comments": "",\r
         "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}'>",\r
         "outputs": 1,\r
-        "x": 268.2856903076172,\r
-        "y": 136.23810863494873,\r
-        "z": "973adb8c.e1e518",\r
+        "x": 299.0356903076172,\r
+        "y": 203.23810863494873,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             [\r
-                "f33f007a.ddfeb"\r
+                "ae3ab411.371d58"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f33f007a.ddfeb",\r
+        "id": "ae3ab411.371d58",\r
         "type": "method",\r
         "name": "method tsli-vnf-topology-operation-trans-slice-deactivate",\r
         "xml": "<method rpc='tsli-vnf-topology-operation-trans-slice-deactivate' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 271.4286193847656,\r
-        "y": 221.00003242492676,\r
-        "z": "973adb8c.e1e518",\r
+        "x": 302.1786193847656,\r
+        "y": 288.00003242492676,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             [\r
-                "c2692281.2e03c"\r
+                "d12b8d84.55791"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c2692281.2e03c",\r
+        "id": "d12b8d84.55791",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 421.238037109375,\r
-        "y": 350.6666564941406,\r
-        "z": "973adb8c.e1e518",\r
+        "x": 451.988037109375,\r
+        "y": 417.6666564941406,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             [\r
-                "114b6c5d.64d20c",\r
-                "f27e6da1.6477",\r
-                "5bf17e9d.d43418"\r
+                "1c123ec2.4b5549",\r
+                "134fd372.6771b5",\r
+                "ab4d5dd1.8ac7f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "114b6c5d.64d20c",\r
+        "id": "1c123ec2.4b5549",\r
         "type": "returnSuccess",\r
         "name": "return success",\r
         "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",\r
         "comments": "",\r
-        "x": 695.5716552734375,\r
-        "y": 617.59716796875,\r
-        "z": "973adb8c.e1e518",\r
+        "x": 726.3216552734375,\r
+        "y": 684.59716796875,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f470d27.b1be9b",\r
+        "id": "901e34f6.602458",\r
         "type": "comment",\r
         "name": "new for TransportSlicing",\r
         "info": "",\r
         "comments": "",\r
-        "x": 727,\r
-        "y": 292,\r
-        "z": "973adb8c.e1e518",\r
+        "x": 757.75,\r
+        "y": 359,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f27e6da1.6477",\r
+        "id": "134fd372.6771b5",\r
         "type": "save",\r
         "name": "get service-instance from aai",\r
         "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-->",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 747,\r
-        "y": 388,\r
-        "z": "973adb8c.e1e518",\r
+        "x": 777.75,\r
+        "y": 455,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             [\r
-                "7269ea10.8ecaa4",\r
-                "518c2c34.9a6a14",\r
-                "d42c62ff.6bda7"\r
+                "2d1d6b25.d0297c",\r
+                "507ea16f.c4686",\r
+                "afd8f070.eec4e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7269ea10.8ecaa4",\r
+        "id": "2d1d6b25.d0297c",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 966,\r
-        "y": 326,\r
-        "z": "973adb8c.e1e518",\r
+        "x": 996.75,\r
+        "y": 393,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             [\r
-                "8e953b49.9b6fc"\r
+                "97138a32.2f3f5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "518c2c34.9a6a14",\r
+        "id": "507ea16f.c4686",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 975.490966796875,\r
-        "y": 368.57403564453125,\r
-        "z": "973adb8c.e1e518",\r
+        "x": 1006.240966796875,\r
+        "y": 435.57403564453125,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             [\r
-                "bbd8fc13.968688"\r
+                "888faa2.34cabd8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d42c62ff.6bda7",\r
+        "id": "afd8f070.eec4e8",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 964,\r
-        "y": 415,\r
-        "z": "973adb8c.e1e518",\r
+        "x": 994.75,\r
+        "y": 482,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             [\r
-                "67ddbb99.6b0b84"\r
+                "50c527ec.505a7"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bbd8fc13.968688",\r
+        "id": "888faa2.34cabd8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return 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",\r
         "comments": "",\r
-        "x": 1129.0623779296875,\r
-        "y": 371.8597717285156,\r
-        "z": "973adb8c.e1e518",\r
+        "x": 1159.8123779296875,\r
+        "y": 438.8597717285156,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "67ddbb99.6b0b84",\r
+        "id": "50c527ec.505a7",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
-        "x": 1133,\r
-        "y": 416,\r
-        "z": "973adb8c.e1e518",\r
+        "x": 1163.75,\r
+        "y": 483,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8e953b49.9b6fc",\r
+        "id": "97138a32.2f3f5",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for index='rel-index' start='0' end='`$tmp.aai.service-instance.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1163,\r
-        "y": 322,\r
-        "z": "973adb8c.e1e518",\r
+        "x": 1193.75,\r
+        "y": 389,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             [\r
-                "7bc604b0.a688bc"\r
+                "73002c56.e20dcc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7bc604b0.a688bc",\r
+        "id": "73002c56.e20dcc",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.service-instance.relationship-list.relationship[$rel-index].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1386.33349609375,\r
-        "y": 321.99993896484375,\r
-        "z": "973adb8c.e1e518",\r
+        "x": 1417.08349609375,\r
+        "y": 388.99993896484375,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             [\r
-                "5063b203.704cc4"\r
+                "f5ce1b9b.6f43c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5063b203.704cc4",\r
+        "id": "f5ce1b9b.6f43c",\r
         "type": "outcome",\r
         "name": "connectivity",\r
         "xml": "<outcome value='connectivity'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1587.0001335144043,\r
-        "y": 323.00002098083496,\r
-        "z": "973adb8c.e1e518",\r
+        "x": 1617.7501335144043,\r
+        "y": 390.00002098083496,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             [\r
-                "a9f2d74.cd545a8"\r
+                "5b31678.585da18"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5bf17e9d.d43418",\r
+        "id": "ab4d5dd1.8ac7f",\r
         "type": "execute",\r
         "name": "execute properties",\r
         "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' />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 713,\r
-        "y": 336,\r
-        "z": "973adb8c.e1e518",\r
+        "x": 743.75,\r
+        "y": 403,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "a9f2d74.cd545a8",\r
+        "id": "5b31678.585da18",\r
         "type": "save",\r
         "name": "get connectivity from aai",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1825,\r
-        "y": 325,\r
-        "z": "973adb8c.e1e518",\r
+        "x": 1855.75,\r
+        "y": 392,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             [\r
-                "7c83a2e6.7b4dd4",\r
-                "a7cc478b.7d146",\r
-                "a8bc27c3.c77fc8"\r
+                "7e6bd44c.4a0d84",\r
+                "3c965ca8.a0aa94",\r
+                "a01cc737.c0329"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7c83a2e6.7b4dd4",\r
+        "id": "7e6bd44c.4a0d84",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2033,\r
-        "y": 289,\r
-        "z": "973adb8c.e1e518",\r
+        "x": 2063.75,\r
+        "y": 356,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             [\r
-                "9d15862c.acb858"\r
+                "acdeaad5.a6cc1"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a7cc478b.7d146",\r
+        "id": "3c965ca8.a0aa94",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2033.490966796875,\r
-        "y": 334.57403564453125,\r
-        "z": "973adb8c.e1e518",\r
+        "x": 2064.240966796875,\r
+        "y": 401.57403564453125,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             [\r
-                "c922168b.4d46c"\r
+                "905f7b79.76f648"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a8bc27c3.c77fc8",\r
+        "id": "a01cc737.c0329",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2031,\r
-        "y": 378,\r
-        "z": "973adb8c.e1e518",\r
+        "x": 2061.75,\r
+        "y": 445,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             [\r
-                "b9e1cde3.aaa95"\r
+                "76441f4c.a06df"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c922168b.4d46c",\r
+        "id": "905f7b79.76f648",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return 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",\r
         "comments": "",\r
-        "x": 2196.0623779296875,\r
-        "y": 334.8597717285156,\r
-        "z": "973adb8c.e1e518",\r
+        "x": 2226.8123779296875,\r
+        "y": 401.8597717285156,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b9e1cde3.aaa95",\r
+        "id": "76441f4c.a06df",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
-        "x": 2200,\r
-        "y": 379,\r
-        "z": "973adb8c.e1e518",\r
+        "x": 2230.75,\r
+        "y": 446,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2b1e22a1.17a9f6",\r
+        "id": "40981562.d0dc0c",\r
         "type": "save",\r
         "name": "get vpn-binding from aai",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2506,\r
-        "y": 378,\r
-        "z": "973adb8c.e1e518",\r
+        "x": 2536.75,\r
+        "y": 445,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             [\r
-                "18102e44.c2508a",\r
-                "21816052.be64e8",\r
-                "241de628.b25112"\r
+                "b886e1a9.d43df",\r
+                "4c757dd3.2c3a1c",\r
+                "490d4ff6.7bfb2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "93757346.0f3e2",\r
+        "id": "29ed7f6b.7ef5c",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2890,\r
-        "y": 378,\r
-        "z": "973adb8c.e1e518",\r
+        "x": 2920.75,\r
+        "y": 445,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             [\r
-                "77e4f011.15fc4",\r
-                "2c86ef39.d526a",\r
-                "76429f4b.07b2a8",\r
-                "6cc7e2bb.560604"\r
+                "dbce8d50.3a5c2",\r
+                "697b34e.12e544c",\r
+                "595bb85e.e54e8",\r
+                "e28e0e7a.57d778"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "18102e44.c2508a",\r
+        "id": "b886e1a9.d43df",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2717,\r
-        "y": 380,\r
-        "z": "973adb8c.e1e518",\r
+        "x": 2747.75,\r
+        "y": 447,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             [\r
-                "93757346.0f3e2"\r
+                "29ed7f6b.7ef5c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "21816052.be64e8",\r
+        "id": "4c757dd3.2c3a1c",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2717.490966796875,\r
-        "y": 425.57403564453125,\r
-        "z": "973adb8c.e1e518",\r
+        "x": 2748.240966796875,\r
+        "y": 492.57403564453125,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             [\r
-                "f6b9e29.dd4472"\r
+                "cd02fceb.e80ee8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "241de628.b25112",\r
+        "id": "490d4ff6.7bfb2",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2715,\r
-        "y": 469,\r
-        "z": "973adb8c.e1e518",\r
+        "x": 2745.75,\r
+        "y": 536,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             [\r
-                "d2d6733.abb0d9"\r
+                "10b6485e.f13c18"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d2d6733.abb0d9",\r
+        "id": "10b6485e.f13c18",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
-        "x": 2882,\r
-        "y": 468,\r
-        "z": "973adb8c.e1e518",\r
+        "x": 2912.75,\r
+        "y": 535,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f6b9e29.dd4472",\r
+        "id": "cd02fceb.e80ee8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return 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",\r
         "comments": "",\r
-        "x": 2880.0623779296875,\r
-        "y": 425.8597717285156,\r
-        "z": "973adb8c.e1e518",\r
+        "x": 2910.8123779296875,\r
+        "y": 492.8597717285156,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9d15862c.acb858",\r
+        "id": "acdeaad5.a6cc1",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.connectivity.relationship-list.relationship_length`' >\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2234,\r
-        "y": 284,\r
-        "z": "973adb8c.e1e518",\r
+        "x": 2264.75,\r
+        "y": 351,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             [\r
-                "732b4cc0.91b37c"\r
+                "590f481d.6deaf8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "732b4cc0.91b37c",\r
+        "id": "590f481d.6deaf8",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2439,\r
-        "y": 284,\r
-        "z": "973adb8c.e1e518",\r
+        "x": 2469.75,\r
+        "y": 351,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             [\r
-                "cb7e44a7.8a59"\r
+                "3e88a914.31d29e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cb7e44a7.8a59",\r
+        "id": "3e88a914.31d29e",\r
         "type": "outcome",\r
         "name": "vpn-binding",\r
         "xml": "<outcome value='vpn-binding'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2605,\r
-        "y": 284,\r
-        "z": "973adb8c.e1e518",\r
+        "x": 2635.75,\r
+        "y": 351,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             [\r
-                "3789a9eb.0ef24e"\r
+                "d5611bfd.8b5ba8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3789a9eb.0ef24e",\r
+        "id": "d5611bfd.8b5ba8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2768,\r
-        "y": 284,\r
-        "z": "973adb8c.e1e518",\r
+        "x": 2798.75,\r
+        "y": 351,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             [\r
-                "2b1e22a1.17a9f6"\r
+                "40981562.d0dc0c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "77e4f011.15fc4",\r
+        "id": "dbce8d50.3a5c2",\r
         "type": "set",\r
         "name": "set pnf-name",\r
         "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",\r
         "comments": "",\r
-        "x": 3105,\r
-        "y": 88,\r
-        "z": "973adb8c.e1e518",\r
+        "x": 3135.75,\r
+        "y": 155,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2c86ef39.d526a",\r
+        "id": "697b34e.12e544c",\r
         "type": "get-resource",\r
         "name": "get-resource src pnf",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3131,\r
-        "y": 205,\r
-        "z": "973adb8c.e1e518",\r
+        "x": 3161.75,\r
+        "y": 272,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             [\r
-                "dca54f5.5973b3",\r
-                "fc504d63.ef84",\r
-                "13ebc65.3fdb33a"\r
+                "d00072ef.37f678",\r
+                "e25ba00b.85ab78",\r
+                "af08c977.c21ff8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "dca54f5.5973b3",\r
+        "id": "d00072ef.37f678",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3326.5001220703125,\r
-        "y": 157,\r
-        "z": "973adb8c.e1e518",\r
+        "x": 3357.2501220703125,\r
+        "y": 224,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             [\r
-                "77882641.430388"\r
+                "5add0fc2.e455a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fc504d63.ef84",\r
+        "id": "e25ba00b.85ab78",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3318.5001220703125,\r
-        "y": 212,\r
-        "z": "973adb8c.e1e518",\r
+        "x": 3349.2501220703125,\r
+        "y": 279,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             [\r
-                "a8ee2b92.3df2"\r
+                "e5b74ae2.bf4d7"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "77882641.430388",\r
+        "id": "5add0fc2.e455a8",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3470.8824462890625,\r
-        "y": 156.65567016601562,\r
-        "z": "973adb8c.e1e518",\r
+        "x": 3501.6324462890625,\r
+        "y": 223.65567016601562,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             [\r
-                "cc921f58.3bd8b8"\r
+                "7c91c82b.801f4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cc921f58.3bd8b8",\r
+        "id": "7c91c82b.801f4",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3655,\r
-        "y": 155,\r
-        "z": "973adb8c.e1e518",\r
+        "x": 3685.75,\r
+        "y": 222,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             [\r
-                "72a85062.4c34f8"\r
+                "40f3da44.52c9bc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "72a85062.4c34f8",\r
+        "id": "40f3da44.52c9bc",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3850,\r
-        "y": 155,\r
-        "z": "973adb8c.e1e518",\r
+        "x": 3880.75,\r
+        "y": 222,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             [\r
-                "2455d1ba.682ede"\r
+                "ec33b794.fa679"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "13ebc65.3fdb33a",\r
+        "id": "af08c977.c21ff8",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3323.5001220703125,\r
-        "y": 269,\r
-        "z": "973adb8c.e1e518",\r
+        "x": 3354.2501220703125,\r
+        "y": 336,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             [\r
-                "5ec35efc.fc0da8"\r
+                "d0c572d6.450d98"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5ec35efc.fc0da8",\r
+        "id": "d0c572d6.450d98",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return 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",\r
         "comments": "",\r
-        "x": 3475.5001220703125,\r
-        "y": 270,\r
-        "z": "973adb8c.e1e518",\r
+        "x": 3506.2501220703125,\r
+        "y": 337,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a8ee2b92.3df2",\r
+        "id": "e5b74ae2.bf4d7",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return 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",\r
         "comments": "",\r
-        "x": 3486.5001220703125,\r
-        "y": 213,\r
-        "z": "973adb8c.e1e518",\r
+        "x": 3517.2501220703125,\r
+        "y": 280,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c867d9b4.e35b28",\r
+        "id": "5f838eee.116ce",\r
         "type": "execute",\r
         "name": "get esr-thirdparty-sdnc",\r
         "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' >",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4438,\r
-        "y": 172,\r
-        "z": "973adb8c.e1e518",\r
+        "x": 4468.75,\r
+        "y": 239,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             [\r
-                "d6e555b3.ae89f8",\r
-                "ff096fed.6932c",\r
-                "507b0c57.90eac4"\r
+                "50b81d5a.269cfc",\r
+                "baecba51.c84f4",\r
+                "3764c57a.2235a2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e8e1d1d2.3bd27",\r
+        "id": "c9bd9c8c.3dcca",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 4232,\r
-        "y": 159,\r
-        "z": "973adb8c.e1e518",\r
+        "x": 4262.75,\r
+        "y": 226,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             [\r
-                "984b6b80.85eb28",\r
-                "c867d9b4.e35b28",\r
-                "ad75bc9f.423928"\r
+                "df5cc029.1b2a68",\r
+                "5f838eee.116ce",\r
+                "7167c2a2.e60ca4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "984b6b80.85eb28",\r
+        "id": "df5cc029.1b2a68",\r
         "type": "set",\r
         "name": "set esr-thirdparty-sdnc domain id",\r
         "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",\r
         "comments": "",\r
-        "x": 4468,\r
-        "y": 120,\r
-        "z": "973adb8c.e1e518",\r
+        "x": 4498.75,\r
+        "y": 187,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d6e555b3.ae89f8",\r
+        "id": "50b81d5a.269cfc",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4648,\r
-        "y": 163,\r
-        "z": "973adb8c.e1e518",\r
+        "x": 4678.75,\r
+        "y": 230,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             [\r
-                "c77140eb.28cae"\r
+                "cd3637d1.c154d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ff096fed.6932c",\r
+        "id": "baecba51.c84f4",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4640,\r
-        "y": 218,\r
-        "z": "973adb8c.e1e518",\r
+        "x": 4670.75,\r
+        "y": 285,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             [\r
-                "398208f1.a535d"\r
+                "47ed2855.6b69a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "507b0c57.90eac4",\r
+        "id": "3764c57a.2235a2",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4645,\r
-        "y": 275,\r
-        "z": "973adb8c.e1e518",\r
+        "x": 4675.75,\r
+        "y": 342,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             [\r
-                "5db92f44.b3b368"\r
+                "c2dbfa93.1077a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5db92f44.b3b368",\r
+        "id": "c2dbfa93.1077a",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return 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",\r
         "comments": "",\r
-        "x": 4797,\r
-        "y": 276,\r
-        "z": "973adb8c.e1e518",\r
+        "x": 4827.75,\r
+        "y": 343,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "398208f1.a535d",\r
+        "id": "47ed2855.6b69a",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return 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",\r
         "comments": "",\r
-        "x": 4808,\r
-        "y": 221,\r
-        "z": "973adb8c.e1e518",\r
+        "x": 4838.75,\r
+        "y": 288,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c77140eb.28cae",\r
+        "id": "cd3637d1.c154d8",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4792.38232421875,\r
-        "y": 160.65567016601562,\r
-        "z": "973adb8c.e1e518",\r
+        "x": 4823.13232421875,\r
+        "y": 227.65567016601562,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             [\r
-                "a91b7f99.6e2d28"\r
+                "a315466.e353338"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2455d1ba.682ede",\r
+        "id": "ec33b794.fa679",\r
         "type": "outcome",\r
         "name": "esr-thirdparty-sdnc",\r
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4053,\r
-        "y": 159,\r
-        "z": "973adb8c.e1e518",\r
+        "x": 4083.75,\r
+        "y": 226,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             [\r
-                "e8e1d1d2.3bd27"\r
+                "c9bd9c8c.3dcca"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a91b7f99.6e2d28",\r
+        "id": "a315466.e353338",\r
         "type": "set",\r
         "name": "set controller domain data",\r
         "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",\r
         "comments": "",\r
-        "x": 5007,\r
-        "y": 157,\r
-        "z": "973adb8c.e1e518",\r
+        "x": 5037.75,\r
+        "y": 224,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ad75bc9f.423928",\r
+        "id": "7167c2a2.e60ca4",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
-        "x": 4388,\r
-        "y": 236,\r
-        "z": "973adb8c.e1e518",\r
+        "x": 4418.75,\r
+        "y": 303,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "166b8d0a.b5831b",\r
+        "id": "921a6da5.facfa8",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode Delete ethernet Service without token",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3766,\r
-        "y": 585,\r
-        "z": "973adb8c.e1e518",\r
+        "x": 3796.75,\r
+        "y": 652,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             [\r
-                "b8398bf9.b49e9",\r
-                "27d2dbd5.61793c"\r
+                "f23ad1ae.7a421",\r
+                "2e318f27.a95f18"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b8398bf9.b49e9",\r
+        "id": "f23ad1ae.7a421",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4112.5,\r
-        "y": 578,\r
-        "z": "973adb8c.e1e518",\r
+        "x": 4143.25,\r
+        "y": 645,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             [\r
-                "3e628567.b7364a"\r
+                "e679ed8f.b4a3b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "27d2dbd5.61793c",\r
+        "id": "2e318f27.a95f18",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4116.5,\r
-        "y": 618,\r
-        "z": "973adb8c.e1e518",\r
+        "x": 4147.25,\r
+        "y": 685,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             [\r
-                "7168ea95.0ebd84"\r
+                "85d951e1.733df8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7168ea95.0ebd84",\r
+        "id": "85d951e1.733df8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4274,\r
-        "y": 618,\r
-        "z": "973adb8c.e1e518",\r
+        "x": 4304.75,\r
+        "y": 685,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             [\r
-                "f83800f1.842c8",\r
-                "f7f5fb91.6043d8"\r
+                "cd6438e5.f17948",\r
+                "9dae1cfd.fe5bb8",\r
+                "c8b6c5b0.42c5d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3e628567.b7364a",\r
+        "id": "e679ed8f.b4a3b",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return 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",\r
         "comments": "",\r
-        "x": 4270.5,\r
-        "y": 578,\r
-        "z": "973adb8c.e1e518",\r
+        "x": 4301.25,\r
+        "y": 645,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f83800f1.842c8",\r
+        "id": "cd6438e5.f17948",\r
         "type": "save",\r
         "name": "update vpn-binding resource (aka. OTN domainA) in AAI",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4602.5,\r
-        "y": 618,\r
-        "z": "973adb8c.e1e518",\r
+        "x": 4633.25,\r
+        "y": 685,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "f7f5fb91.6043d8",\r
+        "id": "9dae1cfd.fe5bb8",\r
         "type": "save",\r
         "name": "update connectivity resource in AAI",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4529.5,\r
-        "y": 664,\r
-        "z": "973adb8c.e1e518",\r
+        "x": 4560.25,\r
+        "y": 731,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "76429f4b.07b2a8",\r
+        "id": "595bb85e.e54e8",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode Delete OTN tunnel with token",\r
         "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`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3234,\r
-        "y": 472,\r
-        "z": "973adb8c.e1e518",\r
+        "x": 3264.75,\r
+        "y": 539,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             [\r
-                "a5d8b39e.03bbe",\r
-                "dd9b666a.742b78"\r
+                "3b1365ed.b0919a",\r
+                "2f6c4f0a.446848"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a5d8b39e.03bbe",\r
+        "id": "3b1365ed.b0919a",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3566.5,\r
-        "y": 442,\r
-        "z": "973adb8c.e1e518",\r
+        "x": 3597.25,\r
+        "y": 509,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             [\r
-                "2667a800.f5f9"\r
+                "fc7e9165.b22f48"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "dd9b666a.742b78",\r
+        "id": "2f6c4f0a.446848",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3571.5,\r
-        "y": 507,\r
-        "z": "973adb8c.e1e518",\r
+        "x": 3602.25,\r
+        "y": 574,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             [\r
-                "91bc4eb8.d42b1"\r
+                "12d60626.768032"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2667a800.f5f9",\r
+        "id": "fc7e9165.b22f48",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return 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",\r
         "comments": "",\r
-        "x": 3742.5,\r
-        "y": 442,\r
-        "z": "973adb8c.e1e518",\r
+        "x": 3773.25,\r
+        "y": 509,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "91bc4eb8.d42b1",\r
+        "id": "12d60626.768032",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3738,\r
-        "y": 507,\r
-        "z": "973adb8c.e1e518",\r
+        "x": 3768.75,\r
+        "y": 574,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "6cc7e2bb.560604",\r
+        "id": "e28e0e7a.57d778",\r
         "type": "switchNode",\r
         "name": "switch connectivity has ethernet service",\r
         "xml": "<switch test='`$tmp.aai.connectivity.etht-svc-name`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3172,\r
-        "y": 607,\r
-        "z": "973adb8c.e1e518",\r
+        "x": 3202.75,\r
+        "y": 674,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             [\r
-                "7c7f58f1.31378",\r
-                "4913f8dd.a3519"\r
+                "58217adc.044174",\r
+                "7dc25247.ea55a4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4913f8dd.a3519",\r
+        "id": "7dc25247.ea55a4",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3425,\r
-        "y": 585,\r
-        "z": "973adb8c.e1e518",\r
+        "x": 3455.75,\r
+        "y": 652,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             [\r
-                "166b8d0a.b5831b"\r
+                "921a6da5.facfa8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7c7f58f1.31378",\r
+        "id": "58217adc.044174",\r
         "type": "outcome",\r
         "name": "Null",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3425,\r
-        "y": 641,\r
-        "z": "973adb8c.e1e518",\r
+        "x": 3455.75,\r
+        "y": 708,\r
+        "z": "316d1be5.aa32c4",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "c8b6c5b0.42c5d",\r
+        "type": "save",\r
+        "name": "update service-instance resource in AAI",\r
+        "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",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4578,\r
+        "y": 784.75,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             []\r
         ]\r

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 787741e..b01a60c 100644 (file)
--- 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`' />\r
                                                                                                                     <parameter name='operational-status' value='Activated' />\r
                                                                                                                 </update>\r
+                                                                                                                <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance'\r
+                                                                                                                        key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\r
+         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id\r
+         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'>\r
+                                                                                                                    <parameter name='service-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\r
+                                                                                                                    <parameter name='orchestration-status' value='Activated' />\r
+                                                                                                                </update>\r
                                                                                                             </block>\r
                                                                                                         </outcome>\r
                                                                                                     </execute>\r
@@ -553,6 +560,13 @@
                                                                                                                     <parameter name='connectivity-id' value='`$tmp.aai.connectivityB.connectivity-id`' />\r
                                                                                                                     <parameter name='operational-status' value='Activated' />\r
                                                                                                                 </update>\r
+                                                                                                                <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance'\r
+                                                                                                                        key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\r
+         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id\r
+         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'>\r
+                                                                                                                    <parameter name='service-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\r
+                                                                                                                    <parameter name='orchestration-status' value='Activated' />\r
+                                                                                                                </update>\r
                                                                                                             </block>\r
                                                                                                         </outcome>\r
                                                                                                     </execute>\r

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 6f26336..3997add 100644 (file)
--- 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`' />\r
                                                                                             <parameter name='operational-status' value='Deactivated' />\r
                                                                                         </update>\r
+                                                                                        <update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance'\r
+                                                                                                key='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\r
+         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id\r
+         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'>\r
+                                                                                            <parameter name='service-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\r
+                                                                                            <parameter name='orchestration-status' value='Deactivated' />\r
+                                                                                        </update>\r
                                                                                     </block>\r
                                                                                 </outcome>\r
                                                                             </execute>\r

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 465b954..7cd0d52 100644 (file)
--- 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 40b1888..29d19e0 100644 (file)
--- 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 cbfde9f..85fc53d 100644 (file)
--- 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}
+                  }
+                  }
+                  }
+                  ]
+                }
+              }
+            }
+          ]
         }
+      }
       ]
     }
   }