Passing a correct OTN tunnel ID and a correct Ethernet Service ID for deletion.
[sdnc/oam.git] / platform-logic / generic-resource-api / src / main / json / trans_slicing / GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-deactivate.json
index 5684584..ff94831 100644 (file)
@@ -1,20 +1,20 @@
 [\r
     {\r
-        "id": "5242e55f.2660bc",\r
+        "id": "9eb0ec9b.ca633",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 165,\r
-        "y": 89,\r
+        "x": 136,\r
+        "y": 74,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "a94d71b7.2c2048"\r
+                "a6f9d5f0.04d6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a94d71b7.2c2048",\r
+        "id": "a6f9d5f0.04d6",\r
         "type": "service-logic",\r
         "name": "GENERIC-RESOURCE-API ${project.version}",\r
         "module": "GENERIC-RESOURCE-API",\r
         "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": 296.2856903076172,\r
-        "y": 138.23810863494873,\r
+        "x": 267.2856903076172,\r
+        "y": 123.23810863494873,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "aa153b53.66c418"\r
+                "3b0030c5.3e837"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "aa153b53.66c418",\r
+        "id": "3b0030c5.3e837",\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": 299.4286193847656,\r
-        "y": 223.00003242492676,\r
+        "x": 270.4286193847656,\r
+        "y": 208.00003242492676,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "76657765.41a798"\r
+                "4b63b8a8.77bb4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "76657765.41a798",\r
+        "id": "4b63b8a8.77bb4",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 449.238037109375,\r
-        "y": 352.6666564941406,\r
+        "x": 420.238037109375,\r
+        "y": 337.6666564941406,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "72f9366e.3a99d8",\r
-                "680f29c8.59cd3",\r
-                "fc546f71.cb3e18"\r
+                "33834047.03c2f8",\r
+                "eaadc174.02e71",\r
+                "ce0777fc.b60f2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "72f9366e.3a99d8",\r
+        "id": "33834047.03c2f8",\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": 723.5716552734375,\r
-        "y": 619.59716796875,\r
+        "x": 694.5716552734375,\r
+        "y": 604.59716796875,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "af064a7b.44da3",\r
+        "id": "39c1d7dd.5e2018",\r
         "type": "comment",\r
         "name": "new for TransportSlicing",\r
         "info": "",\r
         "comments": "",\r
-        "x": 755,\r
-        "y": 294,\r
+        "x": 726,\r
+        "y": 279,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "680f29c8.59cd3",\r
+        "id": "eaadc174.02e71",\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": 775,\r
-        "y": 390,\r
+        "x": 746,\r
+        "y": 375,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "ea580b2d.a2b9d",\r
-                "677c974e.f259e8",\r
-                "13083344.02e945"\r
+                "def73660.f1599",\r
+                "7ca16f67.a19498",\r
+                "6d28513b.423be8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ea580b2d.a2b9d",\r
+        "id": "def73660.f1599",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 994,\r
-        "y": 328,\r
+        "x": 965,\r
+        "y": 313,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "a02387a9.ce5868"\r
+                "5c5bc497.c1130c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "677c974e.f259e8",\r
+        "id": "7ca16f67.a19498",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1003.490966796875,\r
-        "y": 370.57403564453125,\r
+        "x": 974.490966796875,\r
+        "y": 355.57403564453125,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "620a8e19.7969b8"\r
+                "3202281d.474eb8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "13083344.02e945",\r
+        "id": "6d28513b.423be8",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 992,\r
-        "y": 417,\r
+        "x": 963,\r
+        "y": 402,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "ee25c1ac.70f318"\r
+                "a1d5aff9.d75b68"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "620a8e19.7969b8",\r
+        "id": "3202281d.474eb8",\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": 1157.0623779296875,\r
-        "y": 373.8597717285156,\r
+        "x": 1128.0623779296875,\r
+        "y": 358.8597717285156,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ee25c1ac.70f318",\r
+        "id": "a1d5aff9.d75b68",\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": 1161,\r
-        "y": 418,\r
+        "x": 1132,\r
+        "y": 403,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a02387a9.ce5868",\r
+        "id": "5c5bc497.c1130c",\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": 1191,\r
-        "y": 324,\r
+        "x": 1162,\r
+        "y": 309,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "17bf0063.d6585"\r
+                "b3c4b504.2321f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "17bf0063.d6585",\r
+        "id": "b3c4b504.2321f",\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": 1414.33349609375,\r
-        "y": 323.99993896484375,\r
+        "x": 1385.33349609375,\r
+        "y": 308.99993896484375,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "c3612b80.a84938"\r
+                "2c61dbe.2d462a4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c3612b80.a84938",\r
+        "id": "2c61dbe.2d462a4",\r
         "type": "outcome",\r
         "name": "connectivity",\r
         "xml": "<outcome value='connectivity'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1615.0001335144043,\r
-        "y": 325.00002098083496,\r
+        "x": 1586.0001335144043,\r
+        "y": 310.00002098083496,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "7884e617.49647"\r
+                "8cb99e8e.6d2cc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fc546f71.cb3e18",\r
+        "id": "ce0777fc.b60f2",\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": 741,\r
-        "y": 338,\r
+        "x": 712,\r
+        "y": 323,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "7884e617.49647",\r
+        "id": "8cb99e8e.6d2cc",\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": 1853,\r
-        "y": 327,\r
+        "x": 1824,\r
+        "y": 312,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "d6ce182b.31b988",\r
-                "aa98166f.4a5d48",\r
-                "6c3ef06d.2c8af8"\r
+                "e48909d7.1167",\r
+                "9d9cf2b9.138cc",\r
+                "c57bdede.c607a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d6ce182b.31b988",\r
+        "id": "e48909d7.1167",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2061,\r
-        "y": 291,\r
+        "x": 2032,\r
+        "y": 276,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "f5ad0f9a.63e04"\r
+                "7447d3b7.3d9674"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "aa98166f.4a5d48",\r
+        "id": "9d9cf2b9.138cc",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2061.490966796875,\r
-        "y": 336.57403564453125,\r
+        "x": 2032.490966796875,\r
+        "y": 321.57403564453125,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "8c465bb9.ef2cc8"\r
+                "c3f91382.355d78"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6c3ef06d.2c8af8",\r
+        "id": "c57bdede.c607a8",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2059,\r
-        "y": 380,\r
+        "x": 2030,\r
+        "y": 365,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "63631469.f6833c"\r
+                "8f45128e.10469"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8c465bb9.ef2cc8",\r
+        "id": "c3f91382.355d78",\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": 2224.0623779296875,\r
-        "y": 336.8597717285156,\r
+        "x": 2195.0623779296875,\r
+        "y": 321.8597717285156,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "63631469.f6833c",\r
+        "id": "8f45128e.10469",\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": 2228,\r
-        "y": 381,\r
+        "x": 2199,\r
+        "y": 366,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b3f0264f.4b3ab",\r
+        "id": "eaa455f.69afea8",\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": 2534,\r
-        "y": 380,\r
+        "x": 2505,\r
+        "y": 365,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "b834bb7a.d792e",\r
-                "1e7aae42.a3c8e2",\r
-                "2a5354ed.3760dc"\r
+                "754a3f5.4e5d3c",\r
+                "563654a8.f8269c",\r
+                "49966192.933e3"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "86694c65.1bab48",\r
+        "id": "44a58adf.5965ac",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2918,\r
-        "y": 380,\r
+        "x": 2889,\r
+        "y": 365,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "a6c81dc0.f9e978",\r
-                "23f1ef20.aa22c8",\r
-                "d80ddf6.5239ba",\r
-                "a14e9d29.27087"\r
+                "c9dc240e.1f5cf8",\r
+                "2f80a99a.2436ee",\r
+                "eb52e479.fabdf8",\r
+                "e64ba97a.ab16f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b834bb7a.d792e",\r
+        "id": "754a3f5.4e5d3c",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2745,\r
-        "y": 382,\r
+        "x": 2716,\r
+        "y": 367,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "86694c65.1bab48"\r
+                "44a58adf.5965ac"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1e7aae42.a3c8e2",\r
+        "id": "563654a8.f8269c",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2745.490966796875,\r
-        "y": 427.57403564453125,\r
+        "x": 2716.490966796875,\r
+        "y": 412.57403564453125,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "6a176f0f.10d98"\r
+                "8ffd54c7.1ceb58"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2a5354ed.3760dc",\r
+        "id": "49966192.933e3",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2743,\r
-        "y": 471,\r
+        "x": 2714,\r
+        "y": 456,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "2cad2870.f6f2f"\r
+                "1dfb3bfc.f80f24"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2cad2870.f6f2f",\r
+        "id": "1dfb3bfc.f80f24",\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": 2910,\r
-        "y": 470,\r
+        "x": 2881,\r
+        "y": 455,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6a176f0f.10d98",\r
+        "id": "8ffd54c7.1ceb58",\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": 2908.0623779296875,\r
-        "y": 427.8597717285156,\r
+        "x": 2879.0623779296875,\r
+        "y": 412.8597717285156,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f5ad0f9a.63e04",\r
+        "id": "7447d3b7.3d9674",\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": 2262,\r
-        "y": 286,\r
+        "x": 2233,\r
+        "y": 271,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "1569ccc.fe523b3"\r
+                "80b48506.a5c978"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1569ccc.fe523b3",\r
+        "id": "80b48506.a5c978",\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": 2467,\r
-        "y": 286,\r
+        "x": 2438,\r
+        "y": 271,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "419949a6.57988"\r
+                "36fdb5a2.702cb2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "419949a6.57988",\r
+        "id": "36fdb5a2.702cb2",\r
         "type": "outcome",\r
         "name": "vpn-binding",\r
         "xml": "<outcome value='vpn-binding'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2633,\r
-        "y": 286,\r
+        "x": 2604,\r
+        "y": 271,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "da248b6f.863148"\r
+                "32e2ef12.2d28f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "da248b6f.863148",\r
+        "id": "32e2ef12.2d28f8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2796,\r
-        "y": 286,\r
+        "x": 2767,\r
+        "y": 271,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "b3f0264f.4b3ab"\r
+                "eaa455f.69afea8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a6c81dc0.f9e978",\r
+        "id": "c9dc240e.1f5cf8",\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": 3133,\r
-        "y": 90,\r
+        "x": 3104,\r
+        "y": 75,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "23f1ef20.aa22c8",\r
+        "id": "2f80a99a.2436ee",\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": 3159,\r
-        "y": 207,\r
+        "x": 3130,\r
+        "y": 192,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "de4bc6aa.088c5",\r
-                "2b53e15d.dd21ae",\r
-                "ae35d78c.86b8"\r
+                "5dad328f.715b34",\r
+                "e3a6748e.a712d",\r
+                "e35e866f.df6d4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "de4bc6aa.088c5",\r
+        "id": "5dad328f.715b34",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3354.5001220703125,\r
-        "y": 159,\r
+        "x": 3325.5001220703125,\r
+        "y": 144,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "9db55161.c57488"\r
+                "4d0c253f.a81e74"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2b53e15d.dd21ae",\r
+        "id": "e3a6748e.a712d",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3346.5001220703125,\r
-        "y": 214,\r
+        "x": 3317.5001220703125,\r
+        "y": 199,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "577df12f.4d35a8"\r
+                "b2cddf9.b286da"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9db55161.c57488",\r
+        "id": "4d0c253f.a81e74",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3498.8824462890625,\r
-        "y": 158.65567016601562,\r
+        "x": 3469.8824462890625,\r
+        "y": 143.65567016601562,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "5d329fe.f531fe"\r
+                "1f908e24.7ffb6a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5d329fe.f531fe",\r
+        "id": "1f908e24.7ffb6a",\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": 3683,\r
-        "y": 157,\r
+        "x": 3654,\r
+        "y": 142,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "b71d5fcd.e9cea"\r
+                "731e3134.cae0e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b71d5fcd.e9cea",\r
+        "id": "731e3134.cae0e8",\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": 3878,\r
-        "y": 157,\r
+        "x": 3849,\r
+        "y": 142,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "e408bf35.72655"\r
+                "924b0e47.33623"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ae35d78c.86b8",\r
+        "id": "e35e866f.df6d4",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3351.5001220703125,\r
-        "y": 271,\r
+        "x": 3322.5001220703125,\r
+        "y": 256,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "ee316bbc.ab53b8"\r
+                "96d892fb.bdb65"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ee316bbc.ab53b8",\r
+        "id": "96d892fb.bdb65",\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": 3503.5001220703125,\r
-        "y": 272,\r
+        "x": 3474.5001220703125,\r
+        "y": 257,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "577df12f.4d35a8",\r
+        "id": "b2cddf9.b286da",\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": 3514.5001220703125,\r
-        "y": 215,\r
+        "x": 3485.5001220703125,\r
+        "y": 200,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c9c3e28f.63609",\r
+        "id": "f5b1ba3f.53f16",\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": 4466,\r
-        "y": 174,\r
+        "x": 4437,\r
+        "y": 159,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "3dd076cd.5c231a",\r
-                "c9f64ae8.35669",\r
-                "7381c16f.b370e"\r
+                "24a03be4.6f22dc",\r
+                "9afded7b.e0fd88",\r
+                "473aa7de.af209"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e8fac782.8b4fb",\r
+        "id": "e5beadfa.65d4b",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 4260,\r
-        "y": 161,\r
+        "x": 4231,\r
+        "y": 146,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "66c06218.223abc",\r
-                "c9c3e28f.63609",\r
-                "8fb6a8ce.c9f538"\r
+                "c8e5909.1b608f",\r
+                "f5b1ba3f.53f16",\r
+                "f37bd9fd.aaa8a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "66c06218.223abc",\r
+        "id": "c8e5909.1b608f",\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": 4496,\r
-        "y": 122,\r
+        "x": 4467,\r
+        "y": 107,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3dd076cd.5c231a",\r
+        "id": "24a03be4.6f22dc",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4676,\r
-        "y": 165,\r
+        "x": 4647,\r
+        "y": 150,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "ffc56656.084b18"\r
+                "d0a9d6e9.c56f4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c9f64ae8.35669",\r
+        "id": "9afded7b.e0fd88",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4668,\r
-        "y": 220,\r
+        "x": 4639,\r
+        "y": 205,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "df0df27a.a48ca"\r
+                "27cca76b.e2c508"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7381c16f.b370e",\r
+        "id": "473aa7de.af209",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4673,\r
-        "y": 277,\r
+        "x": 4644,\r
+        "y": 262,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "1cc1a486.bc1f73"\r
+                "61a0060a.f22c2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1cc1a486.bc1f73",\r
+        "id": "61a0060a.f22c2",\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": 4825,\r
-        "y": 278,\r
+        "x": 4796,\r
+        "y": 263,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "df0df27a.a48ca",\r
+        "id": "27cca76b.e2c508",\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": 4836,\r
-        "y": 223,\r
+        "x": 4807,\r
+        "y": 208,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ffc56656.084b18",\r
+        "id": "d0a9d6e9.c56f4",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4820.38232421875,\r
-        "y": 162.65567016601562,\r
+        "x": 4791.38232421875,\r
+        "y": 147.65567016601562,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "f9ba3b0e.b3dbd8"\r
+                "67daf343.f6ee2c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e408bf35.72655",\r
+        "id": "924b0e47.33623",\r
         "type": "outcome",\r
         "name": "esr-thirdparty-sdnc",\r
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4081,\r
-        "y": 161,\r
+        "x": 4052,\r
+        "y": 146,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "e8fac782.8b4fb"\r
+                "e5beadfa.65d4b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f9ba3b0e.b3dbd8",\r
+        "id": "67daf343.f6ee2c",\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": 5035,\r
-        "y": 159,\r
+        "x": 5006,\r
+        "y": 144,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8fb6a8ce.c9f538",\r
+        "id": "f37bd9fd.aaa8a8",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
-        "x": 4416,\r
-        "y": 238,\r
+        "x": 4387,\r
+        "y": 223,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d80ddf6.5239ba",\r
+        "id": "eb52e479.fabdf8",\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.connectivity-id`\" />\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
+        "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": 3289,\r
-        "y": 602,\r
+        "x": 3260,\r
+        "y": 587,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "56ef2c2f.bde334",\r
-                "20356ae6.118a76"\r
+                "f7e1f7cd.472128",\r
+                "cd5ebb71.771178"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "56ef2c2f.bde334",\r
+        "id": "f7e1f7cd.472128",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3635.5,\r
-        "y": 595,\r
+        "x": 3606.5,\r
+        "y": 580,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "45e55581.afe784"\r
+                "e8c999cc.b2fcc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "20356ae6.118a76",\r
+        "id": "cd5ebb71.771178",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3639.5,\r
-        "y": 635,\r
+        "x": 3610.5,\r
+        "y": 620,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "b4e6443a.f1c248"\r
+                "fe0f592f.73096"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b4e6443a.f1c248",\r
+        "id": "fe0f592f.73096",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3797,\r
-        "y": 635,\r
+        "x": 3768,\r
+        "y": 620,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "f2316450.62431",\r
-                "6c3e1e17.47ccd8"\r
+                "a35fbdc3.ba44d8",\r
+                "25ddb449.839c14"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "45e55581.afe784",\r
+        "id": "e8c999cc.b2fcc",\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": 3793.5,\r
-        "y": 595,\r
+        "x": 3764.5,\r
+        "y": 580,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f2316450.62431",\r
+        "id": "a35fbdc3.ba44d8",\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-id`' />\n\n<parameter name='operational-status' value='Deactivated' />\n",\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": 4125.5,\r
-        "y": 635,\r
+        "x": 4096.5,\r
+        "y": 620,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "6c3e1e17.47ccd8",\r
+        "id": "25ddb449.839c14",\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": 4052.5,\r
-        "y": 681,\r
+        "x": 4023.5,\r
+        "y": 666,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "a14e9d29.27087",\r
+        "id": "e64ba97a.ab16f8",\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-id`\" />\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
+        "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": 3262,\r
-        "y": 474,\r
+        "x": 3233,\r
+        "y": 459,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "692cf34e.ccecdc",\r
-                "64e95b5b.03211c"\r
+                "e39876fb.5fed98",\r
+                "bba7f7ba.20df2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "692cf34e.ccecdc",\r
+        "id": "e39876fb.5fed98",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3594.5,\r
-        "y": 444,\r
+        "x": 3565.5,\r
+        "y": 429,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "8f4d555e.2bf24"\r
+                "577f2ccc.95a23c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "64e95b5b.03211c",\r
+        "id": "bba7f7ba.20df2",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3599.5,\r
-        "y": 509,\r
+        "x": 3570.5,\r
+        "y": 494,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "deb2a97d.a041c8"\r
+                "f956764e.d59e5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8f4d555e.2bf24",\r
+        "id": "577f2ccc.95a23c",\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": 3770.5,\r
-        "y": 444,\r
+        "x": 3741.5,\r
+        "y": 429,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "deb2a97d.a041c8",\r
+        "id": "f956764e.d59e5",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3766,\r
-        "y": 509,\r
+        "x": 3737,\r
+        "y": 494,\r
         "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             []\r