Supporting 3 or more network domains for Transport Slicing use case.
[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..594c381 100644 (file)
@@ -1,20 +1,20 @@
 [\r
     {\r
-        "id": "5242e55f.2660bc",\r
+        "id": "35adbdc5.188712",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 165,\r
-        "y": 89,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 151,\r
+        "y": 71,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             [\r
-                "a94d71b7.2c2048"\r
+                "4297efa6.c41f88"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a94d71b7.2c2048",\r
+        "id": "4297efa6.c41f88",\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": 282.2856903076172,\r
+        "y": 120.23810863494873,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             [\r
-                "aa153b53.66c418"\r
+                "2ad96203.21cf3e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "aa153b53.66c418",\r
+        "id": "2ad96203.21cf3e",\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": 285.4286193847656,\r
+        "y": 205.00003242492676,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             [\r
-                "76657765.41a798"\r
+                "c5e49e9b.1b684"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "76657765.41a798",\r
+        "id": "c5e49e9b.1b684",\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": 435.238037109375,\r
+        "y": 334.6666564941406,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             [\r
-                "72f9366e.3a99d8",\r
-                "680f29c8.59cd3",\r
-                "fc546f71.cb3e18"\r
+                "10e90581.65923a",\r
+                "8d427e09.40c998",\r
+                "2dc96b18.12e1c4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "72f9366e.3a99d8",\r
+        "id": "10e90581.65923a",\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": 709.5716552734375,\r
+        "y": 601.59716796875,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "af064a7b.44da3",\r
+        "id": "dce41eb4.903f08",\r
         "type": "comment",\r
         "name": "new for TransportSlicing",\r
         "info": "",\r
         "comments": "",\r
-        "x": 755,\r
-        "y": 294,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 741,\r
+        "y": 276,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "680f29c8.59cd3",\r
+        "id": "8d427e09.40c998",\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": 761,\r
+        "y": 372,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             [\r
-                "ea580b2d.a2b9d",\r
-                "677c974e.f259e8",\r
-                "13083344.02e945"\r
+                "97ab3694.d0f87",\r
+                "60789fd.ed86ae",\r
+                "353d8e4b.1a199a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ea580b2d.a2b9d",\r
+        "id": "97ab3694.d0f87",\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": 980,\r
+        "y": 310,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             [\r
-                "a02387a9.ce5868"\r
+                "8832c029.be5808"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "677c974e.f259e8",\r
+        "id": "60789fd.ed86ae",\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": 989.490966796875,\r
+        "y": 352.57403564453125,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             [\r
-                "620a8e19.7969b8"\r
+                "2dd666f1.60f502"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "13083344.02e945",\r
+        "id": "353d8e4b.1a199a",\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": 978,\r
+        "y": 399,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             [\r
-                "ee25c1ac.70f318"\r
+                "2d743c83.0345fc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "620a8e19.7969b8",\r
+        "id": "2dd666f1.60f502",\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": 1143.0623779296875,\r
+        "y": 355.8597717285156,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ee25c1ac.70f318",\r
+        "id": "2d743c83.0345fc",\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": 1147,\r
+        "y": 400,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a02387a9.ce5868",\r
+        "id": "8832c029.be5808",\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": 1177,\r
+        "y": 306,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             [\r
-                "17bf0063.d6585"\r
+                "16acb367.7a1ddd"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "17bf0063.d6585",\r
+        "id": "16acb367.7a1ddd",\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": 1400.33349609375,\r
+        "y": 305.99993896484375,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             [\r
-                "c3612b80.a84938"\r
+                "a7a6102a.ba70f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c3612b80.a84938",\r
+        "id": "a7a6102a.ba70f",\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": 1601.0001335144043,\r
+        "y": 307.00002098083496,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             [\r
-                "7884e617.49647"\r
+                "792a8c98.1e353c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fc546f71.cb3e18",\r
+        "id": "2dc96b18.12e1c4",\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": 727,\r
+        "y": 320,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "7884e617.49647",\r
+        "id": "792a8c98.1e353c",\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": 1839,\r
+        "y": 309,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             [\r
-                "d6ce182b.31b988",\r
-                "aa98166f.4a5d48",\r
-                "6c3ef06d.2c8af8"\r
+                "e0088aed.90cab8",\r
+                "1c511732.20d971",\r
+                "948f74b1.a9b47"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d6ce182b.31b988",\r
+        "id": "e0088aed.90cab8",\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": 2047,\r
+        "y": 273,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             [\r
-                "f5ad0f9a.63e04"\r
+                "a90c3215.92b4f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "aa98166f.4a5d48",\r
+        "id": "1c511732.20d971",\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": 2047.490966796875,\r
+        "y": 318.57403564453125,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             [\r
-                "8c465bb9.ef2cc8"\r
+                "4591cc1.5281eb4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6c3ef06d.2c8af8",\r
+        "id": "948f74b1.a9b47",\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": 2045,\r
+        "y": 362,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             [\r
-                "63631469.f6833c"\r
+                "1ba65af4.0c86f5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8c465bb9.ef2cc8",\r
+        "id": "4591cc1.5281eb4",\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": 2210.0623779296875,\r
+        "y": 318.8597717285156,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "63631469.f6833c",\r
+        "id": "1ba65af4.0c86f5",\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": 2214,\r
+        "y": 363,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b3f0264f.4b3ab",\r
+        "id": "782d486c.7b38a",\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": 2520,\r
+        "y": 362,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             [\r
-                "b834bb7a.d792e",\r
-                "1e7aae42.a3c8e2",\r
-                "2a5354ed.3760dc"\r
+                "15707889.fb5fe7",\r
+                "3ccb184b.88e97",\r
+                "5e6c2e34.e2f08"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "86694c65.1bab48",\r
+        "id": "d4d2edf0.a9661",\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": 2904,\r
+        "y": 362,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             [\r
-                "a6c81dc0.f9e978",\r
-                "23f1ef20.aa22c8",\r
-                "d80ddf6.5239ba",\r
-                "a14e9d29.27087"\r
+                "c5e1a2b5.98a7e",\r
+                "2ecd6ddc.b6312a",\r
+                "ac181d39.64071",\r
+                "31912d21.99f9da"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b834bb7a.d792e",\r
+        "id": "15707889.fb5fe7",\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": 2731,\r
+        "y": 364,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             [\r
-                "86694c65.1bab48"\r
+                "d4d2edf0.a9661"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1e7aae42.a3c8e2",\r
+        "id": "3ccb184b.88e97",\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": 2731.490966796875,\r
+        "y": 409.57403564453125,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             [\r
-                "6a176f0f.10d98"\r
+                "3858d983.a7895e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2a5354ed.3760dc",\r
+        "id": "5e6c2e34.e2f08",\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": 2729,\r
+        "y": 453,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             [\r
-                "2cad2870.f6f2f"\r
+                "399a5685.b9c2da"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2cad2870.f6f2f",\r
+        "id": "399a5685.b9c2da",\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": 2896,\r
+        "y": 452,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6a176f0f.10d98",\r
+        "id": "3858d983.a7895e",\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": 2894.0623779296875,\r
+        "y": 409.8597717285156,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f5ad0f9a.63e04",\r
+        "id": "a90c3215.92b4f8",\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": 2248,\r
+        "y": 268,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             [\r
-                "1569ccc.fe523b3"\r
+                "3cc76d7e.6842ea"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1569ccc.fe523b3",\r
+        "id": "3cc76d7e.6842ea",\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": 2453,\r
+        "y": 268,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             [\r
-                "419949a6.57988"\r
+                "ff010487.c79c18"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "419949a6.57988",\r
+        "id": "ff010487.c79c18",\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": 2619,\r
+        "y": 268,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             [\r
-                "da248b6f.863148"\r
+                "157282a.839557d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "da248b6f.863148",\r
+        "id": "157282a.839557d",\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": 2782,\r
+        "y": 268,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             [\r
-                "b3f0264f.4b3ab"\r
+                "782d486c.7b38a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a6c81dc0.f9e978",\r
+        "id": "c5e1a2b5.98a7e",\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": 3119,\r
+        "y": 72,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "23f1ef20.aa22c8",\r
+        "id": "2ecd6ddc.b6312a",\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": 3145,\r
+        "y": 189,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             [\r
-                "de4bc6aa.088c5",\r
-                "2b53e15d.dd21ae",\r
-                "ae35d78c.86b8"\r
+                "ca0e4afa.297db8",\r
+                "cbb19a06.cce2d",\r
+                "10037902.a01617"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "de4bc6aa.088c5",\r
+        "id": "ca0e4afa.297db8",\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": 3340.5001220703125,\r
+        "y": 141,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             [\r
-                "9db55161.c57488"\r
+                "82598cca.05691"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2b53e15d.dd21ae",\r
+        "id": "cbb19a06.cce2d",\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": 3332.5001220703125,\r
+        "y": 196,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             [\r
-                "577df12f.4d35a8"\r
+                "3a772cbc.39a31c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9db55161.c57488",\r
+        "id": "82598cca.05691",\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": 3484.8824462890625,\r
+        "y": 140.65567016601562,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             [\r
-                "5d329fe.f531fe"\r
+                "b1b02bec.6d78a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5d329fe.f531fe",\r
+        "id": "b1b02bec.6d78a8",\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": 3669,\r
+        "y": 139,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             [\r
-                "b71d5fcd.e9cea"\r
+                "cda97533.ab0b4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b71d5fcd.e9cea",\r
+        "id": "cda97533.ab0b4",\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": 3864,\r
+        "y": 139,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             [\r
-                "e408bf35.72655"\r
+                "60c8c7.3864ef38"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ae35d78c.86b8",\r
+        "id": "10037902.a01617",\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": 3337.5001220703125,\r
+        "y": 253,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             [\r
-                "ee316bbc.ab53b8"\r
+                "cae2235d.64e0e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ee316bbc.ab53b8",\r
+        "id": "cae2235d.64e0e8",\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": 3489.5001220703125,\r
+        "y": 254,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "577df12f.4d35a8",\r
+        "id": "3a772cbc.39a31c",\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": 3500.5001220703125,\r
+        "y": 197,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c9c3e28f.63609",\r
+        "id": "3932cb1e.2bf12c",\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": 4452,\r
+        "y": 156,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             [\r
-                "3dd076cd.5c231a",\r
-                "c9f64ae8.35669",\r
-                "7381c16f.b370e"\r
+                "df685905.e165b",\r
+                "98483c83.1f67f",\r
+                "34f5861b.c6c222"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e8fac782.8b4fb",\r
+        "id": "9b3be3e2.33ea88",\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": 4246,\r
+        "y": 143,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             [\r
-                "66c06218.223abc",\r
-                "c9c3e28f.63609",\r
-                "8fb6a8ce.c9f538"\r
+                "8f73936e.04261",\r
+                "3932cb1e.2bf12c",\r
+                "dea89443.748068"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "66c06218.223abc",\r
+        "id": "8f73936e.04261",\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": 4482,\r
+        "y": 104,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3dd076cd.5c231a",\r
+        "id": "df685905.e165b",\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": 4662,\r
+        "y": 147,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             [\r
-                "ffc56656.084b18"\r
+                "6f3db9ae.c9f3c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c9f64ae8.35669",\r
+        "id": "98483c83.1f67f",\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": 4654,\r
+        "y": 202,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             [\r
-                "df0df27a.a48ca"\r
+                "deb93f9d.19a93"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7381c16f.b370e",\r
+        "id": "34f5861b.c6c222",\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": 4659,\r
+        "y": 259,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             [\r
-                "1cc1a486.bc1f73"\r
+                "e2596edd.60dea"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1cc1a486.bc1f73",\r
+        "id": "e2596edd.60dea",\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": 4811,\r
+        "y": 260,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "df0df27a.a48ca",\r
+        "id": "deb93f9d.19a93",\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": 4822,\r
+        "y": 205,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ffc56656.084b18",\r
+        "id": "6f3db9ae.c9f3c",\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": 4806.38232421875,\r
+        "y": 144.65567016601562,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             [\r
-                "f9ba3b0e.b3dbd8"\r
+                "ba0d3a6b.6f8058"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e408bf35.72655",\r
+        "id": "60c8c7.3864ef38",\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": 4067,\r
+        "y": 143,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             [\r
-                "e8fac782.8b4fb"\r
+                "9b3be3e2.33ea88"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f9ba3b0e.b3dbd8",\r
+        "id": "ba0d3a6b.6f8058",\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": 5021,\r
+        "y": 141,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8fb6a8ce.c9f538",\r
+        "id": "dea89443.748068",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
-        "x": 4416,\r
-        "y": 238,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 4402,\r
+        "y": 220,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d80ddf6.5239ba",\r
+        "id": "ebf8dd2b.b4f9e8",\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": 3780,\r
+        "y": 569,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             [\r
-                "56ef2c2f.bde334",\r
-                "20356ae6.118a76"\r
+                "aec92995.7e9f5",\r
+                "4c597ddc.e2cc64"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "56ef2c2f.bde334",\r
+        "id": "aec92995.7e9f5",\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": 4126.5,\r
+        "y": 562,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             [\r
-                "45e55581.afe784"\r
+                "1a195df1.8c796a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "20356ae6.118a76",\r
+        "id": "4c597ddc.e2cc64",\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": 4130.5,\r
+        "y": 602,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             [\r
-                "b4e6443a.f1c248"\r
+                "5902bc86.ae718c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b4e6443a.f1c248",\r
+        "id": "5902bc86.ae718c",\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": 4288,\r
+        "y": 602,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             [\r
-                "f2316450.62431",\r
-                "6c3e1e17.47ccd8"\r
+                "a5eabc9d.2ead",\r
+                "845fd62d.b8a278"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "45e55581.afe784",\r
+        "id": "1a195df1.8c796a",\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": 4284.5,\r
+        "y": 562,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f2316450.62431",\r
+        "id": "a5eabc9d.2ead",\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": 4616.5,\r
+        "y": 602,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "6c3e1e17.47ccd8",\r
+        "id": "845fd62d.b8a278",\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": 4543.5,\r
+        "y": 648,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "a14e9d29.27087",\r
+        "id": "ac181d39.64071",\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": 3248,\r
+        "y": 456,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             [\r
-                "692cf34e.ccecdc",\r
-                "64e95b5b.03211c"\r
+                "2d9a43b7.aafd44",\r
+                "70183a3.2a6c244"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "692cf34e.ccecdc",\r
+        "id": "2d9a43b7.aafd44",\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": 3580.5,\r
+        "y": 426,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             [\r
-                "8f4d555e.2bf24"\r
+                "2ca3b71b.283058"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "64e95b5b.03211c",\r
+        "id": "70183a3.2a6c244",\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": 3585.5,\r
+        "y": 491,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             [\r
-                "deb2a97d.a041c8"\r
+                "7560af7d.2c0028"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8f4d555e.2bf24",\r
+        "id": "2ca3b71b.283058",\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": 3756.5,\r
+        "y": 426,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "deb2a97d.a041c8",\r
+        "id": "7560af7d.2c0028",\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": 3752,\r
+        "y": 491,\r
+        "z": "429f9ba7.310ba4",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "31912d21.99f9da",\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": 3186,\r
+        "y": 591,\r
+        "z": "429f9ba7.310ba4",\r
+        "wires": [\r
+            [\r
+                "8e1bec91.730a68",\r
+                "6d4b827f.139444"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "6d4b827f.139444",\r
+        "type": "other",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3439,\r
+        "y": 569,\r
+        "z": "429f9ba7.310ba4",\r
+        "wires": [\r
+            [\r
+                "ebf8dd2b.b4f9e8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "8e1bec91.730a68",\r
+        "type": "outcome",\r
+        "name": "Null",\r
+        "xml": "<outcome value=''>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3439,\r
+        "y": 625,\r
+        "z": "429f9ba7.310ba4",\r
         "wires": [\r
             []\r
         ]\r