Completing the logic and the call flow for Transport Slicing operations:
[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 fa7b88c..3584527 100644 (file)
@@ -1,20 +1,20 @@
 [\r
     {\r
-        "id": "303f7566.d219ba",\r
+        "id": "fed3eb51.781ac8",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 110,\r
-        "y": 318,\r
-        "z": "15891279.d6b57e",\r
+        "x": 131,\r
+        "y": 81,\r
+        "z": "fdc94a5e.7c86f8",\r
         "wires": [\r
             [\r
-                "f39490a3.b09b28"\r
+                "d2a4ea36.881b68"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f39490a3.b09b28",\r
+        "id": "d2a4ea36.881b68",\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": 394.2856903076172,\r
-        "y": 379.23810863494873,\r
-        "z": "15891279.d6b57e",\r
+        "x": 262.2856903076172,\r
+        "y": 130.23810863494873,\r
+        "z": "fdc94a5e.7c86f8",\r
         "wires": [\r
             [\r
-                "72c32dea.176324"\r
+                "7b1236d6.83c2c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "72c32dea.176324",\r
+        "id": "7b1236d6.83c2c",\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": 400.42860412597656,\r
-        "y": 464.0000305175781,\r
-        "z": "15891279.d6b57e",\r
+        "x": 265.4286193847656,\r
+        "y": 215.00003242492676,\r
+        "z": "fdc94a5e.7c86f8",\r
         "wires": [\r
             [\r
-                "d12dc6f7.97bdd"\r
+                "8228a949.234f38"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d12dc6f7.97bdd",\r
+        "id": "8228a949.234f38",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 596.2380447387695,\r
-        "y": 622.6666681496426,\r
-        "z": "15891279.d6b57e",\r
+        "x": 415.238037109375,\r
+        "y": 344.6666564941406,\r
+        "z": "fdc94a5e.7c86f8",\r
         "wires": [\r
             [\r
-                "6aad2197.a72ef",\r
-                "1be9220f.ba6ca6",\r
-                "7fd5d3ea.13b334",\r
-                "5cda8af7.9a0634",\r
-                "225a4cf6.f0c67c",\r
-                "a4c45de.b22e5a",\r
-                "d2fb34de.34839",\r
-                "2fc6eaae.5fdc7e"\r
+                "341b32a3.25428e",\r
+                "1a6e5da0.98eb02",\r
+                "e5c8285b.2b695"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6aad2197.a72ef",\r
-        "type": "set",\r
-        "name": "set vnf-level-oper-status to PendingDelete",\r
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.order-status' value='PendingDelete' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.last-rpc-action' value='`$vnf-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.last-action' value='`$vnf-topology-operation-input.request-information.request-action`' />",\r
-        "comments": "",\r
-        "x": 1004.3849029541016,\r
-        "y": 771.670627951622,\r
-        "z": "15891279.d6b57e",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "1be9220f.ba6ca6",\r
+        "id": "341b32a3.25428e",\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": 916.5716552734375,\r
-        "y": 1843.5970458984375,\r
-        "z": "15891279.d6b57e",\r
+        "x": 689.5716552734375,\r
+        "y": 611.59716796875,\r
+        "z": "fdc94a5e.7c86f8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7fd5d3ea.13b334",\r
-        "type": "set",\r
-        "name": "set vnf-index and vnf-object-path",\r
-        "xml": "<set>\n<parameter name='vnfId' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />\n<parameter name=\"vnf-object-path\" value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'  + $vnf-topology-operation-input.service-information.service-instance-id  + '/service-data/vnfs/vnf/'  + $vnf-topology-operation-input.vnf-information.vnf-id  + '/vnf-data/'` \" />",\r
+        "id": "f743b3f1.72f9f",\r
+        "type": "comment",\r
+        "name": "new for TransportSlicing",\r
+        "info": "",\r
         "comments": "",\r
-        "x": 981.5716247558594,\r
-        "y": 727.5968955755234,\r
-        "z": "15891279.d6b57e",\r
+        "x": 721,\r
+        "y": 286,\r
+        "z": "fdc94a5e.7c86f8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5cda8af7.9a0634",\r
-        "type": "switchNode",\r
-        "name": "switch service-data.vnfs.vnf_length",\r
-        "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",\r
+        "id": "1a6e5da0.98eb02",\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": 1026.0000610351562,\r
-        "y": 512.000005456619,\r
-        "z": "15891279.d6b57e",\r
+        "x": 741,\r
+        "y": 382,\r
+        "z": "fdc94a5e.7c86f8",\r
         "wires": [\r
             [\r
-                "183040b7.7ccbff",\r
-                "71cafe22.189b2",\r
-                "b0ad485b.8627c"\r
+                "2976ce78.f07a42",\r
+                "de3912b8.6d67e",\r
+                "77b5fc18.2082a4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b0ad485b.8627c",\r
-        "type": "outcome",\r
-        "name": "0",\r
-        "xml": "<outcome value='0'>\n",\r
+        "id": "2976ce78.f07a42",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1284.9689559936523,\r
-        "y": 473.96876499336213,\r
-        "z": "15891279.d6b57e",\r
+        "x": 960,\r
+        "y": 320,\r
+        "z": "fdc94a5e.7c86f8",\r
         "wires": [\r
             [\r
-                "f9a51cd3.102398"\r
+                "7ee13e19.7c1348"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f9a51cd3.102398",\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=\"vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data\" />\n",\r
-        "comments": "",\r
-        "x": 1439.7778434753418,\r
-        "y": 492.88903352897614,\r
-        "z": "15891279.d6b57e",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "183040b7.7ccbff",\r
-        "type": "other",\r
-        "name": "Null",\r
-        "xml": "<outcome value=''>\n",\r
+        "id": "de3912b8.6d67e",\r
+        "type": "not-found",\r
+        "name": "not-found",\r
+        "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1278.0000953674316,\r
-        "y": 513.0000865189359,\r
-        "z": "15891279.d6b57e",\r
+        "x": 969.490966796875,\r
+        "y": 362.57403564453125,\r
+        "z": "fdc94a5e.7c86f8",\r
         "wires": [\r
             [\r
-                "f9a51cd3.102398"\r
+                "4a305009.90c32"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "71cafe22.189b2",\r
-        "type": "other",\r
-        "name": "other",\r
-        "xml": "<outcome value='Other'>\n",\r
+        "id": "77b5fc18.2082a4",\r
+        "type": "failure",\r
+        "name": "failure",\r
+        "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1271.000503540039,\r
-        "y": 546.0000903336331,\r
-        "z": "15891279.d6b57e",\r
+        "x": 958,\r
+        "y": 409,\r
+        "z": "fdc94a5e.7c86f8",\r
         "wires": [\r
             [\r
-                "f6c4231c.6894e8"\r
+                "cd4775e4.2da96"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f6c4231c.6894e8",\r
-        "type": "block",\r
-        "name": "block : atomic",\r
-        "xml": "<block atomic=\"true\">",\r
-        "atomic": "true",\r
-        "outputs": 1,\r
-        "x": 1418.2700462341309,\r
-        "y": 546.554735395126,\r
-        "z": "15891279.d6b57e",\r
-        "wires": [\r
-            [\r
-                "541e7856.d1e2",\r
-                "8337a3da.3c8e38"\r
-            ]\r
-        ]\r
+        "id": "4a305009.90c32",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.l3vpn.pe1_id`\" />\n\n",\r
+        "comments": "",\r
+        "x": 1123.0623779296875,\r
+        "y": 365.8597717285156,\r
+        "z": "fdc94a5e.7c86f8",\r
+        "wires": []\r
     },\r
     {\r
-        "id": "541e7856.d1e2",\r
-        "type": "for",\r
-        "name": "for vidx..service-data.vnfs.vnf_length[]",\r
-        "xml": "<for index='vidx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",\r
+        "id": "cd4775e4.2da96",\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
-        "outputs": 1,\r
-        "x": 1664.2861633300781,\r
-        "y": 553.4286558357999,\r
-        "z": "15891279.d6b57e",\r
-        "wires": [\r
-            [\r
-                "ebbd7e9e.ba96c8"\r
-            ]\r
-        ]\r
+        "x": 1127,\r
+        "y": 410,\r
+        "z": "fdc94a5e.7c86f8",\r
+        "wires": []\r
     },\r
     {\r
-        "id": "ebbd7e9e.ba96c8",\r
-        "type": "block",\r
-        "name": "block",\r
-        "xml": "<block>\n",\r
-        "atomic": "false",\r
+        "id": "7ee13e19.7c1348",\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": 1883.6357955932617,\r
-        "y": 552.9687359062955,\r
-        "z": "15891279.d6b57e",\r
+        "x": 1157,\r
+        "y": 316,\r
+        "z": "fdc94a5e.7c86f8",\r
         "wires": [\r
             [\r
-                "436917e7.e9b6a"\r
+                "bc03982b.15ba78"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "436917e7.e9b6a",\r
+        "id": "bc03982b.15ba78",\r
         "type": "switchNode",\r
-        "name": "switch vnfid found",\r
-        "xml": "<switch test=\"`$service-data.vnfs.vnf[$vidx].vnf-id == $vnf-topology-operation-input.vnf-information.vnf-id`\">\n\n",\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": 2037.7153930664062,\r
-        "y": 552.6788179604337,\r
-        "z": "15891279.d6b57e",\r
+        "x": 1380.33349609375,\r
+        "y": 315.99993896484375,\r
+        "z": "fdc94a5e.7c86f8",\r
         "wires": [\r
             [\r
-                "27314ab3.a1187e"\r
+                "aca4b74a.cb3118"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "27314ab3.a1187e",\r
-        "type": "outcomeTrue",\r
-        "name": "true",\r
-        "xml": "<outcome value='true'>\n",\r
+        "id": "aca4b74a.cb3118",\r
+        "type": "outcome",\r
+        "name": "connectivity",\r
+        "xml": "<outcome value='connectivity'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2213.6675148010254,\r
-        "y": 552.5715000359342,\r
-        "z": "15891279.d6b57e",\r
-        "wires": [\r
-            [\r
-                "cf77593a.1343d8"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "cf77593a.1343d8",\r
-        "type": "block",\r
-        "name": "block : atomic",\r
-        "xml": "<block atomic=\"true\">",\r
-        "atomic": "true",\r
-        "outputs": 1,\r
-        "x": 2362.312973022461,\r
-        "y": 540.97913000267,\r
-        "z": "15891279.d6b57e",\r
+        "x": 1581.0001335144043,\r
+        "y": 317.00002098083496,\r
+        "z": "fdc94a5e.7c86f8",\r
         "wires": [\r
             [\r
-                "f0ff74da.16b248"\r
+                "2544f612.eeddca"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f0ff74da.16b248",\r
-        "type": "set",\r
-        "name": "set tmp.vidx and ctx.vnf-data",\r
-        "xml": "<set>\n<parameter name='tmp.vidx' value='`$vidx`' />\n<parameter name='ctx.vnf-data.' value='`$service-data.vnfs.vnf[$vidx].`' />\n",\r
-        "comments": "",\r
-        "x": 2624.1997680664062,\r
-        "y": 518.3215563027188,\r
-        "z": "15891279.d6b57e",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "8337a3da.3c8e38",\r
-        "type": "switchNode",\r
-        "name": "switch tmp.vidx ",\r
-        "xml": "<switch test=\"`$tmp.vidx`\">\n\n",\r
+        "id": "e5c8285b.2b695",\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": 1607.0000228881836,\r
-        "y": 607.99999353569,\r
-        "z": "15891279.d6b57e",\r
+        "x": 707,\r
+        "y": 330,\r
+        "z": "fdc94a5e.7c86f8",\r
         "wires": [\r
-            [\r
-                "1cd8ba9c.bf5235"\r
-            ]\r
+            []\r
         ]\r
     },\r
     {\r
-        "id": "1cd8ba9c.bf5235",\r
-        "type": "outcome",\r
-        "name": "NULL",\r
-        "xml": "<outcome value=''>\n",\r
+        "id": "2544f612.eeddca",\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": 1762.4286499023438,\r
-        "y": 607.5713770119473,\r
-        "z": "15891279.d6b57e",\r
+        "x": 1819,\r
+        "y": 319,\r
+        "z": "fdc94a5e.7c86f8",\r
         "wires": [\r
             [\r
-                "6dd6d49d.d00eec"\r
+                "75c7fde8.1d4a84",\r
+                "563ee44e.bd096c",\r
+                "bc425b5.1b1fba8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6dd6d49d.d00eec",\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=\"vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data\" />\n",\r
-        "comments": "",\r
-        "x": 1907.8573913574219,\r
-        "y": 607.7143146721646,\r
-        "z": "15891279.d6b57e",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "225a4cf6.f0c67c",\r
-        "type": "switchNode",\r
-        "name": "switch vnf-level-oper-status",\r
-        "xml": "<switch test='`$service-data.vnfs.vnf[$tmp.vidx].vnf-data.vnf-level-oper-status.order-status`'>\n",\r
+        "id": "75c7fde8.1d4a84",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 975.0000762939453,\r
-        "y": 620.8890204429626,\r
-        "z": "15891279.d6b57e",\r
+        "x": 2027,\r
+        "y": 283,\r
+        "z": "fdc94a5e.7c86f8",\r
         "wires": [\r
             [\r
-                "e0bfe23d.068ad8",\r
-                "3e0c4d79.12e802"\r
+                "e6a3b8f2.9e7b38"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e0bfe23d.068ad8",\r
-        "type": "outcome",\r
-        "name": "outcome Active",\r
-        "xml": "<outcome value='Active'>\n",\r
+        "id": "563ee44e.bd096c",\r
+        "type": "not-found",\r
+        "name": "not-found",\r
+        "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1220.8333702087402,\r
-        "y": 622.0001182556152,\r
-        "z": "15891279.d6b57e",\r
+        "x": 2027.490966796875,\r
+        "y": 328.57403564453125,\r
+        "z": "fdc94a5e.7c86f8",\r
         "wires": [\r
             [\r
-                "40413c0b.9420dc"\r
+                "ad15182e.154a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "40413c0b.9420dc",\r
-        "type": "block",\r
-        "name": "block : atomic",\r
-        "xml": "<block atomic=\"true\">",\r
-        "atomic": "true",\r
-        "outputs": 1,\r
-        "x": 1434.139762878418,\r
-        "y": 631.3253078460693,\r
-        "z": "15891279.d6b57e",\r
-        "wires": [\r
-            []\r
-        ]\r
-    },\r
-    {\r
-        "id": "3e0c4d79.12e802",\r
-        "type": "other",\r
-        "name": "other",\r
-        "xml": "<outcome value='Other'>\n",\r
+        "id": "bc425b5.1b1fba8",\r
+        "type": "failure",\r
+        "name": "failure",\r
+        "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1198.8333892822266,\r
-        "y": 672.000129699707,\r
-        "z": "15891279.d6b57e",\r
+        "x": 2025,\r
+        "y": 372,\r
+        "z": "fdc94a5e.7c86f8",\r
         "wires": [\r
             [\r
-                "fc734294.cf7788"\r
+                "8719a717.3cd9f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fc734294.cf7788",\r
+        "id": "ad15182e.154a8",\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=\"`'VNF is not in appropriate state for activate. Current state is ' + $service-data.vnfs.vnf[$tmp.nidx].vnf-data.vnf-level-oper-status.order-status`\" />",\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": 1358.3331565856934,\r
-        "y": 675.0001287460327,\r
-        "z": "15891279.d6b57e",\r
+        "x": 2190.0623779296875,\r
+        "y": 328.8597717285156,\r
+        "z": "fdc94a5e.7c86f8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a4c45de.b22e5a",\r
-        "type": "set",\r
-        "name": "copy input data to service data",\r
-        "xml": "<set>\n<!--parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-id' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' /-->\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.sdnc-request-header.' value='$vnf-topology-operation-input.sdnc-request-header.' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.request-information.' value='$vnf-topology-operation-input.request-information.' />\n<parameter name='service-data.vnfs.vnf[$tmp.vidx].vnf-data.service-information.' value='$vnf-topology-operation-input.service-information.' />",\r
+        "id": "8719a717.3cd9f8",\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": 984.0065612792969,\r
-        "y": 680.010435461998,\r
-        "z": "15891279.d6b57e",\r
+        "x": 2194,\r
+        "y": 373,\r
+        "z": "fdc94a5e.7c86f8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d2fb34de.34839",\r
+        "id": "c776a79f.7f2db",\r
         "type": "save",\r
-        "name": "update AnAI - vnf-instance.orchestration-status",\r
-        "xml": "<update plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"generic-vnf\"   \n\t\tkey=\"generic-vnf.vnf-id = $vnfId\" >\n<parameter name=\"orchestration-status\" value=\"PendingDelete\" />\n<parameter name=\"vnf-type\" value=\"some vnf-type\" />",\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": 1026.0064239501953,\r
-        "y": 826.0105141401291,\r
-        "z": "15891279.d6b57e",\r
+        "x": 2500,\r
+        "y": 372,\r
+        "z": "fdc94a5e.7c86f8",\r
         "wires": [\r
-            []\r
+            [\r
+                "b403a898.9fbc18",\r
+                "5d1a47a8.0dfe7",\r
+                "f3733135.d8a078"\r
+            ]\r
         ]\r
     },\r
     {\r
-        "id": "5dd794c8.fb268c",\r
-        "type": "comment",\r
-        "name": "new for TransportSlicing",\r
-        "info": "",\r
-        "comments": "",\r
-        "x": 967,\r
-        "y": 898,\r
-        "z": "15891279.d6b57e",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "2fc6eaae.5fdc7e",\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.service-information.service-instance-id\n         AND customer.global-customer-id = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.global-customer-id \n         AND service-subscription.service-type = $service-data.vnfs.vnf[$vnf-index].vnf-data.service-information.subscription-service-type'\n\tlocal-only=\"false\"\n\tforce=\"true\" pfx=\"tmp.aai.service-instance\">",\r
-        "comments": "",\r
+        "id": "c765be65.0f488",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
         "outputs": 1,\r
-        "x": 978,\r
-        "y": 948,\r
-        "z": "15891279.d6b57e",\r
+        "x": 2884,\r
+        "y": 372,\r
+        "z": "fdc94a5e.7c86f8",\r
         "wires": [\r
             [\r
-                "aebcc6b7.4bd97",\r
-                "534659e3.16c99",\r
-                "4b75ad0e.b2264c"\r
+                "e9922fb9.764098",\r
+                "eef29d57.4c4228",\r
+                "952ea8f1.7bda",\r
+                "14a01812.a7d138"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "aebcc6b7.4bd97",\r
+        "id": "b403a898.9fbc18",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1194,\r
-        "y": 913,\r
-        "z": "15891279.d6b57e",\r
+        "x": 2711,\r
+        "y": 374,\r
+        "z": "fdc94a5e.7c86f8",\r
         "wires": [\r
             [\r
-                "dfa58322.db6e7"\r
+                "c765be65.0f488"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "534659e3.16c99",\r
+        "id": "5d1a47a8.0dfe7",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1203.490966796875,\r
-        "y": 955.5740356445312,\r
-        "z": "15891279.d6b57e",\r
+        "x": 2711.490966796875,\r
+        "y": 419.57403564453125,\r
+        "z": "fdc94a5e.7c86f8",\r
         "wires": [\r
             [\r
-                "7aae8b9.3267cf4"\r
+                "1295f1fa.69cac6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4b75ad0e.b2264c",\r
+        "id": "f3733135.d8a078",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1192,\r
-        "y": 1002,\r
-        "z": "15891279.d6b57e",\r
+        "x": 2709,\r
+        "y": 463,\r
+        "z": "fdc94a5e.7c86f8",\r
         "wires": [\r
             [\r
-                "47847ce9.cdac14"\r
+                "6ac7a77b.f5232"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7aae8b9.3267cf4",\r
+        "id": "6ac7a77b.f5232",\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
+        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",\r
         "comments": "",\r
-        "x": 1357.0623779296875,\r
-        "y": 958.8597717285156,\r
-        "z": "15891279.d6b57e",\r
+        "x": 2876,\r
+        "y": 462,\r
+        "z": "fdc94a5e.7c86f8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "47847ce9.cdac14",\r
+        "id": "1295f1fa.69cac6",\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
+        "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": 1361,\r
-        "y": 1003,\r
-        "z": "15891279.d6b57e",\r
+        "x": 2874.0623779296875,\r
+        "y": 419.8597717285156,\r
+        "z": "fdc94a5e.7c86f8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "dfa58322.db6e7",\r
+        "id": "e6a3b8f2.9e7b38",\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
+        "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": 1391,\r
-        "y": 909,\r
-        "z": "15891279.d6b57e",\r
+        "x": 2228,\r
+        "y": 278,\r
+        "z": "fdc94a5e.7c86f8",\r
         "wires": [\r
             [\r
-                "1fcd5169.0fe3ef"\r
+                "d8c7aa6c.9474d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1fcd5169.0fe3ef",\r
+        "id": "d8c7aa6c.9474d",\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
+        "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1614.33349609375,\r
-        "y": 908.9999389648438,\r
-        "z": "15891279.d6b57e",\r
+        "x": 2433,\r
+        "y": 278,\r
+        "z": "fdc94a5e.7c86f8",\r
         "wires": [\r
             [\r
-                "b3fa3516.3c5f7"\r
+                "6afd9b1f.24ad3c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b3fa3516.3c5f7",\r
+        "id": "6afd9b1f.24ad3c",\r
         "type": "outcome",\r
-        "name": "connectivity",\r
-        "xml": "<outcome value='connectivity'>\n",\r
+        "name": "vpn-binding",\r
+        "xml": "<outcome value='vpn-binding'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1810,\r
-        "y": 911,\r
-        "z": "15891279.d6b57e",\r
+        "x": 2599,\r
+        "y": 278,\r
+        "z": "fdc94a5e.7c86f8",\r
         "wires": [\r
             [\r
-                "8171ffc1.700ce8"\r
+                "489d615f.74d2b8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8171ffc1.700ce8",\r
-        "type": "switchNode",\r
-        "name": "switch $rel-index == 0",\r
-        "xml": "<switch test=\"`$rel-index == 0`\">\n\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 1997.9998664855957,\r
-        "y": 908.999979019165,\r
-        "z": "15891279.d6b57e",\r
-        "wires": [\r
-            [\r
-                "4491f21f.012e44",\r
-                "66fe8847.e5db68"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "4491f21f.012e44",\r
-        "type": "outcomeTrue",\r
-        "name": "true",\r
-        "xml": "<outcome value='true'>\n",\r
-        "comments": "",\r
+        "id": "489d615f.74d2b8",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2220.9998664855957,\r
-        "y": 798.999979019165,\r
-        "z": "15891279.d6b57e",\r
+        "x": 2762,\r
+        "y": 278,\r
+        "z": "fdc94a5e.7c86f8",\r
         "wires": [\r
             [\r
-                "50b3c107.0ef428"\r
+                "c776a79f.7f2db"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "66fe8847.e5db68",\r
-        "type": "outcomeFalse",\r
-        "name": "false",\r
-        "xml": "<outcome value='false'>\n",\r
+        "id": "e9922fb9.764098",\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
-        "outputs": 1,\r
-        "x": 2191.999755859375,\r
-        "y": 1225,\r
-        "z": "15891279.d6b57e",\r
-        "wires": [\r
-            [\r
-                "49f4be1a.dd4768"\r
-            ]\r
-        ]\r
+        "x": 3099,\r
+        "y": 82,\r
+        "z": "fdc94a5e.7c86f8",\r
+        "wires": []\r
     },\r
     {\r
-        "id": "50b3c107.0ef428",\r
-        "type": "save",\r
-        "name": "get connectivityA 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[0].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.connectivityA\" >\n",\r
+        "id": "eef29d57.4c4228",\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": 2414.9998664855957,\r
-        "y": 798.999979019165,\r
-        "z": "15891279.d6b57e",\r
+        "x": 3125,\r
+        "y": 199,\r
+        "z": "fdc94a5e.7c86f8",\r
         "wires": [\r
             [\r
-                "c5f57c4d.37656",\r
-                "f8bc0153.3111b",\r
-                "fd26821d.45f278"\r
+                "e1caf9b0.f16ef",\r
+                "8ba822ff.3c855",\r
+                "3e54396e.89bb66"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c5f57c4d.37656",\r
+        "id": "e1caf9b0.f16ef",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2620.9998664855957,\r
-        "y": 758.999979019165,\r
-        "z": "15891279.d6b57e",\r
+        "x": 3320.5001220703125,\r
+        "y": 151,\r
+        "z": "fdc94a5e.7c86f8",\r
         "wires": [\r
             [\r
-                "944973cd.969b48"\r
+                "12b4a6a1.bdd529"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f8bc0153.3111b",\r
+        "id": "8ba822ff.3c855",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2621.4908332824707,\r
-        "y": 804.5740146636963,\r
-        "z": "15891279.d6b57e",\r
-        "wires": [\r
-            [\r
-                "4c56e2b6.ecbe4c"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "fd26821d.45f278",\r
-        "type": "failure",\r
-        "name": "failure",\r
-        "xml": "<outcome value='failure'>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 2618.9998664855957,\r
-        "y": 847.999979019165,\r
-        "z": "15891279.d6b57e",\r
+        "x": 3312.5001220703125,\r
+        "y": 206,\r
+        "z": "fdc94a5e.7c86f8",\r
         "wires": [\r
             [\r
-                "5f2713ec.fce9b4"\r
+                "6aa3fcb.c3a6c84"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "49f4be1a.dd4768",\r
-        "type": "save",\r
-        "name": "get connectivityB 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[1].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.connectivityB\" >\n",\r
+        "id": "12b4a6a1.bdd529",\r
+        "type": "block",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2387.999755859375,\r
-        "y": 1225,\r
-        "z": "15891279.d6b57e",\r
+        "x": 3464.8824462890625,\r
+        "y": 150.65567016601562,\r
+        "z": "fdc94a5e.7c86f8",\r
         "wires": [\r
             [\r
-                "99901664.bef67",\r
-                "fa356ad9.66e31",\r
-                "3216507d.6f0df8"\r
+                "8559d2a.befa2b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "99901664.bef67",\r
-        "type": "success",\r
-        "name": "success",\r
-        "xml": "<outcome value='success'>\n",\r
+        "id": "8559d2a.befa2b",\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": 2607.999755859375,\r
-        "y": 1196,\r
-        "z": "15891279.d6b57e",\r
+        "x": 3649,\r
+        "y": 149,\r
+        "z": "fdc94a5e.7c86f8",\r
         "wires": [\r
             [\r
-                "b3f3fc8e.164aa8"\r
+                "a2c1ad39.50b17"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "fa356ad9.66e31",\r
-        "type": "not-found",\r
-        "name": "not-found",\r
-        "xml": "<outcome value='not-found'>\n",\r
+        "id": "a2c1ad39.50b17",\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": 2609.49072265625,\r
-        "y": 1241.5740356445312,\r
-        "z": "15891279.d6b57e",\r
+        "x": 3844,\r
+        "y": 149,\r
+        "z": "fdc94a5e.7c86f8",\r
         "wires": [\r
             [\r
-                "9c397b15.bf0e5"\r
+                "f7ee255a.8640e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3216507d.6f0df8",\r
-        "type": "failure",\r
-        "name": "failure",\r
-        "xml": "<outcome value='failure'>\n",\r
+        "id": "3e54396e.89bb66",\r
+        "type": "other",\r
+        "name": "other",\r
+        "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2605.999755859375,\r
-        "y": 1287,\r
-        "z": "15891279.d6b57e",\r
+        "x": 3317.5001220703125,\r
+        "y": 263,\r
+        "z": "fdc94a5e.7c86f8",\r
         "wires": [\r
             [\r
-                "1f619a9f.fc34dd"\r
+                "ff13ab9d.2deb7"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "944973cd.969b48",\r
-        "type": "block",\r
-        "name": "block : atomic",\r
-        "xml": "<block atomic=\"true\">",\r
-        "atomic": "true",\r
-        "outputs": 1,\r
-        "x": 2793.6663703918457,\r
-        "y": 757.999979019165,\r
-        "z": "15891279.d6b57e",\r
-        "wires": [\r
-            [\r
-                "905f3b23.ac61b8",\r
-                "6125d5eb.a534c4",\r
-                "b1bd9fc5.bac3a"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "4c56e2b6.ecbe4c",\r
+        "id": "ff13ab9d.2deb7",\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
+        "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": 2784.062244415283,\r
-        "y": 804.8597507476807,\r
-        "z": "15891279.d6b57e",\r
+        "x": 3469.5001220703125,\r
+        "y": 264,\r
+        "z": "fdc94a5e.7c86f8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5f2713ec.fce9b4",\r
+        "id": "6aa3fcb.c3a6c84",\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": 2787.9998664855957,\r
-        "y": 848.999979019165,\r
-        "z": "15891279.d6b57e",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "6125d5eb.a534c4",\r
-        "type": "set",\r
-        "name": "set sotn_value for ETH deletion",\r
-        "xml": "<set>\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].access-provider-id' value='`$oof.vpn.access-provider-id`' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].access-client-id' value='`$oof.vpn.access-client-id`' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].access-topology-id' value='`$oof.vpn.access-topology-id`' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[0].access-node-id' value='`$oof.vpn.access-node-id`' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[0].access-ltp-id' value='`$oof.vpn.src-access-ltp-id`' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[1].access-node-id' value='`$oof.vpn.access-node-id`' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[1].access-ltp-id' value='`$oof.vpn.dst-access-ltp-id`' />\n\n<parameter name='ietf-eth-tran-service_etht-svc.globals.etht-svc-bandwidth-profiles[0].bandwidth-profile-type' value='ietf-eth-tran-types:mef-10-bwp' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-type' value='ietf-eth-tran-types:p2p-svc' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].admin-status' value='ietf-te-types:tunnel-state-up' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[0].access-port-id' value='0' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[0].service-classification-type' value='ietf-eth-tran-types:port-classification' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[1].access-port-id' value='1' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[1].service-classification-type' value='ietf-eth-tran-types:port-classification' />",\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": 3081.4996452331543,\r
-        "y": 849.000020980835,\r
-        "z": "15891279.d6b57e",\r
+        "x": 3480.5001220703125,\r
+        "y": 207,\r
+        "z": "fdc94a5e.7c86f8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b1bd9fc5.bac3a",\r
+        "id": "d85cad49.e7fe3",\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.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`\" />\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`\" />\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=\"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\"/>",\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": 3179.499755859375,\r
-        "y": 894,\r
-        "z": "15891279.d6b57e",\r
+        "x": 4432,\r
+        "y": 166,\r
+        "z": "fdc94a5e.7c86f8",\r
         "wires": [\r
             [\r
-                "43014871.10916",\r
-                "ef466a56.4961d8"\r
+                "5b32aba.7fc39d4",\r
+                "43d71291.c727fc",\r
+                "6b05861c.156668"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "43014871.10916",\r
-        "type": "failure",\r
-        "name": "failure",\r
-        "xml": "<outcome value='failure'>\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 3524.999755859375,\r
-        "y": 875,\r
-        "z": "15891279.d6b57e",\r
-        "wires": [\r
-            [\r
-                "b872830e.e33218"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "ef466a56.4961d8",\r
-        "type": "success",\r
-        "name": "success",\r
-        "xml": "<outcome value='success'>\n",\r
-        "comments": "",\r
+        "id": "98badb93.a08c9",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
         "outputs": 1,\r
-        "x": 3528.999755859375,\r
-        "y": 915,\r
-        "z": "15891279.d6b57e",\r
+        "x": 4226,\r
+        "y": 153,\r
+        "z": "fdc94a5e.7c86f8",\r
         "wires": [\r
             [\r
-                "ecca88b1.05406"\r
+                "48966cee.55dba4",\r
+                "d85cad49.e7fe3",\r
+                "ee878ee.4f8847"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "53822d52.50003c",\r
-        "type": "comment",\r
-        "name": "TODO: FIXME:",\r
-        "info": "put proper values based on connectivity resource retrieved from AAI",\r
+        "id": "48966cee.55dba4",\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": 3022.999755859375,\r
-        "y": 802,\r
-        "z": "15891279.d6b57e",\r
+        "x": 4462,\r
+        "y": 114,\r
+        "z": "fdc94a5e.7c86f8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "905f3b23.ac61b8",\r
-        "type": "get-resource",\r
-        "name": "get-resource 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 = $prop.sdncRestApi.thirdpartySdnc.id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\n\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 3074.999755859375,\r
-        "y": 728,\r
-        "z": "15891279.d6b57e",\r
-        "wires": [\r
-            [\r
-                "7583aec3.33d84",\r
-                "34076538.0ecf52",\r
-                "5f6cfa0b.4be42c"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "7583aec3.33d84",\r
+        "id": "5b32aba.7fc39d4",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3320.999755859375,\r
-        "y": 688,\r
-        "z": "15891279.d6b57e",\r
+        "x": 4642,\r
+        "y": 157,\r
+        "z": "fdc94a5e.7c86f8",\r
         "wires": [\r
             [\r
-                "af220c19.d532d8"\r
+                "20fc8e76.a69222"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "34076538.0ecf52",\r
+        "id": "43d71291.c727fc",\r
         "type": "not-found",\r
         "name": "not-found",\r
         "xml": "<outcome value='not-found'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3324.999755859375,\r
-        "y": 728,\r
-        "z": "15891279.d6b57e",\r
+        "x": 4634,\r
+        "y": 212,\r
+        "z": "fdc94a5e.7c86f8",\r
         "wires": [\r
             [\r
-                "c8a27e43.a20b28"\r
+                "51e97aab.2d7044"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5f6cfa0b.4be42c",\r
+        "id": "6b05861c.156668",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3316.999755859375,\r
-        "y": 768,\r
-        "z": "15891279.d6b57e",\r
+        "x": 4639,\r
+        "y": 269,\r
+        "z": "fdc94a5e.7c86f8",\r
         "wires": [\r
             [\r
-                "d282616c.39fe68"\r
+                "ef0b1a78.fffea8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d282616c.39fe68",\r
+        "id": "ef0b1a78.fffea8",\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 esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",\r
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'Unexpected error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 3474.999755859375,\r
-        "y": 768,\r
-        "z": "15891279.d6b57e",\r
+        "x": 4791,\r
+        "y": 270,\r
+        "z": "fdc94a5e.7c86f8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c8a27e43.a20b28",\r
+        "id": "51e97aab.2d7044",\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 esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",\r
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'An error occurred while querying pnf from AnAI with pnf-name = ' + $prop.connection-attachement.access-node-id`\" />\n\n",\r
         "comments": "",\r
-        "x": 3474.999755859375,\r
-        "y": 728,\r
-        "z": "15891279.d6b57e",\r
+        "x": 4802,\r
+        "y": 215,\r
+        "z": "fdc94a5e.7c86f8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "af220c19.d532d8",\r
-        "type": "set",\r
-        "name": "set controller data",\r
-        "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value=\"`$tmp.aai.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": 3490.999755859375,\r
-        "y": 688,\r
-        "z": "15891279.d6b57e",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "c61ae526.8c7cb8",\r
-        "type": "comment",\r
-        "name": "Get controller info and send request",\r
-        "info": "",\r
-        "comments": "",\r
-        "x": 3082.999755859375,\r
-        "y": 688,\r
-        "z": "15891279.d6b57e",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "24a118da.312548",\r
-        "type": "comment",\r
-        "name": "TODO: FIXME:",\r
-        "info": "How to know which domain's (A or B) controller is bein retrieved?",\r
-        "comments": "",\r
-        "x": 3014.999755859375,\r
-        "y": 648,\r
-        "z": "15891279.d6b57e",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "b3f3fc8e.164aa8",\r
+        "id": "20fc8e76.a69222",\r
         "type": "block",\r
-        "name": "block : atomic",\r
-        "xml": "<block atomic=\"true\">",\r
-        "atomic": "true",\r
+        "name": "block",\r
+        "xml": "<block>\n",\r
+        "atomic": "false",\r
+        "comments": "",\r
         "outputs": 1,\r
-        "x": 2780.666259765625,\r
-        "y": 1197,\r
-        "z": "15891279.d6b57e",\r
+        "x": 4786.38232421875,\r
+        "y": 154.65567016601562,\r
+        "z": "fdc94a5e.7c86f8",\r
         "wires": [\r
             [\r
-                "c56d5bdd.22466",\r
-                "ba468b68.004d98",\r
-                "8df38d4b.ee6e2"\r
+                "a8dfc05f.e2f018"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9c397b15.bf0e5",\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
+        "id": "f7ee255a.8640e",\r
+        "type": "outcome",\r
+        "name": "esr-thirdparty-sdnc",\r
+        "xml": "<outcome value='esr-thirdparty-sdnc'>\n",\r
         "comments": "",\r
-        "x": 2771.0621337890625,\r
-        "y": 1243.8597717285156,\r
-        "z": "15891279.d6b57e",\r
-        "wires": []\r
+        "outputs": 1,\r
+        "x": 4047,\r
+        "y": 153,\r
+        "z": "fdc94a5e.7c86f8",\r
+        "wires": [\r
+            [\r
+                "98badb93.a08c9"\r
+            ]\r
+        ]\r
     },\r
     {\r
-        "id": "1f619a9f.fc34dd",\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
+        "id": "a8dfc05f.e2f018",\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": 2774.999755859375,\r
-        "y": 1288,\r
-        "z": "15891279.d6b57e",\r
+        "x": 5001,\r
+        "y": 151,\r
+        "z": "fdc94a5e.7c86f8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ba468b68.004d98",\r
-        "type": "set",\r
-        "name": "set sotn_value for ETH deletion",\r
-        "xml": "<set>\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].access-provider-id' value='`$oof.vpn.access-provider-id`' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].access-client-id' value='`$oof.vpn.access-client-id`' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].access-topology-id' value='`$oof.vpn.access-topology-id`' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[0].access-node-id' value='`$oof.vpn.access-node-id`' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[0].access-ltp-id' value='`$oof.vpn.src-access-ltp-id`' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[1].access-node-id' value='`$oof.vpn.access-node-id`' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[1].access-ltp-id' value='`$oof.vpn.dst-access-ltp-id`' />\n\n<parameter name='ietf-eth-tran-service_etht-svc.globals.etht-svc-bandwidth-profiles[0].bandwidth-profile-type' value='ietf-eth-tran-types:mef-10-bwp' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-type' value='ietf-eth-tran-types:p2p-svc' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].admin-status' value='ietf-te-types:tunnel-state-up' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[0].access-port-id' value='0' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[0].service-classification-type' value='ietf-eth-tran-types:port-classification' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[1].access-port-id' value='1' />\n<parameter name='ietf-eth-tran-service_etht-svc.etht-svc-instances[0].etht-svc-access-ports[1].service-classification-type' value='ietf-eth-tran-types:port-classification' />",\r
+        "id": "ee878ee.4f8847",\r
+        "type": "break",\r
+        "name": "break",\r
+        "xml": "<break>\n",\r
         "comments": "",\r
-        "x": 3068.9995346069336,\r
-        "y": 1274.00004196167,\r
-        "z": "15891279.d6b57e",\r
+        "x": 4382,\r
+        "y": 230,\r
+        "z": "fdc94a5e.7c86f8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8df38d4b.ee6e2",\r
+        "id": "952ea8f1.7bda",\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.url + '/restconf/data/ietf-eth-tran-service:etht-svc'`\" />\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`\" />\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=\"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\"/>",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-eth-tran-service:etht-svc/eth-svc-instances=' + $tmp.aai.connectivity.connectivity-id`\" />\n<!--<parameter name=\"restapiUrl\" value=\"`$prop.restapi.connection-oof-url`\" />-->\n<!--<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sotn-ethernet-service.json'`\" />-->\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<parameter name=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3173.9996452331543,\r
-        "y": 1321.000020980835,\r
-        "z": "15891279.d6b57e",\r
+        "x": 3255,\r
+        "y": 594,\r
+        "z": "fdc94a5e.7c86f8",\r
         "wires": [\r
             [\r
-                "846e91eb.5fd658",\r
-                "9847a507.3f69e"\r
+                "d9dc02b.5b9308",\r
+                "f01b6c55.209f38"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "846e91eb.5fd658",\r
+        "id": "d9dc02b.5b9308",\r
         "type": "failure",\r
         "name": "failure",\r
         "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3519.4996452331543,\r
-        "y": 1302.000020980835,\r
-        "z": "15891279.d6b57e",\r
+        "x": 3601.5,\r
+        "y": 587,\r
+        "z": "fdc94a5e.7c86f8",\r
         "wires": [\r
             [\r
-                "dcec496b.f92f38"\r
+                "174c3f65.a9f0e1"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9847a507.3f69e",\r
+        "id": "f01b6c55.209f38",\r
         "type": "success",\r
         "name": "success",\r
         "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3523.4996452331543,\r
-        "y": 1342.000020980835,\r
-        "z": "15891279.d6b57e",\r
+        "x": 3605.5,\r
+        "y": 627,\r
+        "z": "fdc94a5e.7c86f8",\r
         "wires": [\r
             [\r
-                "43eceb78.82b2dc"\r
+                "de16161.028de68"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "de77a242.224c1",\r
-        "type": "comment",\r
-        "name": "TODO: FIXME:",\r
-        "info": "put proper values based on connectivity resource retrieved from AAI",\r
-        "comments": "",\r
-        "x": 3017.4996452331543,\r
-        "y": 1229.000020980835,\r
-        "z": "15891279.d6b57e",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "c56d5bdd.22466",\r
-        "type": "get-resource",\r
-        "name": "get-resource 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 = $prop.sdncRestApi.thirdpartySdnc.id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\n\n",\r
+        "id": "de16161.028de68",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3069.4996452331543,\r
-        "y": 1155.000020980835,\r
-        "z": "15891279.d6b57e",\r
+        "x": 3763,\r
+        "y": 627,\r
+        "z": "fdc94a5e.7c86f8",\r
         "wires": [\r
             [\r
-                "c6d3e171.5193a",\r
-                "9098a017.2895f8",\r
-                "8e10fa0e.d0c448"\r
+                "1a3ebd6b.2a7953",\r
+                "30c3e280.4d41f6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c6d3e171.5193a",\r
-        "type": "success",\r
-        "name": "success",\r
-        "xml": "<outcome value='success'>\n",\r
+        "id": "174c3f65.a9f0e1",\r
+        "type": "returnFailure",\r
+        "name": "return failure",\r
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create vpn rest api\" />\n",\r
         "comments": "",\r
-        "outputs": 1,\r
-        "x": 3315.4996452331543,\r
-        "y": 1115.000020980835,\r
-        "z": "15891279.d6b57e",\r
-        "wires": [\r
-            [\r
-                "ec0b6188.dc04e"\r
-            ]\r
-        ]\r
+        "x": 3759.5,\r
+        "y": 587,\r
+        "z": "fdc94a5e.7c86f8",\r
+        "wires": []\r
     },\r
     {\r
-        "id": "9098a017.2895f8",\r
-        "type": "not-found",\r
-        "name": "not-found",\r
-        "xml": "<outcome value='not-found'>\n",\r
+        "id": "1a3ebd6b.2a7953",\r
+        "type": "save",\r
+        "name": "update vpn-binding A 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
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3319.4996452331543,\r
-        "y": 1155.000020980835,\r
-        "z": "15891279.d6b57e",\r
+        "x": 4091.5,\r
+        "y": 627,\r
+        "z": "fdc94a5e.7c86f8",\r
         "wires": [\r
-            [\r
-                "8b3e7b4d.6376a"\r
-            ]\r
+            []\r
         ]\r
     },\r
     {\r
-        "id": "8e10fa0e.d0c448",\r
-        "type": "other",\r
-        "name": "other",\r
-        "xml": "<outcome value='Other'>\n",\r
+        "id": "30c3e280.4d41f6",\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": 3311.4996452331543,\r
-        "y": 1195.000020980835,\r
-        "z": "15891279.d6b57e",\r
+        "x": 4018.5,\r
+        "y": 673,\r
+        "z": "fdc94a5e.7c86f8",\r
         "wires": [\r
-            [\r
-                "124616cb.e9eee9"\r
-            ]\r
+            []\r
         ]\r
     },\r
     {\r
-        "id": "124616cb.e9eee9",\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 esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",\r
-        "comments": "",\r
-        "x": 3469.4996452331543,\r
-        "y": 1195.000020980835,\r
-        "z": "15891279.d6b57e",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "8b3e7b4d.6376a",\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 esr-thirdparty-sdnc from AnAI with thirdparty-sdnc-id = ' + $tmp.thirdparty-sdnc-id`\" />\n\n",\r
-        "comments": "",\r
-        "x": 3469.4996452331543,\r
-        "y": 1155.000020980835,\r
-        "z": "15891279.d6b57e",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "ec0b6188.dc04e",\r
-        "type": "set",\r
-        "name": "set controller data",\r
-        "xml": "<set>\n<parameter name='prop.sdncRestApi.thirdpartySdnc.url' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].service-url`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.user' value=\"`$tmp.aai.esr-thirdparty-sdnc.esr-system-info-list.esr-system-info[0].user-name`\" />\n<parameter name='prop.sdncRestApi.thirdpartySdnc.password' value=\"`$tmp.aai.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": 3485.4996452331543,\r
-        "y": 1115.000020980835,\r
-        "z": "15891279.d6b57e",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "98e2fbb6.34e38",\r
-        "type": "comment",\r
-        "name": "Get controller info and send request",\r
-        "info": "",\r
-        "comments": "",\r
-        "x": 3077.4996452331543,\r
-        "y": 1115.000020980835,\r
-        "z": "15891279.d6b57e",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "758d1f74.6d4218",\r
-        "type": "comment",\r
-        "name": "TODO: FIXME:",\r
-        "info": "How to know which domain's (A or B) controller is bein retrieved?",\r
-        "comments": "",\r
-        "x": 3011.9996452331543,\r
-        "y": 1075.000020980835,\r
-        "z": "15891279.d6b57e",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "dcec496b.f92f38",\r
-        "type": "returnFailure",\r
-        "name": "return failure",\r
-        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create vpn rest api\" />\n",\r
-        "comments": "",\r
-        "x": 3677.4996452331543,\r
-        "y": 1302.000020980835,\r
-        "z": "15891279.d6b57e",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "43eceb78.82b2dc",\r
-        "type": "block",\r
-        "name": "block : atomic",\r
-        "xml": "<block atomic=\"true\">",\r
-        "atomic": "true",\r
+        "id": "14a01812.a7d138",\r
+        "type": "execute",\r
+        "name": "execute RestApiCallNode Create OTN tunnel with token",\r
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<!--<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-otn-src-domain-creation.templatefile`\" />-->\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.url + '/restconf/data/ietf-te:te/tunnels/tunnel=' + $tmp.aai.vpn-binding.vpn-id`\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domainA.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3680.9996452331543,\r
-        "y": 1342.000020980835,\r
-        "z": "15891279.d6b57e",\r
+        "x": 3228,\r
+        "y": 466,\r
+        "z": "fdc94a5e.7c86f8",\r
         "wires": [\r
             [\r
-                "a040c34e.71e608",\r
-                "29ceb3fa.1e4b14"\r
+                "8e721e50.020db",\r
+                "8f6c71d1.f7e258"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1acc213f.73169f",\r
-        "type": "comment",\r
-        "name": "TODO: FIXME",\r
-        "info": "use proper vpn-binding id and connectivity\n\nAlso, does CCSDK support \"update\" operation for vpn-binding and connectivity?",\r
-        "comments": "",\r
-        "x": 3878.9996452331543,\r
-        "y": 1299.000020980835,\r
-        "z": "15891279.d6b57e",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "a040c34e.71e608",\r
-        "type": "save",\r
-        "name": "update vpn-binding B resource (aka. OTN domainB) in AAI",\r
-        "xml": "<update plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.vpnName' >\n<parameter name='vpn-id' value='`$tmp.vpnName`' />\n<parameter name='vpn-name' value='`$tmp.vpnName`' />\n\n<parameter name='operational-status' value='DeActivated' />\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 4020.9996452331543,\r
-        "y": 1341.000020980835,\r
-        "z": "15891279.d6b57e",\r
-        "wires": [\r
-            []\r
-        ]\r
-    },\r
-    {\r
-        "id": "29ceb3fa.1e4b14",\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 = $prop.connectivity-domainA-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainA-uuid`' />\n<parameter name='operational-status' value='DeActivated' />\n",\r
+        "id": "8e721e50.020db",\r
+        "type": "failure",\r
+        "name": "failure",\r
+        "xml": "<outcome value='failure'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3949.9996452331543,\r
-        "y": 1390.000020980835,\r
-        "z": "15891279.d6b57e",\r
+        "x": 3560.5,\r
+        "y": 436,\r
+        "z": "fdc94a5e.7c86f8",\r
         "wires": [\r
-            []\r
+            [\r
+                "b94a74e8.509ec"\r
+            ]\r
         ]\r
     },\r
     {\r
-        "id": "ecca88b1.05406",\r
-        "type": "block",\r
-        "name": "block : atomic",\r
-        "xml": "<block atomic=\"true\">",\r
-        "atomic": "true",\r
+        "id": "8f6c71d1.f7e258",\r
+        "type": "success",\r
+        "name": "success",\r
+        "xml": "<outcome value='success'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3686.499755859375,\r
-        "y": 915,\r
-        "z": "15891279.d6b57e",\r
+        "x": 3565.5,\r
+        "y": 501,\r
+        "z": "fdc94a5e.7c86f8",\r
         "wires": [\r
             [\r
-                "f3cb9aac.524828",\r
-                "4b8d9e90.2bfc"\r
+                "e36acb2.364b538"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b872830e.e33218",\r
+        "id": "b94a74e8.509ec",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"Error executing Create vpn rest api\" />\n",\r
         "comments": "",\r
-        "x": 3682.999755859375,\r
-        "y": 875,\r
-        "z": "15891279.d6b57e",\r
+        "x": 3736.5,\r
+        "y": 436,\r
+        "z": "fdc94a5e.7c86f8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "270674fa.6cafe4",\r
-        "type": "comment",\r
-        "name": "TODO: FIXME",\r
-        "info": "use proper vpn-binding id and connectivity id\n\nAlso, does CCSDK support \"update\" operation for vpn-binding and connectivity?",\r
-        "comments": "",\r
-        "x": 3878.999755859375,\r
-        "y": 874,\r
-        "z": "15891279.d6b57e",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "f3cb9aac.524828",\r
-        "type": "save",\r
-        "name": "update vpn-binding A 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.vpnName' >\n<parameter name='vpn-id' value='`$tmp.vpnName`' />\n<parameter name='vpn-name' value='`$tmp.vpnName`' />\n\n<parameter name='operational-status' value='DeActivated' />\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 4014.999755859375,\r
-        "y": 915,\r
-        "z": "15891279.d6b57e",\r
-        "wires": [\r
-            []\r
-        ]\r
-    },\r
-    {\r
-        "id": "4b8d9e90.2bfc",\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 = $prop.connectivity-domainA-uuid'>\n<parameter name='connectivity-id' value='`$prop.connectivity-domainA-uuid`' />\n<parameter name='operational-status' value='DeActivated' />\n",\r
+        "id": "e36acb2.364b538",\r
+        "type": "block",\r
+        "name": "block : atomic",\r
+        "xml": "<block atomic=\"true\">",\r
+        "atomic": "true",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 3941.999755859375,\r
-        "y": 961,\r
-        "z": "15891279.d6b57e",\r
+        "x": 3732,\r
+        "y": 501,\r
+        "z": "fdc94a5e.7c86f8",\r
         "wires": [\r
             []\r
         ]\r