Bug fixing required for integration testing with PCE.
[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 ff94831..a03f157 100644 (file)
@@ -1,20 +1,20 @@
 [\r
     {\r
-        "id": "9eb0ec9b.ca633",\r
+        "id": "aff24c57.82823",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 136,\r
-        "y": 74,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 137,\r
+        "y": 87,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             [\r
-                "a6f9d5f0.04d6"\r
+                "cead96fb.e8dbd8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a6f9d5f0.04d6",\r
+        "id": "cead96fb.e8dbd8",\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": 267.2856903076172,\r
-        "y": 123.23810863494873,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 268.2856903076172,\r
+        "y": 136.23810863494873,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             [\r
-                "3b0030c5.3e837"\r
+                "f33f007a.ddfeb"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3b0030c5.3e837",\r
+        "id": "f33f007a.ddfeb",\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": 270.4286193847656,\r
-        "y": 208.00003242492676,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 271.4286193847656,\r
+        "y": 221.00003242492676,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             [\r
-                "4b63b8a8.77bb4"\r
+                "c2692281.2e03c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4b63b8a8.77bb4",\r
+        "id": "c2692281.2e03c",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 420.238037109375,\r
-        "y": 337.6666564941406,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 421.238037109375,\r
+        "y": 350.6666564941406,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             [\r
-                "33834047.03c2f8",\r
-                "eaadc174.02e71",\r
-                "ce0777fc.b60f2"\r
+                "114b6c5d.64d20c",\r
+                "f27e6da1.6477",\r
+                "5bf17e9d.d43418"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "33834047.03c2f8",\r
+        "id": "114b6c5d.64d20c",\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": 694.5716552734375,\r
-        "y": 604.59716796875,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 695.5716552734375,\r
+        "y": 617.59716796875,\r
+        "z": "973adb8c.e1e518",\r
         "wires": []\r
     },\r
     {\r
-        "id": "39c1d7dd.5e2018",\r
+        "id": "f470d27.b1be9b",\r
         "type": "comment",\r
         "name": "new for TransportSlicing",\r
         "info": "",\r
         "comments": "",\r
-        "x": 726,\r
-        "y": 279,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 727,\r
+        "y": 292,\r
+        "z": "973adb8c.e1e518",\r
         "wires": []\r
     },\r
     {\r
-        "id": "eaadc174.02e71",\r
+        "id": "f27e6da1.6477",\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": 746,\r
-        "y": 375,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 747,\r
+        "y": 388,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             [\r
-                "def73660.f1599",\r
-                "7ca16f67.a19498",\r
-                "6d28513b.423be8"\r
+                "7269ea10.8ecaa4",\r
+                "518c2c34.9a6a14",\r
+                "d42c62ff.6bda7"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "def73660.f1599",\r
+        "id": "7269ea10.8ecaa4",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 965,\r
-        "y": 313,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 966,\r
+        "y": 326,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             [\r
-                "5c5bc497.c1130c"\r
+                "8e953b49.9b6fc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7ca16f67.a19498",\r
+        "id": "518c2c34.9a6a14",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 974.490966796875,\r
-        "y": 355.57403564453125,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 975.490966796875,\r
+        "y": 368.57403564453125,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             [\r
-                "3202281d.474eb8"\r
+                "bbd8fc13.968688"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6d28513b.423be8",\r
+        "id": "d42c62ff.6bda7",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 963,\r
-        "y": 402,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 964,\r
+        "y": 415,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             [\r
-                "a1d5aff9.d75b68"\r
+                "67ddbb99.6b0b84"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3202281d.474eb8",\r
+        "id": "bbd8fc13.968688",\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": 1128.0623779296875,\r
-        "y": 358.8597717285156,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 1129.0623779296875,\r
+        "y": 371.8597717285156,\r
+        "z": "973adb8c.e1e518",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a1d5aff9.d75b68",\r
+        "id": "67ddbb99.6b0b84",\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": 1132,\r
-        "y": 403,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 1133,\r
+        "y": 416,\r
+        "z": "973adb8c.e1e518",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5c5bc497.c1130c",\r
+        "id": "8e953b49.9b6fc",\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": 1162,\r
-        "y": 309,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 1163,\r
+        "y": 322,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             [\r
-                "b3c4b504.2321f"\r
+                "7bc604b0.a688bc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b3c4b504.2321f",\r
+        "id": "7bc604b0.a688bc",\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": 1385.33349609375,\r
-        "y": 308.99993896484375,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 1386.33349609375,\r
+        "y": 321.99993896484375,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             [\r
-                "2c61dbe.2d462a4"\r
+                "5063b203.704cc4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2c61dbe.2d462a4",\r
+        "id": "5063b203.704cc4",\r
         "type": "outcome",\r
         "name": "connectivity",\r
         "xml": "<outcome value='connectivity'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1586.0001335144043,\r
-        "y": 310.00002098083496,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 1587.0001335144043,\r
+        "y": 323.00002098083496,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             [\r
-                "8cb99e8e.6d2cc"\r
+                "a9f2d74.cd545a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ce0777fc.b60f2",\r
+        "id": "5bf17e9d.d43418",\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": 712,\r
-        "y": 323,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 713,\r
+        "y": 336,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "8cb99e8e.6d2cc",\r
+        "id": "a9f2d74.cd545a8",\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": 1824,\r
-        "y": 312,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 1825,\r
+        "y": 325,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             [\r
-                "e48909d7.1167",\r
-                "9d9cf2b9.138cc",\r
-                "c57bdede.c607a8"\r
+                "7c83a2e6.7b4dd4",\r
+                "a7cc478b.7d146",\r
+                "a8bc27c3.c77fc8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e48909d7.1167",\r
+        "id": "7c83a2e6.7b4dd4",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2032,\r
-        "y": 276,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 2033,\r
+        "y": 289,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             [\r
-                "7447d3b7.3d9674"\r
+                "9d15862c.acb858"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9d9cf2b9.138cc",\r
+        "id": "a7cc478b.7d146",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2032.490966796875,\r
-        "y": 321.57403564453125,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 2033.490966796875,\r
+        "y": 334.57403564453125,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             [\r
-                "c3f91382.355d78"\r
+                "c922168b.4d46c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c57bdede.c607a8",\r
+        "id": "a8bc27c3.c77fc8",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2030,\r
-        "y": 365,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 2031,\r
+        "y": 378,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             [\r
-                "8f45128e.10469"\r
+                "b9e1cde3.aaa95"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c3f91382.355d78",\r
+        "id": "c922168b.4d46c",\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": 2195.0623779296875,\r
-        "y": 321.8597717285156,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 2196.0623779296875,\r
+        "y": 334.8597717285156,\r
+        "z": "973adb8c.e1e518",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8f45128e.10469",\r
+        "id": "b9e1cde3.aaa95",\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": 2199,\r
-        "y": 366,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 2200,\r
+        "y": 379,\r
+        "z": "973adb8c.e1e518",\r
         "wires": []\r
     },\r
     {\r
-        "id": "eaa455f.69afea8",\r
+        "id": "2b1e22a1.17a9f6",\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": 2505,\r
-        "y": 365,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 2506,\r
+        "y": 378,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             [\r
-                "754a3f5.4e5d3c",\r
-                "563654a8.f8269c",\r
-                "49966192.933e3"\r
+                "18102e44.c2508a",\r
+                "21816052.be64e8",\r
+                "241de628.b25112"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "44a58adf.5965ac",\r
+        "id": "93757346.0f3e2",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2889,\r
-        "y": 365,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 2890,\r
+        "y": 378,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             [\r
-                "c9dc240e.1f5cf8",\r
-                "2f80a99a.2436ee",\r
-                "eb52e479.fabdf8",\r
-                "e64ba97a.ab16f8"\r
+                "77e4f011.15fc4",\r
+                "2c86ef39.d526a",\r
+                "76429f4b.07b2a8",\r
+                "6cc7e2bb.560604"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "754a3f5.4e5d3c",\r
+        "id": "18102e44.c2508a",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2716,\r
-        "y": 367,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 2717,\r
+        "y": 380,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             [\r
-                "44a58adf.5965ac"\r
+                "93757346.0f3e2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "563654a8.f8269c",\r
+        "id": "21816052.be64e8",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2716.490966796875,\r
-        "y": 412.57403564453125,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 2717.490966796875,\r
+        "y": 425.57403564453125,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             [\r
-                "8ffd54c7.1ceb58"\r
+                "f6b9e29.dd4472"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "49966192.933e3",\r
+        "id": "241de628.b25112",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2714,\r
-        "y": 456,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 2715,\r
+        "y": 469,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             [\r
-                "1dfb3bfc.f80f24"\r
+                "d2d6733.abb0d9"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1dfb3bfc.f80f24",\r
+        "id": "d2d6733.abb0d9",\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": 2881,\r
-        "y": 455,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 2882,\r
+        "y": 468,\r
+        "z": "973adb8c.e1e518",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8ffd54c7.1ceb58",\r
+        "id": "f6b9e29.dd4472",\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": 2879.0623779296875,\r
-        "y": 412.8597717285156,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 2880.0623779296875,\r
+        "y": 425.8597717285156,\r
+        "z": "973adb8c.e1e518",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7447d3b7.3d9674",\r
+        "id": "9d15862c.acb858",\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": 2233,\r
-        "y": 271,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 2234,\r
+        "y": 284,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             [\r
-                "80b48506.a5c978"\r
+                "732b4cc0.91b37c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "80b48506.a5c978",\r
+        "id": "732b4cc0.91b37c",\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": 2438,\r
-        "y": 271,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 2439,\r
+        "y": 284,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             [\r
-                "36fdb5a2.702cb2"\r
+                "cb7e44a7.8a59"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "36fdb5a2.702cb2",\r
+        "id": "cb7e44a7.8a59",\r
         "type": "outcome",\r
         "name": "vpn-binding",\r
         "xml": "<outcome value='vpn-binding'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2604,\r
-        "y": 271,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 2605,\r
+        "y": 284,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             [\r
-                "32e2ef12.2d28f8"\r
+                "3789a9eb.0ef24e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "32e2ef12.2d28f8",\r
+        "id": "3789a9eb.0ef24e",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2767,\r
-        "y": 271,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 2768,\r
+        "y": 284,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             [\r
-                "eaa455f.69afea8"\r
+                "2b1e22a1.17a9f6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c9dc240e.1f5cf8",\r
+        "id": "77e4f011.15fc4",\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": 3104,\r
-        "y": 75,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 3105,\r
+        "y": 88,\r
+        "z": "973adb8c.e1e518",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2f80a99a.2436ee",\r
+        "id": "2c86ef39.d526a",\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": 3130,\r
-        "y": 192,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 3131,\r
+        "y": 205,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             [\r
-                "5dad328f.715b34",\r
-                "e3a6748e.a712d",\r
-                "e35e866f.df6d4"\r
+                "dca54f5.5973b3",\r
+                "fc504d63.ef84",\r
+                "13ebc65.3fdb33a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5dad328f.715b34",\r
+        "id": "dca54f5.5973b3",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3325.5001220703125,\r
-        "y": 144,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 3326.5001220703125,\r
+        "y": 157,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             [\r
-                "4d0c253f.a81e74"\r
+                "77882641.430388"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e3a6748e.a712d",\r
+        "id": "fc504d63.ef84",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3317.5001220703125,\r
-        "y": 199,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 3318.5001220703125,\r
+        "y": 212,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             [\r
-                "b2cddf9.b286da"\r
+                "a8ee2b92.3df2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4d0c253f.a81e74",\r
+        "id": "77882641.430388",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3469.8824462890625,\r
-        "y": 143.65567016601562,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 3470.8824462890625,\r
+        "y": 156.65567016601562,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             [\r
-                "1f908e24.7ffb6a"\r
+                "cc921f58.3bd8b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1f908e24.7ffb6a",\r
+        "id": "cc921f58.3bd8b8",\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": 3654,\r
-        "y": 142,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 3655,\r
+        "y": 155,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             [\r
-                "731e3134.cae0e8"\r
+                "72a85062.4c34f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "731e3134.cae0e8",\r
+        "id": "72a85062.4c34f8",\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": 3849,\r
-        "y": 142,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 3850,\r
+        "y": 155,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             [\r
-                "924b0e47.33623"\r
+                "2455d1ba.682ede"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e35e866f.df6d4",\r
+        "id": "13ebc65.3fdb33a",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3322.5001220703125,\r
-        "y": 256,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 3323.5001220703125,\r
+        "y": 269,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             [\r
-                "96d892fb.bdb65"\r
+                "5ec35efc.fc0da8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "96d892fb.bdb65",\r
+        "id": "5ec35efc.fc0da8",\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": 3474.5001220703125,\r
-        "y": 257,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 3475.5001220703125,\r
+        "y": 270,\r
+        "z": "973adb8c.e1e518",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b2cddf9.b286da",\r
+        "id": "a8ee2b92.3df2",\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": 3485.5001220703125,\r
-        "y": 200,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 3486.5001220703125,\r
+        "y": 213,\r
+        "z": "973adb8c.e1e518",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f5b1ba3f.53f16",\r
+        "id": "c867d9b4.e35b28",\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": 4437,\r
-        "y": 159,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 4438,\r
+        "y": 172,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             [\r
-                "24a03be4.6f22dc",\r
-                "9afded7b.e0fd88",\r
-                "473aa7de.af209"\r
+                "d6e555b3.ae89f8",\r
+                "ff096fed.6932c",\r
+                "507b0c57.90eac4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e5beadfa.65d4b",\r
+        "id": "e8e1d1d2.3bd27",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 4231,\r
-        "y": 146,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 4232,\r
+        "y": 159,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             [\r
-                "c8e5909.1b608f",\r
-                "f5b1ba3f.53f16",\r
-                "f37bd9fd.aaa8a8"\r
+                "984b6b80.85eb28",\r
+                "c867d9b4.e35b28",\r
+                "ad75bc9f.423928"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c8e5909.1b608f",\r
+        "id": "984b6b80.85eb28",\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": 4467,\r
-        "y": 107,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 4468,\r
+        "y": 120,\r
+        "z": "973adb8c.e1e518",\r
         "wires": []\r
     },\r
     {\r
-        "id": "24a03be4.6f22dc",\r
+        "id": "d6e555b3.ae89f8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4647,\r
-        "y": 150,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 4648,\r
+        "y": 163,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             [\r
-                "d0a9d6e9.c56f4"\r
+                "c77140eb.28cae"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9afded7b.e0fd88",\r
+        "id": "ff096fed.6932c",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4639,\r
-        "y": 205,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 4640,\r
+        "y": 218,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             [\r
-                "27cca76b.e2c508"\r
+                "398208f1.a535d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "473aa7de.af209",\r
+        "id": "507b0c57.90eac4",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4644,\r
-        "y": 262,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 4645,\r
+        "y": 275,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             [\r
-                "61a0060a.f22c2"\r
+                "5db92f44.b3b368"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "61a0060a.f22c2",\r
+        "id": "5db92f44.b3b368",\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": 4796,\r
-        "y": 263,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 4797,\r
+        "y": 276,\r
+        "z": "973adb8c.e1e518",\r
         "wires": []\r
     },\r
     {\r
-        "id": "27cca76b.e2c508",\r
+        "id": "398208f1.a535d",\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": 4807,\r
-        "y": 208,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 4808,\r
+        "y": 221,\r
+        "z": "973adb8c.e1e518",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d0a9d6e9.c56f4",\r
+        "id": "c77140eb.28cae",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4791.38232421875,\r
-        "y": 147.65567016601562,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 4792.38232421875,\r
+        "y": 160.65567016601562,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             [\r
-                "67daf343.f6ee2c"\r
+                "a91b7f99.6e2d28"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "924b0e47.33623",\r
+        "id": "2455d1ba.682ede",\r
         "type": "outcome",\r
         "name": "esr-thirdparty-sdnc",\r
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4052,\r
-        "y": 146,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 4053,\r
+        "y": 159,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             [\r
-                "e5beadfa.65d4b"\r
+                "e8e1d1d2.3bd27"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "67daf343.f6ee2c",\r
+        "id": "a91b7f99.6e2d28",\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": 5006,\r
-        "y": 144,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 5007,\r
+        "y": 157,\r
+        "z": "973adb8c.e1e518",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f37bd9fd.aaa8a8",\r
+        "id": "ad75bc9f.423928",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
-        "x": 4387,\r
-        "y": 223,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 4388,\r
+        "y": 236,\r
+        "z": "973adb8c.e1e518",\r
         "wires": []\r
     },\r
     {\r
-        "id": "eb52e479.fabdf8",\r
+        "id": "166b8d0a.b5831b",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode Delete ethernet Service without token",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.aai.connectivity.etht-svc-name`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<!--<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3260,\r
-        "y": 587,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 3766,\r
+        "y": 585,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             [\r
-                "f7e1f7cd.472128",\r
-                "cd5ebb71.771178"\r
+                "b8398bf9.b49e9",\r
+                "27d2dbd5.61793c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f7e1f7cd.472128",\r
+        "id": "b8398bf9.b49e9",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3606.5,\r
-        "y": 580,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 4112.5,\r
+        "y": 578,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             [\r
-                "e8c999cc.b2fcc"\r
+                "3e628567.b7364a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cd5ebb71.771178",\r
+        "id": "27d2dbd5.61793c",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3610.5,\r
-        "y": 620,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 4116.5,\r
+        "y": 618,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             [\r
-                "fe0f592f.73096"\r
+                "7168ea95.0ebd84"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fe0f592f.73096",\r
+        "id": "7168ea95.0ebd84",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3768,\r
-        "y": 620,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 4274,\r
+        "y": 618,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             [\r
-                "a35fbdc3.ba44d8",\r
-                "25ddb449.839c14"\r
+                "f83800f1.842c8",\r
+                "f7f5fb91.6043d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e8c999cc.b2fcc",\r
+        "id": "3e628567.b7364a",\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": 3764.5,\r
-        "y": 580,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 4270.5,\r
+        "y": 578,\r
+        "z": "973adb8c.e1e518",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a35fbdc3.ba44d8",\r
+        "id": "f83800f1.842c8",\r
         "type": "save",\r
         "name": "update vpn-binding resource (aka. OTN domainA) in AAI",\r
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-binding.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-binding.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-binding.vpn-name`' />\n\n<parameter name='operational-status' value='Deactivated' />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4096.5,\r
-        "y": 620,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 4602.5,\r
+        "y": 618,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "25ddb449.839c14",\r
+        "id": "f7f5fb91.6043d8",\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": 4023.5,\r
-        "y": 666,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 4529.5,\r
+        "y": 664,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "e64ba97a.ab16f8",\r
+        "id": "76429f4b.07b2a8",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode Delete OTN tunnel with token",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<!--<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-otn-src-domain-creation.templatefile`\" />-->\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-te:te/tunnels/tunnel=' + $tmp.aai.vpn-binding.vpn-name`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3233,\r
-        "y": 459,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 3234,\r
+        "y": 472,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             [\r
-                "e39876fb.5fed98",\r
-                "bba7f7ba.20df2"\r
+                "a5d8b39e.03bbe",\r
+                "dd9b666a.742b78"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e39876fb.5fed98",\r
+        "id": "a5d8b39e.03bbe",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3565.5,\r
-        "y": 429,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 3566.5,\r
+        "y": 442,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             [\r
-                "577f2ccc.95a23c"\r
+                "2667a800.f5f9"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bba7f7ba.20df2",\r
+        "id": "dd9b666a.742b78",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3570.5,\r
-        "y": 494,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 3571.5,\r
+        "y": 507,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             [\r
-                "f956764e.d59e5"\r
+                "91bc4eb8.d42b1"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "577f2ccc.95a23c",\r
+        "id": "2667a800.f5f9",\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": 3741.5,\r
-        "y": 429,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 3742.5,\r
+        "y": 442,\r
+        "z": "973adb8c.e1e518",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f956764e.d59e5",\r
+        "id": "91bc4eb8.d42b1",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3737,\r
-        "y": 494,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 3738,\r
+        "y": 507,\r
+        "z": "973adb8c.e1e518",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "6cc7e2bb.560604",\r
+        "type": "switchNode",\r
+        "name": "switch connectivity has ethernet service",\r
+        "xml": "<switch test='`$tmp.aai.connectivity.etht-svc-name`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3172,\r
+        "y": 607,\r
+        "z": "973adb8c.e1e518",\r
+        "wires": [\r
+            [\r
+                "7c7f58f1.31378",\r
+                "4913f8dd.a3519"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "4913f8dd.a3519",\r
+        "type": "other",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3425,\r
+        "y": 585,\r
+        "z": "973adb8c.e1e518",\r
+        "wires": [\r
+            [\r
+                "166b8d0a.b5831b"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "7c7f58f1.31378",\r
+        "type": "outcome",\r
+        "name": "Null",\r
+        "xml": "<outcome value=''>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3425,\r
+        "y": 641,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             []\r
         ]\r