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 3584527..ff94831 100644 (file)
@@ -1,20 +1,20 @@
 [\r
     {\r
-        "id": "fed3eb51.781ac8",\r
+        "id": "9eb0ec9b.ca633",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 131,\r
-        "y": 81,\r
-        "z": "fdc94a5e.7c86f8",\r
+        "x": 136,\r
+        "y": 74,\r
+        "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "d2a4ea36.881b68"\r
+                "a6f9d5f0.04d6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d2a4ea36.881b68",\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": 262.2856903076172,\r
-        "y": 130.23810863494873,\r
-        "z": "fdc94a5e.7c86f8",\r
+        "x": 267.2856903076172,\r
+        "y": 123.23810863494873,\r
+        "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "7b1236d6.83c2c"\r
+                "3b0030c5.3e837"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7b1236d6.83c2c",\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": 265.4286193847656,\r
-        "y": 215.00003242492676,\r
-        "z": "fdc94a5e.7c86f8",\r
+        "x": 270.4286193847656,\r
+        "y": 208.00003242492676,\r
+        "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "8228a949.234f38"\r
+                "4b63b8a8.77bb4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8228a949.234f38",\r
+        "id": "4b63b8a8.77bb4",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 415.238037109375,\r
-        "y": 344.6666564941406,\r
-        "z": "fdc94a5e.7c86f8",\r
+        "x": 420.238037109375,\r
+        "y": 337.6666564941406,\r
+        "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "341b32a3.25428e",\r
-                "1a6e5da0.98eb02",\r
-                "e5c8285b.2b695"\r
+                "33834047.03c2f8",\r
+                "eaadc174.02e71",\r
+                "ce0777fc.b60f2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "341b32a3.25428e",\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": 689.5716552734375,\r
-        "y": 611.59716796875,\r
-        "z": "fdc94a5e.7c86f8",\r
+        "x": 694.5716552734375,\r
+        "y": 604.59716796875,\r
+        "z": "b39eb7ec.28f1a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f743b3f1.72f9f",\r
+        "id": "39c1d7dd.5e2018",\r
         "type": "comment",\r
         "name": "new for TransportSlicing",\r
         "info": "",\r
         "comments": "",\r
-        "x": 721,\r
-        "y": 286,\r
-        "z": "fdc94a5e.7c86f8",\r
+        "x": 726,\r
+        "y": 279,\r
+        "z": "b39eb7ec.28f1a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1a6e5da0.98eb02",\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": 741,\r
-        "y": 382,\r
-        "z": "fdc94a5e.7c86f8",\r
+        "x": 746,\r
+        "y": 375,\r
+        "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "2976ce78.f07a42",\r
-                "de3912b8.6d67e",\r
-                "77b5fc18.2082a4"\r
+                "def73660.f1599",\r
+                "7ca16f67.a19498",\r
+                "6d28513b.423be8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2976ce78.f07a42",\r
+        "id": "def73660.f1599",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 960,\r
-        "y": 320,\r
-        "z": "fdc94a5e.7c86f8",\r
+        "x": 965,\r
+        "y": 313,\r
+        "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "7ee13e19.7c1348"\r
+                "5c5bc497.c1130c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "de3912b8.6d67e",\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": 969.490966796875,\r
-        "y": 362.57403564453125,\r
-        "z": "fdc94a5e.7c86f8",\r
+        "x": 974.490966796875,\r
+        "y": 355.57403564453125,\r
+        "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "4a305009.90c32"\r
+                "3202281d.474eb8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "77b5fc18.2082a4",\r
+        "id": "6d28513b.423be8",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 958,\r
-        "y": 409,\r
-        "z": "fdc94a5e.7c86f8",\r
+        "x": 963,\r
+        "y": 402,\r
+        "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "cd4775e4.2da96"\r
+                "a1d5aff9.d75b68"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4a305009.90c32",\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": 1123.0623779296875,\r
-        "y": 365.8597717285156,\r
-        "z": "fdc94a5e.7c86f8",\r
+        "x": 1128.0623779296875,\r
+        "y": 358.8597717285156,\r
+        "z": "b39eb7ec.28f1a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "cd4775e4.2da96",\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": 1127,\r
-        "y": 410,\r
-        "z": "fdc94a5e.7c86f8",\r
+        "x": 1132,\r
+        "y": 403,\r
+        "z": "b39eb7ec.28f1a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7ee13e19.7c1348",\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": 1157,\r
-        "y": 316,\r
-        "z": "fdc94a5e.7c86f8",\r
+        "x": 1162,\r
+        "y": 309,\r
+        "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "bc03982b.15ba78"\r
+                "b3c4b504.2321f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bc03982b.15ba78",\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": 1380.33349609375,\r
-        "y": 315.99993896484375,\r
-        "z": "fdc94a5e.7c86f8",\r
+        "x": 1385.33349609375,\r
+        "y": 308.99993896484375,\r
+        "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "aca4b74a.cb3118"\r
+                "2c61dbe.2d462a4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "aca4b74a.cb3118",\r
+        "id": "2c61dbe.2d462a4",\r
         "type": "outcome",\r
         "name": "connectivity",\r
         "xml": "<outcome value='connectivity'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1581.0001335144043,\r
-        "y": 317.00002098083496,\r
-        "z": "fdc94a5e.7c86f8",\r
+        "x": 1586.0001335144043,\r
+        "y": 310.00002098083496,\r
+        "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "2544f612.eeddca"\r
+                "8cb99e8e.6d2cc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e5c8285b.2b695",\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": 707,\r
-        "y": 330,\r
-        "z": "fdc94a5e.7c86f8",\r
+        "x": 712,\r
+        "y": 323,\r
+        "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "2544f612.eeddca",\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": 1819,\r
-        "y": 319,\r
-        "z": "fdc94a5e.7c86f8",\r
+        "x": 1824,\r
+        "y": 312,\r
+        "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "75c7fde8.1d4a84",\r
-                "563ee44e.bd096c",\r
-                "bc425b5.1b1fba8"\r
+                "e48909d7.1167",\r
+                "9d9cf2b9.138cc",\r
+                "c57bdede.c607a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "75c7fde8.1d4a84",\r
+        "id": "e48909d7.1167",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2027,\r
-        "y": 283,\r
-        "z": "fdc94a5e.7c86f8",\r
+        "x": 2032,\r
+        "y": 276,\r
+        "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "e6a3b8f2.9e7b38"\r
+                "7447d3b7.3d9674"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "563ee44e.bd096c",\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": 2027.490966796875,\r
-        "y": 328.57403564453125,\r
-        "z": "fdc94a5e.7c86f8",\r
+        "x": 2032.490966796875,\r
+        "y": 321.57403564453125,\r
+        "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "ad15182e.154a8"\r
+                "c3f91382.355d78"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bc425b5.1b1fba8",\r
+        "id": "c57bdede.c607a8",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2025,\r
-        "y": 372,\r
-        "z": "fdc94a5e.7c86f8",\r
+        "x": 2030,\r
+        "y": 365,\r
+        "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "8719a717.3cd9f8"\r
+                "8f45128e.10469"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ad15182e.154a8",\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": 2190.0623779296875,\r
-        "y": 328.8597717285156,\r
-        "z": "fdc94a5e.7c86f8",\r
+        "x": 2195.0623779296875,\r
+        "y": 321.8597717285156,\r
+        "z": "b39eb7ec.28f1a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8719a717.3cd9f8",\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": 2194,\r
-        "y": 373,\r
-        "z": "fdc94a5e.7c86f8",\r
+        "x": 2199,\r
+        "y": 366,\r
+        "z": "b39eb7ec.28f1a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c776a79f.7f2db",\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": 2500,\r
-        "y": 372,\r
-        "z": "fdc94a5e.7c86f8",\r
+        "x": 2505,\r
+        "y": 365,\r
+        "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "b403a898.9fbc18",\r
-                "5d1a47a8.0dfe7",\r
-                "f3733135.d8a078"\r
+                "754a3f5.4e5d3c",\r
+                "563654a8.f8269c",\r
+                "49966192.933e3"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c765be65.0f488",\r
+        "id": "44a58adf.5965ac",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2884,\r
-        "y": 372,\r
-        "z": "fdc94a5e.7c86f8",\r
+        "x": 2889,\r
+        "y": 365,\r
+        "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "e9922fb9.764098",\r
-                "eef29d57.4c4228",\r
-                "952ea8f1.7bda",\r
-                "14a01812.a7d138"\r
+                "c9dc240e.1f5cf8",\r
+                "2f80a99a.2436ee",\r
+                "eb52e479.fabdf8",\r
+                "e64ba97a.ab16f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b403a898.9fbc18",\r
+        "id": "754a3f5.4e5d3c",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2711,\r
-        "y": 374,\r
-        "z": "fdc94a5e.7c86f8",\r
+        "x": 2716,\r
+        "y": 367,\r
+        "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "c765be65.0f488"\r
+                "44a58adf.5965ac"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5d1a47a8.0dfe7",\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": 2711.490966796875,\r
-        "y": 419.57403564453125,\r
-        "z": "fdc94a5e.7c86f8",\r
+        "x": 2716.490966796875,\r
+        "y": 412.57403564453125,\r
+        "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "1295f1fa.69cac6"\r
+                "8ffd54c7.1ceb58"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f3733135.d8a078",\r
+        "id": "49966192.933e3",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2709,\r
-        "y": 463,\r
-        "z": "fdc94a5e.7c86f8",\r
+        "x": 2714,\r
+        "y": 456,\r
+        "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "6ac7a77b.f5232"\r
+                "1dfb3bfc.f80f24"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6ac7a77b.f5232",\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": 2876,\r
-        "y": 462,\r
-        "z": "fdc94a5e.7c86f8",\r
+        "x": 2881,\r
+        "y": 455,\r
+        "z": "b39eb7ec.28f1a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1295f1fa.69cac6",\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": 2874.0623779296875,\r
-        "y": 419.8597717285156,\r
-        "z": "fdc94a5e.7c86f8",\r
+        "x": 2879.0623779296875,\r
+        "y": 412.8597717285156,\r
+        "z": "b39eb7ec.28f1a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e6a3b8f2.9e7b38",\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": 2228,\r
-        "y": 278,\r
-        "z": "fdc94a5e.7c86f8",\r
+        "x": 2233,\r
+        "y": 271,\r
+        "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "d8c7aa6c.9474d"\r
+                "80b48506.a5c978"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d8c7aa6c.9474d",\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": 2433,\r
-        "y": 278,\r
-        "z": "fdc94a5e.7c86f8",\r
+        "x": 2438,\r
+        "y": 271,\r
+        "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "6afd9b1f.24ad3c"\r
+                "36fdb5a2.702cb2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6afd9b1f.24ad3c",\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": 2599,\r
-        "y": 278,\r
-        "z": "fdc94a5e.7c86f8",\r
+        "x": 2604,\r
+        "y": 271,\r
+        "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "489d615f.74d2b8"\r
+                "32e2ef12.2d28f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "489d615f.74d2b8",\r
+        "id": "32e2ef12.2d28f8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2762,\r
-        "y": 278,\r
-        "z": "fdc94a5e.7c86f8",\r
+        "x": 2767,\r
+        "y": 271,\r
+        "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "c776a79f.7f2db"\r
+                "eaa455f.69afea8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e9922fb9.764098",\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": 3099,\r
-        "y": 82,\r
-        "z": "fdc94a5e.7c86f8",\r
+        "x": 3104,\r
+        "y": 75,\r
+        "z": "b39eb7ec.28f1a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "eef29d57.4c4228",\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": 3125,\r
-        "y": 199,\r
-        "z": "fdc94a5e.7c86f8",\r
+        "x": 3130,\r
+        "y": 192,\r
+        "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "e1caf9b0.f16ef",\r
-                "8ba822ff.3c855",\r
-                "3e54396e.89bb66"\r
+                "5dad328f.715b34",\r
+                "e3a6748e.a712d",\r
+                "e35e866f.df6d4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e1caf9b0.f16ef",\r
+        "id": "5dad328f.715b34",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3320.5001220703125,\r
-        "y": 151,\r
-        "z": "fdc94a5e.7c86f8",\r
+        "x": 3325.5001220703125,\r
+        "y": 144,\r
+        "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "12b4a6a1.bdd529"\r
+                "4d0c253f.a81e74"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8ba822ff.3c855",\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": 3312.5001220703125,\r
-        "y": 206,\r
-        "z": "fdc94a5e.7c86f8",\r
+        "x": 3317.5001220703125,\r
+        "y": 199,\r
+        "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "6aa3fcb.c3a6c84"\r
+                "b2cddf9.b286da"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "12b4a6a1.bdd529",\r
+        "id": "4d0c253f.a81e74",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3464.8824462890625,\r
-        "y": 150.65567016601562,\r
-        "z": "fdc94a5e.7c86f8",\r
+        "x": 3469.8824462890625,\r
+        "y": 143.65567016601562,\r
+        "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "8559d2a.befa2b"\r
+                "1f908e24.7ffb6a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8559d2a.befa2b",\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": 3649,\r
-        "y": 149,\r
-        "z": "fdc94a5e.7c86f8",\r
+        "x": 3654,\r
+        "y": 142,\r
+        "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "a2c1ad39.50b17"\r
+                "731e3134.cae0e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a2c1ad39.50b17",\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": 3844,\r
-        "y": 149,\r
-        "z": "fdc94a5e.7c86f8",\r
+        "x": 3849,\r
+        "y": 142,\r
+        "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "f7ee255a.8640e"\r
+                "924b0e47.33623"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3e54396e.89bb66",\r
+        "id": "e35e866f.df6d4",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3317.5001220703125,\r
-        "y": 263,\r
-        "z": "fdc94a5e.7c86f8",\r
+        "x": 3322.5001220703125,\r
+        "y": 256,\r
+        "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "ff13ab9d.2deb7"\r
+                "96d892fb.bdb65"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ff13ab9d.2deb7",\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": 3469.5001220703125,\r
-        "y": 264,\r
-        "z": "fdc94a5e.7c86f8",\r
+        "x": 3474.5001220703125,\r
+        "y": 257,\r
+        "z": "b39eb7ec.28f1a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6aa3fcb.c3a6c84",\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": 3480.5001220703125,\r
-        "y": 207,\r
-        "z": "fdc94a5e.7c86f8",\r
+        "x": 3485.5001220703125,\r
+        "y": 200,\r
+        "z": "b39eb7ec.28f1a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d85cad49.e7fe3",\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": 4432,\r
-        "y": 166,\r
-        "z": "fdc94a5e.7c86f8",\r
+        "x": 4437,\r
+        "y": 159,\r
+        "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "5b32aba.7fc39d4",\r
-                "43d71291.c727fc",\r
-                "6b05861c.156668"\r
+                "24a03be4.6f22dc",\r
+                "9afded7b.e0fd88",\r
+                "473aa7de.af209"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "98badb93.a08c9",\r
+        "id": "e5beadfa.65d4b",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 4226,\r
-        "y": 153,\r
-        "z": "fdc94a5e.7c86f8",\r
+        "x": 4231,\r
+        "y": 146,\r
+        "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "48966cee.55dba4",\r
-                "d85cad49.e7fe3",\r
-                "ee878ee.4f8847"\r
+                "c8e5909.1b608f",\r
+                "f5b1ba3f.53f16",\r
+                "f37bd9fd.aaa8a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "48966cee.55dba4",\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": 4462,\r
-        "y": 114,\r
-        "z": "fdc94a5e.7c86f8",\r
+        "x": 4467,\r
+        "y": 107,\r
+        "z": "b39eb7ec.28f1a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5b32aba.7fc39d4",\r
+        "id": "24a03be4.6f22dc",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4642,\r
-        "y": 157,\r
-        "z": "fdc94a5e.7c86f8",\r
+        "x": 4647,\r
+        "y": 150,\r
+        "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "20fc8e76.a69222"\r
+                "d0a9d6e9.c56f4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "43d71291.c727fc",\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": 4634,\r
-        "y": 212,\r
-        "z": "fdc94a5e.7c86f8",\r
+        "x": 4639,\r
+        "y": 205,\r
+        "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "51e97aab.2d7044"\r
+                "27cca76b.e2c508"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6b05861c.156668",\r
+        "id": "473aa7de.af209",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4639,\r
-        "y": 269,\r
-        "z": "fdc94a5e.7c86f8",\r
+        "x": 4644,\r
+        "y": 262,\r
+        "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "ef0b1a78.fffea8"\r
+                "61a0060a.f22c2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ef0b1a78.fffea8",\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": 4791,\r
-        "y": 270,\r
-        "z": "fdc94a5e.7c86f8",\r
+        "x": 4796,\r
+        "y": 263,\r
+        "z": "b39eb7ec.28f1a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "51e97aab.2d7044",\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": 4802,\r
-        "y": 215,\r
-        "z": "fdc94a5e.7c86f8",\r
+        "x": 4807,\r
+        "y": 208,\r
+        "z": "b39eb7ec.28f1a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "20fc8e76.a69222",\r
+        "id": "d0a9d6e9.c56f4",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4786.38232421875,\r
-        "y": 154.65567016601562,\r
-        "z": "fdc94a5e.7c86f8",\r
+        "x": 4791.38232421875,\r
+        "y": 147.65567016601562,\r
+        "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "a8dfc05f.e2f018"\r
+                "67daf343.f6ee2c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f7ee255a.8640e",\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": 4047,\r
-        "y": 153,\r
-        "z": "fdc94a5e.7c86f8",\r
+        "x": 4052,\r
+        "y": 146,\r
+        "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "98badb93.a08c9"\r
+                "e5beadfa.65d4b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a8dfc05f.e2f018",\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": 5001,\r
-        "y": 151,\r
-        "z": "fdc94a5e.7c86f8",\r
+        "x": 5006,\r
+        "y": 144,\r
+        "z": "b39eb7ec.28f1a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ee878ee.4f8847",\r
+        "id": "f37bd9fd.aaa8a8",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
-        "x": 4382,\r
-        "y": 230,\r
-        "z": "fdc94a5e.7c86f8",\r
+        "x": 4387,\r
+        "y": 223,\r
+        "z": "b39eb7ec.28f1a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "952ea8f1.7bda",\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/eth-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": 3255,\r
-        "y": 594,\r
-        "z": "fdc94a5e.7c86f8",\r
+        "x": 3260,\r
+        "y": 587,\r
+        "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "d9dc02b.5b9308",\r
-                "f01b6c55.209f38"\r
+                "f7e1f7cd.472128",\r
+                "cd5ebb71.771178"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d9dc02b.5b9308",\r
+        "id": "f7e1f7cd.472128",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3601.5,\r
-        "y": 587,\r
-        "z": "fdc94a5e.7c86f8",\r
+        "x": 3606.5,\r
+        "y": 580,\r
+        "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "174c3f65.a9f0e1"\r
+                "e8c999cc.b2fcc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f01b6c55.209f38",\r
+        "id": "cd5ebb71.771178",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3605.5,\r
-        "y": 627,\r
-        "z": "fdc94a5e.7c86f8",\r
+        "x": 3610.5,\r
+        "y": 620,\r
+        "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "de16161.028de68"\r
+                "fe0f592f.73096"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "de16161.028de68",\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": 3763,\r
-        "y": 627,\r
-        "z": "fdc94a5e.7c86f8",\r
+        "x": 3768,\r
+        "y": 620,\r
+        "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "1a3ebd6b.2a7953",\r
-                "30c3e280.4d41f6"\r
+                "a35fbdc3.ba44d8",\r
+                "25ddb449.839c14"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "174c3f65.a9f0e1",\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 Create vpn rest api\" />\n",\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": 3759.5,\r
-        "y": 587,\r
-        "z": "fdc94a5e.7c86f8",\r
+        "x": 3764.5,\r
+        "y": 580,\r
+        "z": "b39eb7ec.28f1a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1a3ebd6b.2a7953",\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": 4091.5,\r
-        "y": 627,\r
-        "z": "fdc94a5e.7c86f8",\r
+        "x": 4096.5,\r
+        "y": 620,\r
+        "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "30c3e280.4d41f6",\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": 4018.5,\r
-        "y": 673,\r
-        "z": "fdc94a5e.7c86f8",\r
+        "x": 4023.5,\r
+        "y": 666,\r
+        "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "14a01812.a7d138",\r
+        "id": "e64ba97a.ab16f8",\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/tunnels/tunnel=' + $tmp.aai.vpn-binding.vpn-id`\" />\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=\"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
+        "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": 3228,\r
-        "y": 466,\r
-        "z": "fdc94a5e.7c86f8",\r
+        "x": 3233,\r
+        "y": 459,\r
+        "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "8e721e50.020db",\r
-                "8f6c71d1.f7e258"\r
+                "e39876fb.5fed98",\r
+                "bba7f7ba.20df2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8e721e50.020db",\r
+        "id": "e39876fb.5fed98",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3560.5,\r
-        "y": 436,\r
-        "z": "fdc94a5e.7c86f8",\r
+        "x": 3565.5,\r
+        "y": 429,\r
+        "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "b94a74e8.509ec"\r
+                "577f2ccc.95a23c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8f6c71d1.f7e258",\r
+        "id": "bba7f7ba.20df2",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3565.5,\r
-        "y": 501,\r
-        "z": "fdc94a5e.7c86f8",\r
+        "x": 3570.5,\r
+        "y": 494,\r
+        "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             [\r
-                "e36acb2.364b538"\r
+                "f956764e.d59e5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b94a74e8.509ec",\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 Create vpn rest api\" />\n",\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": 3736.5,\r
-        "y": 436,\r
-        "z": "fdc94a5e.7c86f8",\r
+        "x": 3741.5,\r
+        "y": 429,\r
+        "z": "b39eb7ec.28f1a8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "e36acb2.364b538",\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": 3732,\r
-        "y": 501,\r
-        "z": "fdc94a5e.7c86f8",\r
+        "x": 3737,\r
+        "y": 494,\r
+        "z": "b39eb7ec.28f1a8",\r
         "wires": [\r
             []\r
         ]\r