- Support for the Transport Slicing use-case to work with the updated YANG models
[sdnc/oam.git] / platform-logic / generic-resource-api / src / main / json / trans_slicing / GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-deactivate.json
index ff94831..c9a977f 100644 (file)
@@ -1,20 +1,20 @@
 [\r
     {\r
-        "id": "9eb0ec9b.ca633",\r
+        "id": "7987293a.445a38",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 136,\r
-        "y": 74,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 167.75,\r
+        "y": 154,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             [\r
-                "a6f9d5f0.04d6"\r
+                "45444450.d7f6dc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a6f9d5f0.04d6",\r
+        "id": "45444450.d7f6dc",\r
         "type": "service-logic",\r
         "name": "GENERIC-RESOURCE-API ${project.version}",\r
         "module": "GENERIC-RESOURCE-API",\r
         "comments": "",\r
         "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",\r
         "outputs": 1,\r
-        "x": 267.2856903076172,\r
-        "y": 123.23810863494873,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 299.0356903076172,\r
+        "y": 203.23810863494873,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             [\r
-                "3b0030c5.3e837"\r
+                "ae3ab411.371d58"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3b0030c5.3e837",\r
+        "id": "ae3ab411.371d58",\r
         "type": "method",\r
         "name": "method tsli-vnf-topology-operation-trans-slice-deactivate",\r
         "xml": "<method rpc='tsli-vnf-topology-operation-trans-slice-deactivate' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 270.4286193847656,\r
-        "y": 208.00003242492676,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 302.1786193847656,\r
+        "y": 288.00003242492676,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             [\r
-                "4b63b8a8.77bb4"\r
+                "d12b8d84.55791"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4b63b8a8.77bb4",\r
+        "id": "d12b8d84.55791",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 420.238037109375,\r
-        "y": 337.6666564941406,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 451.988037109375,\r
+        "y": 417.6666564941406,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             [\r
-                "33834047.03c2f8",\r
-                "eaadc174.02e71",\r
-                "ce0777fc.b60f2"\r
+                "1c123ec2.4b5549",\r
+                "134fd372.6771b5",\r
+                "ab4d5dd1.8ac7f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "33834047.03c2f8",\r
+        "id": "1c123ec2.4b5549",\r
         "type": "returnSuccess",\r
         "name": "return success",\r
         "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",\r
         "comments": "",\r
-        "x": 694.5716552734375,\r
-        "y": 604.59716796875,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 726.3216552734375,\r
+        "y": 684.59716796875,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "39c1d7dd.5e2018",\r
+        "id": "901e34f6.602458",\r
         "type": "comment",\r
         "name": "new for TransportSlicing",\r
         "info": "",\r
         "comments": "",\r
-        "x": 726,\r
-        "y": 279,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 757.75,\r
+        "y": 359,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "eaadc174.02e71",\r
+        "id": "134fd372.6771b5",\r
         "type": "save",\r
         "name": "get service-instance from aai",\r
         "xml": "<!--<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" -->\n<!--\tresource=\"service-instance\"-->\n<!--\tkey='service-instance.service-instance-id = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.service-instance-id-->\n<!--         AND customer.global-customer-id = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.global-customer-id -->\n<!--         AND service-subscription.service-type = $service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.subscription-service-type'-->\n<!--\tlocal-only=\"false\"-->\n<!--\tforce=\"true\" pfx=\"tmp.aai.service-instance\">-->\n\n<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"service-instance\"\n\tkey='service-instance.service-instance-id = $vnf-topology-operation-input.service-information.service-instance-id\n         AND customer.global-customer-id = $vnf-topology-operation-input.service-information.global-customer-id \n         AND service-subscription.service-type = $vnf-topology-operation-input.service-information.subscription-service-type'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.service-instance\">\n\n\n<!--vnf-topology-operation-input.service-information.service-instance-id-->",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 746,\r
-        "y": 375,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 777.75,\r
+        "y": 455,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             [\r
-                "def73660.f1599",\r
-                "7ca16f67.a19498",\r
-                "6d28513b.423be8"\r
+                "2d1d6b25.d0297c",\r
+                "507ea16f.c4686",\r
+                "afd8f070.eec4e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "def73660.f1599",\r
+        "id": "2d1d6b25.d0297c",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 965,\r
-        "y": 313,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 996.75,\r
+        "y": 393,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             [\r
-                "5c5bc497.c1130c"\r
+                "97138a32.2f3f5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7ca16f67.a19498",\r
+        "id": "507ea16f.c4686",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 974.490966796875,\r
-        "y": 355.57403564453125,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 1006.240966796875,\r
+        "y": 435.57403564453125,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             [\r
-                "3202281d.474eb8"\r
+                "888faa2.34cabd8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6d28513b.423be8",\r
+        "id": "afd8f070.eec4e8",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 963,\r
-        "y": 402,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 994.75,\r
+        "y": 482,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             [\r
-                "a1d5aff9.d75b68"\r
+                "50c527ec.505a7"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3202281d.474eb8",\r
+        "id": "888faa2.34cabd8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
         "comments": "",\r
-        "x": 1128.0623779296875,\r
-        "y": 358.8597717285156,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 1159.8123779296875,\r
+        "y": 438.8597717285156,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a1d5aff9.d75b68",\r
+        "id": "50c527ec.505a7",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
-        "x": 1132,\r
-        "y": 403,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 1163.75,\r
+        "y": 483,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5c5bc497.c1130c",\r
+        "id": "97138a32.2f3f5",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for index='rel-index' start='0' end='`$tmp.aai.service-instance.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1162,\r
-        "y": 309,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 1193.75,\r
+        "y": 389,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             [\r
-                "b3c4b504.2321f"\r
+                "73002c56.e20dcc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b3c4b504.2321f",\r
+        "id": "73002c56.e20dcc",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.service-instance.relationship-list.relationship[$rel-index].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1385.33349609375,\r
-        "y": 308.99993896484375,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 1417.08349609375,\r
+        "y": 388.99993896484375,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             [\r
-                "2c61dbe.2d462a4"\r
+                "f5ce1b9b.6f43c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2c61dbe.2d462a4",\r
+        "id": "f5ce1b9b.6f43c",\r
         "type": "outcome",\r
         "name": "connectivity",\r
         "xml": "<outcome value='connectivity'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1586.0001335144043,\r
-        "y": 310.00002098083496,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 1617.7501335144043,\r
+        "y": 390.00002098083496,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             [\r
-                "8cb99e8e.6d2cc"\r
+                "5b31678.585da18"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ce0777fc.b60f2",\r
+        "id": "ab4d5dd1.8ac7f",\r
         "type": "execute",\r
         "name": "execute properties",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.prop.PropertiesNode' method='readProperties' >\n    <parameter name='fileName' value='%SDNC_CONFIG_DIR%/generic-resource-api-dg.properties' />\n    <parameter name='contextPrefix' value='prop' />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 712,\r
-        "y": 323,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 743.75,\r
+        "y": 403,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "8cb99e8e.6d2cc",\r
+        "id": "5b31678.585da18",\r
         "type": "save",\r
         "name": "get connectivity from aai",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"connectivity\"\n\t    key=\"connectivity.connectivity-id = $tmp.aai.service-instance.relationship-list.relationship[$rel-index].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.connectivity\" >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1824,\r
-        "y": 312,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 1855.75,\r
+        "y": 392,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             [\r
-                "e48909d7.1167",\r
-                "9d9cf2b9.138cc",\r
-                "c57bdede.c607a8"\r
+                "7e6bd44c.4a0d84",\r
+                "3c965ca8.a0aa94",\r
+                "a01cc737.c0329"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e48909d7.1167",\r
+        "id": "7e6bd44c.4a0d84",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2032,\r
-        "y": 276,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 2063.75,\r
+        "y": 356,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             [\r
-                "7447d3b7.3d9674"\r
+                "acdeaad5.a6cc1"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9d9cf2b9.138cc",\r
+        "id": "3c965ca8.a0aa94",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2032.490966796875,\r
-        "y": 321.57403564453125,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 2064.240966796875,\r
+        "y": 401.57403564453125,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             [\r
-                "c3f91382.355d78"\r
+                "905f7b79.76f648"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c57bdede.c607a8",\r
+        "id": "a01cc737.c0329",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2030,\r
-        "y": 365,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 2061.75,\r
+        "y": 445,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             [\r
-                "8f45128e.10469"\r
+                "76441f4c.a06df"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c3f91382.355d78",\r
+        "id": "905f7b79.76f648",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
         "comments": "",\r
-        "x": 2195.0623779296875,\r
-        "y": 321.8597717285156,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 2226.8123779296875,\r
+        "y": 401.8597717285156,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8f45128e.10469",\r
+        "id": "76441f4c.a06df",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
-        "x": 2199,\r
-        "y": 366,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 2230.75,\r
+        "y": 446,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "eaa455f.69afea8",\r
+        "id": "40981562.d0dc0c",\r
         "type": "save",\r
         "name": "get vpn-binding from aai",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-binding\"\n\t    key=\"vpn-binding.vpn-id = $tmp.aai.connectivity.relationship-list.relationship[$cridx].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.vpn-binding\" >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2505,\r
-        "y": 365,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 2536.75,\r
+        "y": 445,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             [\r
-                "754a3f5.4e5d3c",\r
-                "563654a8.f8269c",\r
-                "49966192.933e3"\r
+                "b886e1a9.d43df",\r
+                "4c757dd3.2c3a1c",\r
+                "490d4ff6.7bfb2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "44a58adf.5965ac",\r
+        "id": "29ed7f6b.7ef5c",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2889,\r
-        "y": 365,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 2920.75,\r
+        "y": 445,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             [\r
-                "c9dc240e.1f5cf8",\r
-                "2f80a99a.2436ee",\r
-                "eb52e479.fabdf8",\r
-                "e64ba97a.ab16f8"\r
+                "dbce8d50.3a5c2",\r
+                "697b34e.12e544c",\r
+                "595bb85e.e54e8",\r
+                "e28e0e7a.57d778"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "754a3f5.4e5d3c",\r
+        "id": "b886e1a9.d43df",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2716,\r
-        "y": 367,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 2747.75,\r
+        "y": 447,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             [\r
-                "44a58adf.5965ac"\r
+                "29ed7f6b.7ef5c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "563654a8.f8269c",\r
+        "id": "4c757dd3.2c3a1c",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2716.490966796875,\r
-        "y": 412.57403564453125,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 2748.240966796875,\r
+        "y": 492.57403564453125,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             [\r
-                "8ffd54c7.1ceb58"\r
+                "cd02fceb.e80ee8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "49966192.933e3",\r
+        "id": "490d4ff6.7bfb2",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2714,\r
-        "y": 456,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 2745.75,\r
+        "y": 536,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             [\r
-                "1dfb3bfc.f80f24"\r
+                "10b6485e.f13c18"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1dfb3bfc.f80f24",\r
+        "id": "10b6485e.f13c18",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
-        "x": 2881,\r
-        "y": 455,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 2912.75,\r
+        "y": 535,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8ffd54c7.1ceb58",\r
+        "id": "cd02fceb.e80ee8",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
         "comments": "",\r
-        "x": 2879.0623779296875,\r
-        "y": 412.8597717285156,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 2910.8123779296875,\r
+        "y": 492.8597717285156,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7447d3b7.3d9674",\r
+        "id": "acdeaad5.a6cc1",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.connectivity.relationship-list.relationship_length`' >\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2233,\r
-        "y": 271,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 2264.75,\r
+        "y": 351,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             [\r
-                "80b48506.a5c978"\r
+                "590f481d.6deaf8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "80b48506.a5c978",\r
+        "id": "590f481d.6deaf8",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2438,\r
-        "y": 271,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 2469.75,\r
+        "y": 351,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             [\r
-                "36fdb5a2.702cb2"\r
+                "3e88a914.31d29e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "36fdb5a2.702cb2",\r
+        "id": "3e88a914.31d29e",\r
         "type": "outcome",\r
         "name": "vpn-binding",\r
         "xml": "<outcome value='vpn-binding'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2604,\r
-        "y": 271,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 2635.75,\r
+        "y": 351,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             [\r
-                "32e2ef12.2d28f8"\r
+                "d5611bfd.8b5ba8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "32e2ef12.2d28f8",\r
+        "id": "d5611bfd.8b5ba8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2767,\r
-        "y": 271,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 2798.75,\r
+        "y": 351,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             [\r
-                "eaa455f.69afea8"\r
+                "40981562.d0dc0c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c9dc240e.1f5cf8",\r
+        "id": "dbce8d50.3a5c2",\r
         "type": "set",\r
         "name": "set pnf-name",\r
         "xml": "<set>\n<parameter name='tmp.domain.pnf-name' value=\"`'networkId-providerId-' +\n                                                   $tmp.aai.vpn-binding.access-provider-id + '-clientId-' +\n                                                   $tmp.aai.vpn-binding.access-client-id + '-topologyId-' +\n                                                   $tmp.aai.vpn-binding.access-topology-id + '-nodeId-' +\n                                                   $tmp.aai.vpn-binding.src-access-node-id`\" />\n",\r
         "comments": "",\r
-        "x": 3104,\r
-        "y": 75,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 3135.75,\r
+        "y": 155,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2f80a99a.2436ee",\r
+        "id": "697b34e.12e544c",\r
         "type": "get-resource",\r
         "name": "get-resource src pnf",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $tmp.domain.pnf-name\"\n        pfx='tmp.aai.source-pnf' local-only='false' >\n\n        <!--AND depth = '0'\"-->\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3130,\r
-        "y": 192,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 3161.75,\r
+        "y": 272,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             [\r
-                "5dad328f.715b34",\r
-                "e3a6748e.a712d",\r
-                "e35e866f.df6d4"\r
+                "d00072ef.37f678",\r
+                "e25ba00b.85ab78",\r
+                "af08c977.c21ff8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5dad328f.715b34",\r
+        "id": "d00072ef.37f678",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3325.5001220703125,\r
-        "y": 144,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 3357.2501220703125,\r
+        "y": 224,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             [\r
-                "4d0c253f.a81e74"\r
+                "5add0fc2.e455a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e3a6748e.a712d",\r
+        "id": "e25ba00b.85ab78",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3317.5001220703125,\r
-        "y": 199,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 3349.2501220703125,\r
+        "y": 279,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             [\r
-                "b2cddf9.b286da"\r
+                "e5b74ae2.bf4d7"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4d0c253f.a81e74",\r
+        "id": "5add0fc2.e455a8",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3469.8824462890625,\r
-        "y": 143.65567016601562,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 3501.6324462890625,\r
+        "y": 223.65567016601562,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             [\r
-                "1f908e24.7ffb6a"\r
+                "7c91c82b.801f4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1f908e24.7ffb6a",\r
+        "id": "7c91c82b.801f4",\r
         "type": "for",\r
         "name": "for each relationship",\r
         "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3654,\r
-        "y": 142,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 3685.75,\r
+        "y": 222,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             [\r
-                "731e3134.cae0e8"\r
+                "40f3da44.52c9bc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "731e3134.cae0e8",\r
+        "id": "40f3da44.52c9bc",\r
         "type": "switchNode",\r
         "name": "switch related-to",\r
         "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3849,\r
-        "y": 142,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 3880.75,\r
+        "y": 222,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             [\r
-                "924b0e47.33623"\r
+                "ec33b794.fa679"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e35e866f.df6d4",\r
+        "id": "af08c977.c21ff8",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3322.5001220703125,\r
-        "y": 256,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 3354.2501220703125,\r
+        "y": 336,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             [\r
-                "96d892fb.bdb65"\r
+                "d0c572d6.450d98"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "96d892fb.bdb65",\r
+        "id": "d0c572d6.450d98",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 3474.5001220703125,\r
-        "y": 257,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 3506.2501220703125,\r
+        "y": 337,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b2cddf9.b286da",\r
+        "id": "e5b74ae2.bf4d7",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 3485.5001220703125,\r
-        "y": 200,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 3517.2501220703125,\r
+        "y": 280,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f5b1ba3f.53f16",\r
+        "id": "5f838eee.116ce",\r
         "type": "execute",\r
         "name": "get esr-thirdparty-sdnc",\r
         "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"esr-thirdparty-sdnc\" \n\t\tkey=\"esr-thirdparty-sdnc.thirdparty-sdnc-id = $tmp.domain.esr-thirdparty-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.domain.esr-thirdparty-sdnc' local-only='false' >",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4437,\r
-        "y": 159,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 4468.75,\r
+        "y": 239,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             [\r
-                "24a03be4.6f22dc",\r
-                "9afded7b.e0fd88",\r
-                "473aa7de.af209"\r
+                "50b81d5a.269cfc",\r
+                "baecba51.c84f4",\r
+                "3764c57a.2235a2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e5beadfa.65d4b",\r
+        "id": "c9bd9c8c.3dcca",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 4231,\r
-        "y": 146,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 4262.75,\r
+        "y": 226,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             [\r
-                "c8e5909.1b608f",\r
-                "f5b1ba3f.53f16",\r
-                "f37bd9fd.aaa8a8"\r
+                "df5cc029.1b2a68",\r
+                "5f838eee.116ce",\r
+                "7167c2a2.e60ca4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c8e5909.1b608f",\r
+        "id": "df5cc029.1b2a68",\r
         "type": "set",\r
         "name": "set esr-thirdparty-sdnc domain id",\r
         "xml": "<set>\n<parameter name='tmp.domain.esr-thirdparty-id' value=\"`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].relationship-data[0].relationship-value`\" />\n",\r
         "comments": "",\r
-        "x": 4467,\r
-        "y": 107,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 4498.75,\r
+        "y": 187,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "24a03be4.6f22dc",\r
+        "id": "50b81d5a.269cfc",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4647,\r
-        "y": 150,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 4678.75,\r
+        "y": 230,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             [\r
-                "d0a9d6e9.c56f4"\r
+                "cd3637d1.c154d8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9afded7b.e0fd88",\r
+        "id": "baecba51.c84f4",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4639,\r
-        "y": 205,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 4670.75,\r
+        "y": 285,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             [\r
-                "27cca76b.e2c508"\r
+                "47ed2855.6b69a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "473aa7de.af209",\r
+        "id": "3764c57a.2235a2",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4644,\r
-        "y": 262,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 4675.75,\r
+        "y": 342,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             [\r
-                "61a0060a.f22c2"\r
+                "c2dbfa93.1077a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "61a0060a.f22c2",\r
+        "id": "c2dbfa93.1077a",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 4796,\r
-        "y": 263,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 4827.75,\r
+        "y": 343,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "27cca76b.e2c508",\r
+        "id": "47ed2855.6b69a",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 4807,\r
-        "y": 208,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 4838.75,\r
+        "y": 288,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d0a9d6e9.c56f4",\r
+        "id": "cd3637d1.c154d8",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4791.38232421875,\r
-        "y": 147.65567016601562,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 4823.13232421875,\r
+        "y": 227.65567016601562,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             [\r
-                "67daf343.f6ee2c"\r
+                "a315466.e353338"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "924b0e47.33623",\r
+        "id": "ec33b794.fa679",\r
         "type": "outcome",\r
         "name": "esr-thirdparty-sdnc",\r
         "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4052,\r
-        "y": 146,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 4083.75,\r
+        "y": 226,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             [\r
-                "e5beadfa.65d4b"\r
+                "c9bd9c8c.3dcca"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "67daf343.f6ee2c",\r
+        "id": "a315466.e353338",\r
         "type": "set",\r
         "name": "set controller domain data",\r
         "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.url' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.user' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.domain.password' value=\"`$tmp.aai.domain.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].password`\" />\n\n\n<!--<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >-->\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-network:networks'`\" />-->\n<!--<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.user`\" />-->\n<!--<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.password`\" />-->\n<!--<parameter name=\"format\" value=\"json\"/>-->\n<!--<parameter name=\"httpMethod\" value=\"get\"/>-->\n<!--<parameter name=\"responsePrefix\" value=\"topology\"/>-->\n<!--<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>-->\n<!--<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>-->\n<!--<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>-->\n<!--<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>-->\n",\r
         "comments": "",\r
-        "x": 5006,\r
-        "y": 144,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 5037.75,\r
+        "y": 224,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f37bd9fd.aaa8a8",\r
+        "id": "7167c2a2.e60ca4",\r
         "type": "break",\r
         "name": "break",\r
         "xml": "<break>\n",\r
         "comments": "",\r
-        "x": 4387,\r
-        "y": 223,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 4418.75,\r
+        "y": 303,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "eb52e479.fabdf8",\r
+        "id": "921a6da5.facfa8",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode Delete ethernet Service without token",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-eth-tran-service:etht-svc/etht-svc-instances=' + $tmp.aai.connectivity.etht-svc-name`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<!--<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3260,\r
-        "y": 587,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 3796.75,\r
+        "y": 652,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             [\r
-                "f7e1f7cd.472128",\r
-                "cd5ebb71.771178"\r
+                "f23ad1ae.7a421",\r
+                "2e318f27.a95f18"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f7e1f7cd.472128",\r
+        "id": "f23ad1ae.7a421",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3606.5,\r
-        "y": 580,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 4143.25,\r
+        "y": 645,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             [\r
-                "e8c999cc.b2fcc"\r
+                "e679ed8f.b4a3b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cd5ebb71.771178",\r
+        "id": "2e318f27.a95f18",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3610.5,\r
-        "y": 620,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 4147.25,\r
+        "y": 685,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             [\r
-                "fe0f592f.73096"\r
+                "85d951e1.733df8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fe0f592f.73096",\r
+        "id": "85d951e1.733df8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3768,\r
-        "y": 620,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 4304.75,\r
+        "y": 685,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             [\r
-                "a35fbdc3.ba44d8",\r
-                "25ddb449.839c14"\r
+                "cd6438e5.f17948",\r
+                "9dae1cfd.fe5bb8",\r
+                "c8b6c5b0.42c5d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e8c999cc.b2fcc",\r
+        "id": "e679ed8f.b4a3b",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing delete ethernet service rest api\" />\n",\r
         "comments": "",\r
-        "x": 3764.5,\r
-        "y": 580,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 4301.25,\r
+        "y": 645,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a35fbdc3.ba44d8",\r
+        "id": "cd6438e5.f17948",\r
         "type": "save",\r
         "name": "update vpn-binding resource (aka. OTN domainA) in AAI",\r
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-binding.vpn-id' >\n<parameter name='vpn-id' value='`$tmp.aai.vpn-binding.vpn-id`' />\n<parameter name='vpn-name' value='`$tmp.aai.vpn-binding.vpn-name`' />\n\n<parameter name='operational-status' value='Deactivated' />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4096.5,\r
-        "y": 620,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 4633.25,\r
+        "y": 685,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "25ddb449.839c14",\r
+        "id": "9dae1cfd.fe5bb8",\r
         "type": "save",\r
         "name": "update connectivity resource in AAI",\r
         "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.connectivity.connectivity-id'>\n<parameter name='connectivity-id' value='`$tmp.aai.connectivity.connectivity-id`' />\n<parameter name='operational-status' value='Deactivated' />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 4023.5,\r
-        "y": 666,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 4560.25,\r
+        "y": 731,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "e64ba97a.ab16f8",\r
+        "id": "595bb85e.e54e8",\r
         "type": "execute",\r
         "name": "execute RestApiCallNode Delete OTN tunnel with token",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<!--<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-otn-src-domain-creation.templatefile`\" />-->\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-te:te/tunnels/tunnel=' + $tmp.aai.vpn-binding.vpn-name`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3233,\r
-        "y": 459,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 3264.75,\r
+        "y": 539,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             [\r
-                "e39876fb.5fed98",\r
-                "bba7f7ba.20df2"\r
+                "3b1365ed.b0919a",\r
+                "2f6c4f0a.446848"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e39876fb.5fed98",\r
+        "id": "3b1365ed.b0919a",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3565.5,\r
-        "y": 429,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 3597.25,\r
+        "y": 509,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             [\r
-                "577f2ccc.95a23c"\r
+                "fc7e9165.b22f48"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bba7f7ba.20df2",\r
+        "id": "2f6c4f0a.446848",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3570.5,\r
-        "y": 494,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 3602.25,\r
+        "y": 574,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             [\r
-                "f956764e.d59e5"\r
+                "12d60626.768032"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "577f2ccc.95a23c",\r
+        "id": "fc7e9165.b22f48",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing delete OTN tunnel rest api\" />\n",\r
         "comments": "",\r
-        "x": 3741.5,\r
-        "y": 429,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 3773.25,\r
+        "y": 509,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f956764e.d59e5",\r
+        "id": "12d60626.768032",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3737,\r
-        "y": 494,\r
-        "z": "b39eb7ec.28f1a8",\r
+        "x": 3768.75,\r
+        "y": 574,\r
+        "z": "316d1be5.aa32c4",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "e28e0e7a.57d778",\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": 3202.75,\r
+        "y": 674,\r
+        "z": "316d1be5.aa32c4",\r
+        "wires": [\r
+            [\r
+                "58217adc.044174",\r
+                "7dc25247.ea55a4"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "7dc25247.ea55a4",\r
+        "type": "other",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3455.75,\r
+        "y": 652,\r
+        "z": "316d1be5.aa32c4",\r
+        "wires": [\r
+            [\r
+                "921a6da5.facfa8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "58217adc.044174",\r
+        "type": "outcome",\r
+        "name": "Null",\r
+        "xml": "<outcome value=''>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 3455.75,\r
+        "y": 708,\r
+        "z": "316d1be5.aa32c4",\r
+        "wires": [\r
+            []\r
+        ]\r
+    },\r
+    {\r
+        "id": "c8b6c5b0.42c5d",\r
+        "type": "save",\r
+        "name": "update service-instance resource in AAI",\r
+        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='service-instance' \n      key='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<parameter name='service-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n<parameter name='orchestration-status' value='Deactivated' />\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 4578,\r
+        "y": 784.75,\r
+        "z": "316d1be5.aa32c4",\r
         "wires": [\r
             []\r
         ]\r