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 5684584..a03f157 100644 (file)
@@ -1,20 +1,20 @@
 [\r
     {\r
-        "id": "5242e55f.2660bc",\r
+        "id": "aff24c57.82823",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 165,\r
-        "y": 89,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 137,\r
+        "y": 87,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             [\r
-                "a94d71b7.2c2048"\r
+                "cead96fb.e8dbd8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a94d71b7.2c2048",\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": 296.2856903076172,\r
-        "y": 138.23810863494873,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 268.2856903076172,\r
+        "y": 136.23810863494873,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             [\r
-                "aa153b53.66c418"\r
+                "f33f007a.ddfeb"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "aa153b53.66c418",\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": 299.4286193847656,\r
-        "y": 223.00003242492676,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 271.4286193847656,\r
+        "y": 221.00003242492676,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             [\r
-                "76657765.41a798"\r
+                "c2692281.2e03c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "76657765.41a798",\r
+        "id": "c2692281.2e03c",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 449.238037109375,\r
-        "y": 352.6666564941406,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 421.238037109375,\r
+        "y": 350.6666564941406,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             [\r
-                "72f9366e.3a99d8",\r
-                "680f29c8.59cd3",\r
-                "fc546f71.cb3e18"\r
+                "114b6c5d.64d20c",\r
+                "f27e6da1.6477",\r
+                "5bf17e9d.d43418"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "72f9366e.3a99d8",\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": 723.5716552734375,\r
-        "y": 619.59716796875,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 695.5716552734375,\r
+        "y": 617.59716796875,\r
+        "z": "973adb8c.e1e518",\r
         "wires": []\r
     },\r
     {\r
-        "id": "af064a7b.44da3",\r
+        "id": "f470d27.b1be9b",\r
         "type": "comment",\r
         "name": "new for TransportSlicing",\r
         "info": "",\r
         "comments": "",\r
-        "x": 755,\r
-        "y": 294,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 727,\r
+        "y": 292,\r
+        "z": "973adb8c.e1e518",\r
         "wires": []\r
     },\r
     {\r
-        "id": "680f29c8.59cd3",\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": 775,\r
-        "y": 390,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 747,\r
+        "y": 388,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             [\r
-                "ea580b2d.a2b9d",\r
-                "677c974e.f259e8",\r
-                "13083344.02e945"\r
+                "7269ea10.8ecaa4",\r
+                "518c2c34.9a6a14",\r
+                "d42c62ff.6bda7"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ea580b2d.a2b9d",\r
+        "id": "7269ea10.8ecaa4",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 994,\r
-        "y": 328,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 966,\r
+        "y": 326,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             [\r
-                "a02387a9.ce5868"\r
+                "8e953b49.9b6fc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "677c974e.f259e8",\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": 1003.490966796875,\r
-        "y": 370.57403564453125,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 975.490966796875,\r
+        "y": 368.57403564453125,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             [\r
-                "620a8e19.7969b8"\r
+                "bbd8fc13.968688"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "13083344.02e945",\r
+        "id": "d42c62ff.6bda7",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 992,\r
-        "y": 417,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 964,\r
+        "y": 415,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             [\r
-                "ee25c1ac.70f318"\r
+                "67ddbb99.6b0b84"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "620a8e19.7969b8",\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": 1157.0623779296875,\r
-        "y": 373.8597717285156,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 1129.0623779296875,\r
+        "y": 371.8597717285156,\r
+        "z": "973adb8c.e1e518",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ee25c1ac.70f318",\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": 1161,\r
-        "y": 418,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 1133,\r
+        "y": 416,\r
+        "z": "973adb8c.e1e518",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a02387a9.ce5868",\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": 1191,\r
-        "y": 324,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 1163,\r
+        "y": 322,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             [\r
-                "17bf0063.d6585"\r
+                "7bc604b0.a688bc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "17bf0063.d6585",\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": 1414.33349609375,\r
-        "y": 323.99993896484375,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 1386.33349609375,\r
+        "y": 321.99993896484375,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             [\r
-                "c3612b80.a84938"\r
+                "5063b203.704cc4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c3612b80.a84938",\r
+        "id": "5063b203.704cc4",\r
         "type": "outcome",\r
         "name": "connectivity",\r
         "xml": "<outcome value='connectivity'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1615.0001335144043,\r
-        "y": 325.00002098083496,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 1587.0001335144043,\r
+        "y": 323.00002098083496,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             [\r
-                "7884e617.49647"\r
+                "a9f2d74.cd545a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fc546f71.cb3e18",\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": 741,\r
-        "y": 338,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 713,\r
+        "y": 336,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "7884e617.49647",\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": 1853,\r
-        "y": 327,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 1825,\r
+        "y": 325,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             [\r
-                "d6ce182b.31b988",\r
-                "aa98166f.4a5d48",\r
-                "6c3ef06d.2c8af8"\r
+                "7c83a2e6.7b4dd4",\r
+                "a7cc478b.7d146",\r
+                "a8bc27c3.c77fc8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d6ce182b.31b988",\r
+        "id": "7c83a2e6.7b4dd4",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2061,\r
-        "y": 291,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 2033,\r
+        "y": 289,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             [\r
-                "f5ad0f9a.63e04"\r
+                "9d15862c.acb858"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "aa98166f.4a5d48",\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": 2061.490966796875,\r
-        "y": 336.57403564453125,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 2033.490966796875,\r
+        "y": 334.57403564453125,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             [\r
-                "8c465bb9.ef2cc8"\r
+                "c922168b.4d46c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6c3ef06d.2c8af8",\r
+        "id": "a8bc27c3.c77fc8",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2059,\r
-        "y": 380,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 2031,\r
+        "y": 378,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             [\r
-                "63631469.f6833c"\r
+                "b9e1cde3.aaa95"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8c465bb9.ef2cc8",\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": 2224.0623779296875,\r
-        "y": 336.8597717285156,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 2196.0623779296875,\r
+        "y": 334.8597717285156,\r
+        "z": "973adb8c.e1e518",\r
         "wires": []\r
     },\r
     {\r
-        "id": "63631469.f6833c",\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": 2228,\r
-        "y": 381,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 2200,\r
+        "y": 379,\r
+        "z": "973adb8c.e1e518",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b3f0264f.4b3ab",\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": 2534,\r
-        "y": 380,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 2506,\r
+        "y": 378,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             [\r
-                "b834bb7a.d792e",\r
-                "1e7aae42.a3c8e2",\r
-                "2a5354ed.3760dc"\r
+                "18102e44.c2508a",\r
+                "21816052.be64e8",\r
+                "241de628.b25112"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "86694c65.1bab48",\r
+        "id": "93757346.0f3e2",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2918,\r
-        "y": 380,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 2890,\r
+        "y": 378,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             [\r
-                "a6c81dc0.f9e978",\r
-                "23f1ef20.aa22c8",\r
-                "d80ddf6.5239ba",\r
-                "a14e9d29.27087"\r
+                "77e4f011.15fc4",\r
+                "2c86ef39.d526a",\r
+                "76429f4b.07b2a8",\r
+                "6cc7e2bb.560604"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b834bb7a.d792e",\r
+        "id": "18102e44.c2508a",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2745,\r
-        "y": 382,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 2717,\r
+        "y": 380,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             [\r
-                "86694c65.1bab48"\r
+                "93757346.0f3e2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1e7aae42.a3c8e2",\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": 2745.490966796875,\r
-        "y": 427.57403564453125,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 2717.490966796875,\r
+        "y": 425.57403564453125,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             [\r
-                "6a176f0f.10d98"\r
+                "f6b9e29.dd4472"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2a5354ed.3760dc",\r
+        "id": "241de628.b25112",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2743,\r
-        "y": 471,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 2715,\r
+        "y": 469,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             [\r
-                "2cad2870.f6f2f"\r
+                "d2d6733.abb0d9"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2cad2870.f6f2f",\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": 2910,\r
-        "y": 470,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 2882,\r
+        "y": 468,\r
+        "z": "973adb8c.e1e518",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6a176f0f.10d98",\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": 2908.0623779296875,\r
-        "y": 427.8597717285156,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 2880.0623779296875,\r
+        "y": 425.8597717285156,\r
+        "z": "973adb8c.e1e518",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f5ad0f9a.63e04",\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": 2262,\r
-        "y": 286,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 2234,\r
+        "y": 284,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             [\r
-                "1569ccc.fe523b3"\r
+                "732b4cc0.91b37c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1569ccc.fe523b3",\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": 2467,\r
-        "y": 286,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 2439,\r
+        "y": 284,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             [\r
-                "419949a6.57988"\r
+                "cb7e44a7.8a59"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "419949a6.57988",\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": 2633,\r
-        "y": 286,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 2605,\r
+        "y": 284,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             [\r
-                "da248b6f.863148"\r
+                "3789a9eb.0ef24e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "da248b6f.863148",\r
+        "id": "3789a9eb.0ef24e",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2796,\r
-        "y": 286,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 2768,\r
+        "y": 284,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             [\r
-                "b3f0264f.4b3ab"\r
+                "2b1e22a1.17a9f6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a6c81dc0.f9e978",\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": 3133,\r
-        "y": 90,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 3105,\r
+        "y": 88,\r
+        "z": "973adb8c.e1e518",\r
         "wires": []\r
     },\r
     {\r
-        "id": "23f1ef20.aa22c8",\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": 3159,\r
-        "y": 207,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 3131,\r
+        "y": 205,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             [\r
-                "de4bc6aa.088c5",\r
-                "2b53e15d.dd21ae",\r
-                "ae35d78c.86b8"\r
+                "dca54f5.5973b3",\r
+                "fc504d63.ef84",\r
+                "13ebc65.3fdb33a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "de4bc6aa.088c5",\r
+        "id": "dca54f5.5973b3",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3354.5001220703125,\r
-        "y": 159,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 3326.5001220703125,\r
+        "y": 157,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             [\r
-                "9db55161.c57488"\r
+                "77882641.430388"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2b53e15d.dd21ae",\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": 3346.5001220703125,\r
-        "y": 214,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 3318.5001220703125,\r
+        "y": 212,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             [\r
-                "577df12f.4d35a8"\r
+                "a8ee2b92.3df2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9db55161.c57488",\r
+        "id": "77882641.430388",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3498.8824462890625,\r
-        "y": 158.65567016601562,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 3470.8824462890625,\r
+        "y": 156.65567016601562,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             [\r
-                "5d329fe.f531fe"\r
+                "cc921f58.3bd8b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5d329fe.f531fe",\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": 3683,\r
-        "y": 157,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 3655,\r
+        "y": 155,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             [\r
-                "b71d5fcd.e9cea"\r
+                "72a85062.4c34f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b71d5fcd.e9cea",\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": 3878,\r
-        "y": 157,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 3850,\r
+        "y": 155,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             [\r
-                "e408bf35.72655"\r
+                "2455d1ba.682ede"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ae35d78c.86b8",\r
+        "id": "13ebc65.3fdb33a",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3351.5001220703125,\r
-        "y": 271,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 3323.5001220703125,\r
+        "y": 269,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             [\r
-                "ee316bbc.ab53b8"\r
+                "5ec35efc.fc0da8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ee316bbc.ab53b8",\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": 3503.5001220703125,\r
-        "y": 272,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 3475.5001220703125,\r
+        "y": 270,\r
+        "z": "973adb8c.e1e518",\r
         "wires": []\r
     },\r
     {\r
-        "id": "577df12f.4d35a8",\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": 3514.5001220703125,\r
-        "y": 215,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 3486.5001220703125,\r
+        "y": 213,\r
+        "z": "973adb8c.e1e518",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c9c3e28f.63609",\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": 4466,\r
-        "y": 174,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 4438,\r
+        "y": 172,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             [\r
-                "3dd076cd.5c231a",\r
-                "c9f64ae8.35669",\r
-                "7381c16f.b370e"\r
+                "d6e555b3.ae89f8",\r
+                "ff096fed.6932c",\r
+                "507b0c57.90eac4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e8fac782.8b4fb",\r
+        "id": "e8e1d1d2.3bd27",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 4260,\r
-        "y": 161,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 4232,\r
+        "y": 159,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             [\r
-                "66c06218.223abc",\r
-                "c9c3e28f.63609",\r
-                "8fb6a8ce.c9f538"\r
+                "984b6b80.85eb28",\r
+                "c867d9b4.e35b28",\r
+                "ad75bc9f.423928"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "66c06218.223abc",\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": 4496,\r
-        "y": 122,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 4468,\r
+        "y": 120,\r
+        "z": "973adb8c.e1e518",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3dd076cd.5c231a",\r
+        "id": "d6e555b3.ae89f8",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4676,\r
-        "y": 165,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 4648,\r
+        "y": 163,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             [\r
-                "ffc56656.084b18"\r
+                "c77140eb.28cae"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c9f64ae8.35669",\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": 4668,\r
-        "y": 220,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 4640,\r
+        "y": 218,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             [\r
-                "df0df27a.a48ca"\r
+                "398208f1.a535d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7381c16f.b370e",\r
+        "id": "507b0c57.90eac4",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4673,\r
-        "y": 277,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 4645,\r
+        "y": 275,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             [\r
-                "1cc1a486.bc1f73"\r
+                "5db92f44.b3b368"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1cc1a486.bc1f73",\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": 4825,\r
-        "y": 278,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 4797,\r
+        "y": 276,\r
+        "z": "973adb8c.e1e518",\r
         "wires": []\r
     },\r
     {\r
-        "id": "df0df27a.a48ca",\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": 4836,\r
-        "y": 223,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 4808,\r
+        "y": 221,\r
+        "z": "973adb8c.e1e518",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ffc56656.084b18",\r
+        "id": "c77140eb.28cae",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4820.38232421875,\r
-        "y": 162.65567016601562,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 4792.38232421875,\r
+        "y": 160.65567016601562,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             [\r
-                "f9ba3b0e.b3dbd8"\r
+                "a91b7f99.6e2d28"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e408bf35.72655",\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": 4081,\r
-        "y": 161,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 4053,\r
+        "y": 159,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             [\r
-                "e8fac782.8b4fb"\r
+                "e8e1d1d2.3bd27"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f9ba3b0e.b3dbd8",\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": 5035,\r
-        "y": 159,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 5007,\r
+        "y": 157,\r
+        "z": "973adb8c.e1e518",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8fb6a8ce.c9f538",\r
+        "id": "ad75bc9f.423928",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
-        "x": 4416,\r
-        "y": 238,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 4388,\r
+        "y": 236,\r
+        "z": "973adb8c.e1e518",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d80ddf6.5239ba",\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.connectivity-id`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<!--<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.aai.connectivity.etht-svc-name`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<!--<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3289,\r
-        "y": 602,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 3766,\r
+        "y": 585,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             [\r
-                "56ef2c2f.bde334",\r
-                "20356ae6.118a76"\r
+                "b8398bf9.b49e9",\r
+                "27d2dbd5.61793c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "56ef2c2f.bde334",\r
+        "id": "b8398bf9.b49e9",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3635.5,\r
-        "y": 595,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 4112.5,\r
+        "y": 578,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             [\r
-                "45e55581.afe784"\r
+                "3e628567.b7364a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "20356ae6.118a76",\r
+        "id": "27d2dbd5.61793c",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3639.5,\r
-        "y": 635,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 4116.5,\r
+        "y": 618,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             [\r
-                "b4e6443a.f1c248"\r
+                "7168ea95.0ebd84"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b4e6443a.f1c248",\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": 3797,\r
-        "y": 635,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 4274,\r
+        "y": 618,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             [\r
-                "f2316450.62431",\r
-                "6c3e1e17.47ccd8"\r
+                "f83800f1.842c8",\r
+                "f7f5fb91.6043d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "45e55581.afe784",\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": 3793.5,\r
-        "y": 595,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 4270.5,\r
+        "y": 578,\r
+        "z": "973adb8c.e1e518",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f2316450.62431",\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-id`' />\n\n<parameter name='operational-status' value='Deactivated' />\n",\r
+        "name": "update vpn-binding resource (aka. OTN domainA) in AAI",\r
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-binding.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-binding.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-binding.vpn-name`' />\n\n<parameter name='operational-status' value='Deactivated' />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4125.5,\r
-        "y": 635,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 4602.5,\r
+        "y": 618,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "6c3e1e17.47ccd8",\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": 4052.5,\r
-        "y": 681,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 4529.5,\r
+        "y": 664,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "a14e9d29.27087",\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-id`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<!--<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-otn-src-domain-creation.templatefile`\" />-->\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-te:te/tunnels/tunnel=' + $tmp.aai.vpn-binding.vpn-name`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3262,\r
-        "y": 474,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 3234,\r
+        "y": 472,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             [\r
-                "692cf34e.ccecdc",\r
-                "64e95b5b.03211c"\r
+                "a5d8b39e.03bbe",\r
+                "dd9b666a.742b78"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "692cf34e.ccecdc",\r
+        "id": "a5d8b39e.03bbe",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3594.5,\r
-        "y": 444,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 3566.5,\r
+        "y": 442,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             [\r
-                "8f4d555e.2bf24"\r
+                "2667a800.f5f9"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "64e95b5b.03211c",\r
+        "id": "dd9b666a.742b78",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3599.5,\r
-        "y": 509,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 3571.5,\r
+        "y": 507,\r
+        "z": "973adb8c.e1e518",\r
         "wires": [\r
             [\r
-                "deb2a97d.a041c8"\r
+                "91bc4eb8.d42b1"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8f4d555e.2bf24",\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": 3770.5,\r
-        "y": 444,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 3742.5,\r
+        "y": 442,\r
+        "z": "973adb8c.e1e518",\r
         "wires": []\r
     },\r
     {\r
-        "id": "deb2a97d.a041c8",\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": 3766,\r
-        "y": 509,\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