X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=platform-logic%2Fgeneric-resource-api%2Fsrc%2Fmain%2Fjson%2Ftrans_slicing%2FGENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-delete.json;h=1e28b0503d4dba2b22ebd3542ec4dd294a7a6098;hb=7231f26f523c65f8fa12d0ddc36c7988dacda8a2;hp=ae15591f3c37962b638d4ee56455a5d9667ed9d0;hpb=67331673496db788f450b8a3acfc8f268ded354f;p=sdnc%2Foam.git

diff --git a/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-delete.json b/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-delete.json
index ae15591f..1e28b050 100644
--- a/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-delete.json
+++ b/platform-logic/generic-resource-api/src/main/json/trans_slicing/GENERIC-RESOURCE-API_tsli-vnf-topology-operation-trans-slice-delete.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "fa505d09.c9298",
+        "id": "1ffbc02a.2de6d",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 106,
-        "y": 62,
-        "z": "b189bed1.bef5e8",
+        "x": 133,
+        "y": 76,
+        "z": "e2fe7a53.da009",
         "wires": [
             [
-                "96d975d7.ae7b9"
+                "74e0b2b2.75108c"
             ]
         ]
     },
     {
-        "id": "96d975d7.ae7b9",
+        "id": "74e0b2b2.75108c",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,1637 +22,1035 @@
         "comments": "",
         "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}'>",
         "outputs": 1,
-        "x": 390.2856903076172,
-        "y": 123.23810863494873,
-        "z": "b189bed1.bef5e8",
+        "x": 264.2856903076172,
+        "y": 125.23810863494873,
+        "z": "e2fe7a53.da009",
         "wires": [
             [
-                "197a98e4.ad38d7"
+                "f846ccbd.4406d8"
             ]
         ]
     },
     {
-        "id": "197a98e4.ad38d7",
+        "id": "f846ccbd.4406d8",
         "type": "method",
         "name": "method tsli-vnf-topology-operation-trans-slice-delete",
         "xml": "<method rpc='tsli-vnf-topology-operation-trans-slice-delete' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 396.42860412597656,
-        "y": 208.00003051757812,
-        "z": "b189bed1.bef5e8",
+        "x": 267.4286193847656,
+        "y": 210.00003242492676,
+        "z": "e2fe7a53.da009",
         "wires": [
             [
-                "eeba2d4.aaa3b5"
+                "dc51143b.674018"
             ]
         ]
     },
     {
-        "id": "9e471fb5.d24a9",
-        "type": "comment",
-        "name": "site-vnf-topology-operation-delete",
-        "info": "",
-        "comments": "",
-        "x": 968.9162979125977,
-        "y": 129.58639907836914,
-        "z": "b189bed1.bef5e8",
-        "wires": []
-    },
-    {
-        "id": "eeba2d4.aaa3b5",
+        "id": "dc51143b.674018",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 596.2380447387695,
-        "y": 357.6666717529297,
-        "z": "b189bed1.bef5e8",
-        "wires": [
-            [
-                "cdad3ccf.c778c8",
-                "ddca427c.b6135",
-                "16b5196b.e4f74f",
-                "72550323.add05c",
-                "bcb30576.c5395",
-                "1ee10a8.e75cb76",
-                "2400813d.b23cfe",
-                "466b59d1.1f9ec8",
-                "8fb031c0.32361",
-                "4290869b.c0e258",
-                "12c0646.e45499c"
-            ]
-        ]
-    },
-    {
-        "id": "72550323.add05c",
-        "type": "switchNode",
-        "name": "switch service-data.vnfs.vnf_length",
-        "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1048.6660919189453,
-        "y": 275.2611792087555,
-        "z": "b189bed1.bef5e8",
+        "x": 417.238037109375,
+        "y": 339.6666564941406,
+        "z": "e2fe7a53.da009",
         "wires": [
             [
-                "f1600d0.d3bcd7",
-                "5da847de.3e7bd8"
+                "45b2aaee.4a9d2c",
+                "3e78a125.3512fe",
+                "45ccee1d.26f07"
             ]
         ]
     },
     {
-        "id": "f1600d0.d3bcd7",
-        "type": "other",
-        "name": "outcome Null",
-        "xml": "<outcome value=''>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1313.3884048461914,
-        "y": 257.81680130958557,
-        "z": "b189bed1.bef5e8",
-        "wires": [
-            [
-                "2758e1f4.65c7de"
-            ]
-        ]
-    },
-    {
-        "id": "2758e1f4.65c7de",
-        "type": "returnFailure",
-        "name": "return failure",
-        "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",
-        "comments": "",
-        "x": 1494.3882751464844,
-        "y": 252.81667923927307,
-        "z": "b189bed1.bef5e8",
-        "wires": []
-    },
-    {
-        "id": "5da847de.3e7bd8",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1298.8884048461914,
-        "y": 309.81676411628723,
-        "z": "b189bed1.bef5e8",
-        "wires": [
-            [
-                "3d795ab1.0cafb6"
-            ]
-        ]
-    },
-    {
-        "id": "3d795ab1.0cafb6",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 1470.888111114502,
-        "y": 309.8167622089386,
-        "z": "b189bed1.bef5e8",
-        "wires": [
-            [
-                "ed865e4c.fb2fe",
-                "ef77d3e7.8772d"
-            ]
-        ]
-    },
-    {
-        "id": "ef77d3e7.8772d",
-        "type": "switchNode",
-        "name": "switch tmp.nidx ",
-        "xml": "<switch test=\"`$tmp.nidx`\">\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1645.888282775879,
-        "y": 328.81668400764465,
-        "z": "b189bed1.bef5e8",
-        "wires": [
-            [
-                "e8dd060b.17e57"
-            ]
-        ]
-    },
-    {
-        "id": "16b5196b.e4f74f",
-        "type": "switchNode",
-        "name": "switch vnf-level-oper-status",
-        "xml": "<switch test='`$service-data.vnfs.vnf[$tmp.nidx].vnf-data.vnf-level-oper-status.order-status`'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1019.0550918579102,
-        "y": 349.7056429386139,
-        "z": "b189bed1.bef5e8",
-        "wires": [
-            [
-                "284f50fc.866d8",
-                "cdf83757.65b4b8"
-            ]
-        ]
-    },
-    {
-        "id": "284f50fc.866d8",
-        "type": "outcome",
-        "name": "outcome PendingDelete",
-        "xml": "<outcome value='PendingDelete'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1295.8884353637695,
-        "y": 352.8167426586151,
-        "z": "b189bed1.bef5e8",
-        "wires": [
-            [
-                "e9cca7ec.303c7"
-            ]
-        ]
-    },
-    {
-        "id": "cdf83757.65b4b8",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1256.8884201049805,
-        "y": 398.8167917728424,
-        "z": "b189bed1.bef5e8",
-        "wires": [
-            [
-                "28762357.a03f74"
-            ]
-        ]
-    },
-    {
-        "id": "28762357.a03f74",
-        "type": "returnFailure",
-        "name": "return failure",
-        "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`\" />",
-        "comments": "",
-        "x": 1405.3881340026855,
-        "y": 397.81677174568176,
-        "z": "b189bed1.bef5e8",
-        "wires": []
-    },
-    {
-        "id": "bcb30576.c5395",
-        "type": "execute",
-        "name": "execute requiredParameters",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='requiredParameters' >\n<parameter name=\"vnf-topology-operation-input.vnf-information.vnf-id\" value=\"$vnf-topology-operation-input.vnf-information.vnf-id\"/>\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1035.388427734375,
-        "y": 218.8167588710785,
-        "z": "b189bed1.bef5e8",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "ed865e4c.fb2fe",
-        "type": "for",
-        "name": "for nidx..service-data.vnfs.vnf[]",
-        "xml": "<for index='nidx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1706.3882865905762,
-        "y": 264.8166801929474,
-        "z": "b189bed1.bef5e8",
-        "wires": [
-            [
-                "5b03bf9c.f15f28"
-            ]
-        ]
-    },
-    {
-        "id": "5b03bf9c.f15f28",
-        "type": "switchNode",
-        "name": "switch vnf-id found",
-        "xml": "<switch test=\"`$service-data.vnfs.vnf[$nidx].vnf-id == $vnf-topology-operation-input.vnf-information.vnf-id`\">\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1962.3883056640625,
-        "y": 264.8166801929474,
-        "z": "b189bed1.bef5e8",
-        "wires": [
-            [
-                "b0289fb.f82296"
-            ]
-        ]
-    },
-    {
-        "id": "b0289fb.f82296",
-        "type": "outcomeTrue",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2138.888359069824,
-        "y": 267.8166801929474,
-        "z": "b189bed1.bef5e8",
-        "wires": [
-            [
-                "772109f8.0b899"
-            ]
-        ]
-    },
-    {
-        "id": "772109f8.0b899",
-        "type": "set",
-        "name": "set tmp.nidx and ctx.vnf-data",
-        "xml": "<set>\n<parameter name='tmp.nidx' value='`$nidx`' />\n<parameter name='ctx.vnf-data.' value='`$service-data.vnfs.vnf[$nidx].vnf-data.`' />\n",
-        "comments": "",
-        "x": 2305.8883743286133,
-        "y": 328.8166801929474,
-        "z": "b189bed1.bef5e8",
-        "wires": []
-    },
-    {
-        "id": "68963ea5.a81b48",
-        "type": "returnFailure",
-        "name": "return failure",
-        "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",
-        "comments": "",
-        "x": 1951.388298034668,
-        "y": 328.81668400764465,
-        "z": "b189bed1.bef5e8",
-        "wires": []
-    },
-    {
-        "id": "e8dd060b.17e57",
-        "type": "outcome",
-        "name": "NULL",
-        "xml": "<outcome value=''>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1813.888298034668,
-        "y": 328.81668400764465,
-        "z": "b189bed1.bef5e8",
-        "wires": [
-            [
-                "68963ea5.a81b48"
-            ]
-        ]
-    },
-    {
-        "id": "cdad3ccf.c778c8",
-        "type": "set",
-        "name": "set vnfId and vnf-object-path",
-        "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/'\n + $vnf-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'` \" />",
-        "comments": "",
-        "x": 1005.9051132202148,
-        "y": 564.3336856365204,
-        "z": "b189bed1.bef5e8",
-        "wires": []
-    },
-    {
-        "id": "ddca427c.b6135",
+        "id": "45b2aaee.4a9d2c",
         "type": "returnSuccess",
         "name": "return success",
         "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",
         "comments": "",
-        "x": 906.0162353515625,
-        "y": 1435.88916015625,
-        "z": "b189bed1.bef5e8",
-        "wires": []
-    },
-    {
-        "id": "e9cca7ec.303c7",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 1491.1947937011719,
-        "y": 360.14194798469543,
-        "z": "b189bed1.bef5e8",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "1ee10a8.e75cb76",
-        "type": "set",
-        "name": "set prop.vnfNewidx",
-        "xml": "<set>\n<parameter name='prop.vnfidxLen' value='`0`' />\n",
-        "comments": "",
-        "x": 988.0000839233398,
-        "y": 400.00007796287537,
-        "z": "b189bed1.bef5e8",
+        "x": 713.5716552734375,
+        "y": 616.59716796875,
+        "z": "e2fe7a53.da009",
         "wires": []
     },
     {
-        "id": "2400813d.b23cfe",
-        "type": "for",
-        "name": "for lidx..service-data.vnfs.vnf[]",
-        "xml": "<for index='lidx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1012.0000686645508,
-        "y": 442.0000765323639,
-        "z": "b189bed1.bef5e8",
-        "wires": [
-            [
-                "572dbcf2.896d3c"
-            ]
-        ]
-    },
-    {
-        "id": "572dbcf2.896d3c",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 1273.000144958496,
-        "y": 446.00011134147644,
-        "z": "b189bed1.bef5e8",
-        "wires": [
-            [
-                "53356e5d.7d71c"
-            ]
-        ]
-    },
-    {
-        "id": "53356e5d.7d71c",
-        "type": "switchNode",
-        "name": "switch vnf-id found",
-        "xml": "<switch test=\"`$service-data.vnfs.vnf[$lidx].vnf-id == $vnf-topology-operation-input.vnf-information.vnf-id`\">\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1465.0000915527344,
-        "y": 455.00015568733215,
-        "z": "b189bed1.bef5e8",
-        "wires": [
-            [
-                "82733dd2.3a7d"
-            ]
-        ]
-    },
-    {
-        "id": "82733dd2.3a7d",
-        "type": "outcomeFalse",
-        "name": "false",
-        "xml": "<outcome value='false'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1651.0001068115234,
-        "y": 439.0000422000885,
-        "z": "b189bed1.bef5e8",
-        "wires": [
-            [
-                "d7f72ca.5dc4ed"
-            ]
-        ]
-    },
-    {
-        "id": "d7f72ca.5dc4ed",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 1802.0000305175781,
-        "y": 440.0000784397125,
-        "z": "b189bed1.bef5e8",
-        "wires": [
-            [
-                "920da24f.169358",
-                "953950.d86c6eb"
-            ]
-        ]
-    },
-    {
-        "id": "920da24f.169358",
-        "type": "set",
-        "name": "set  vnf data",
-        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$prop.vnfidxLen].vnf-id' value='`$service-data.vnfs.vnf[$lidx].vnf-id`' />\n<parameter name='service-data.vnfs.vnf[$prop.vnfidxLen].vnf-data.' value='`$service-data.vnfs.vnf[$lidx].vnf-data.`' />\n",
-        "comments": "",
-        "x": 1969.0001983642578,
-        "y": 414.00026202201843,
-        "z": "b189bed1.bef5e8",
-        "wires": []
-    },
-    {
-        "id": "953950.d86c6eb",
-        "type": "set",
-        "name": "set prop.vnfNewidx",
-        "xml": "<set>\n<parameter name='prop.vnfidxLen' value='`$prop.vnfidxLen + 1`' />\n",
-        "comments": "",
-        "x": 1989.0001258850098,
-        "y": 471.0001976490021,
-        "z": "b189bed1.bef5e8",
-        "wires": []
-    },
-    {
-        "id": "466b59d1.1f9ec8",
-        "type": "set",
-        "name": "set new vnf length",
-        "xml": "<set>\n\t<parameter name=\"service-data.vnfs.vnf_length\" value='`$prop.vnfidxLen`'/>\n\n\t\n",
-        "comments": "",
-        "x": 980.1014823913574,
-        "y": 485.804429769516,
-        "z": "b189bed1.bef5e8",
-        "wires": []
-    },
-    {
-        "id": "8fb031c0.32361",
-        "type": "set",
-        "name": "Remove vnf from ServiceData",
-        "xml": "<set>\n\t<parameter name=\"service-data.vnfs.vnf[$prop.vnfidxLen].\" value=\"\"/>\n\n",
-        "comments": "",
-        "x": 1010.0002517700195,
-        "y": 524.0002129077911,
-        "z": "b189bed1.bef5e8",
-        "wires": []
-    },
-    {
-        "id": "4290869b.c0e258",
-        "type": "save",
-        "name": "delete AnAI - vnf-instance.orchestration-status",
-        "xml": "<delete 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\" />\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 1067.0066452026367,
-        "y": 601.0106251239777,
-        "z": "b189bed1.bef5e8",
-        "wires": [
-            []
-        ]
-    },
-    {
-        "id": "740c712e.7b0a18",
+        "id": "9ea4d60.c51a0a8",
         "type": "comment",
         "name": "new for TransportSlicing",
         "info": "",
         "comments": "",
-        "x": 1001,
-        "y": 735,
-        "z": "b189bed1.bef5e8",
+        "x": 745,
+        "y": 291,
+        "z": "e2fe7a53.da009",
         "wires": []
     },
     {
-        "id": "12c0646.e45499c",
+        "id": "3e78a125.3512fe",
         "type": "save",
         "name": "get service-instance from aai",
-        "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\">",
+        "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\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-->",
         "comments": "",
         "outputs": 1,
-        "x": 1012,
-        "y": 785,
-        "z": "b189bed1.bef5e8",
+        "x": 765,
+        "y": 387,
+        "z": "e2fe7a53.da009",
         "wires": [
             [
-                "f9064279.1b4f8",
-                "17f4eefe.af8569",
-                "e0ea0e9c.c1ac38"
+                "86ee6067.0c17a8",
+                "bf4bb2c3.815168",
+                "ac6196ae.1ef19"
             ]
         ]
     },
     {
-        "id": "f9064279.1b4f8",
+        "id": "86ee6067.0c17a8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1228,
-        "y": 750,
-        "z": "b189bed1.bef5e8",
+        "x": 984,
+        "y": 325,
+        "z": "e2fe7a53.da009",
         "wires": [
             [
-                "7baaa7aa.36e958"
+                "eb95b4de.4ca18"
             ]
         ]
     },
     {
-        "id": "17f4eefe.af8569",
+        "id": "bf4bb2c3.815168",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1237.490966796875,
-        "y": 792.5740356445312,
-        "z": "b189bed1.bef5e8",
+        "x": 993.490966796875,
+        "y": 367.57403564453125,
+        "z": "e2fe7a53.da009",
         "wires": [
             [
-                "48a0edde.3f94f4"
+                "4da0ff5c.9fdf8"
             ]
         ]
     },
     {
-        "id": "e0ea0e9c.c1ac38",
+        "id": "ac6196ae.1ef19",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1226,
-        "y": 839,
-        "z": "b189bed1.bef5e8",
+        "x": 982,
+        "y": 414,
+        "z": "e2fe7a53.da009",
         "wires": [
             [
-                "b71eb698.9367c8"
+                "49170b5b.8b327c"
             ]
         ]
     },
     {
-        "id": "48a0edde.3f94f4",
+        "id": "4da0ff5c.9fdf8",
         "type": "returnFailure",
         "name": "return failure",
         "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",
         "comments": "",
-        "x": 1391.0623779296875,
-        "y": 795.8597717285156,
-        "z": "b189bed1.bef5e8",
+        "x": 1147.0623779296875,
+        "y": 370.8597717285156,
+        "z": "e2fe7a53.da009",
         "wires": []
     },
     {
-        "id": "b71eb698.9367c8",
+        "id": "49170b5b.8b327c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 1395,
-        "y": 840,
-        "z": "b189bed1.bef5e8",
+        "x": 1151,
+        "y": 415,
+        "z": "e2fe7a53.da009",
         "wires": []
     },
     {
-        "id": "7baaa7aa.36e958",
+        "id": "eb95b4de.4ca18",
         "type": "for",
         "name": "for each relationship",
         "xml": "<for index='rel-index' start='0' end='`$tmp.aai.service-instance.relationship-list.relationship_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 1425,
-        "y": 746,
-        "z": "b189bed1.bef5e8",
+        "x": 1181,
+        "y": 321,
+        "z": "e2fe7a53.da009",
         "wires": [
             [
-                "7f9e9a3e.4de224"
+                "4f2c512c.91fb8"
             ]
         ]
     },
     {
-        "id": "7f9e9a3e.4de224",
+        "id": "4f2c512c.91fb8",
         "type": "switchNode",
         "name": "switch related-to",
         "xml": "<switch test='`$tmp.aai.service-instance.relationship-list.relationship[$rel-index].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1648.33349609375,
-        "y": 745.9999389648438,
-        "z": "b189bed1.bef5e8",
+        "x": 1404.33349609375,
+        "y": 320.99993896484375,
+        "z": "e2fe7a53.da009",
         "wires": [
             [
-                "316daf9e.190dc"
+                "fa463b5.38a29c8"
             ]
         ]
     },
     {
-        "id": "316daf9e.190dc",
+        "id": "fa463b5.38a29c8",
         "type": "outcome",
         "name": "connectivity",
         "xml": "<outcome value='connectivity'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1844,
-        "y": 748,
-        "z": "b189bed1.bef5e8",
+        "x": 1605.0001335144043,
+        "y": 322.00002098083496,
+        "z": "e2fe7a53.da009",
         "wires": [
             [
-                "d510feb6.348d7"
+                "e51d2b5.f353758"
             ]
         ]
     },
     {
-        "id": "d510feb6.348d7",
-        "type": "switchNode",
-        "name": "switch $rel-index == 0",
-        "xml": "<switch test=\"`$rel-index == 0`\">\n\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2031.9998664855957,
-        "y": 745.999979019165,
-        "z": "b189bed1.bef5e8",
-        "wires": [
-            [
-                "71f2cf8d.3a35e",
-                "264b9f2.1aba9e"
-            ]
-        ]
-    },
-    {
-        "id": "71f2cf8d.3a35e",
-        "type": "outcomeTrue",
-        "name": "true",
-        "xml": "<outcome value='true'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2254.9998664855957,
-        "y": 635.999979019165,
-        "z": "b189bed1.bef5e8",
-        "wires": [
-            [
-                "c924f778.a2b848"
-            ]
-        ]
-    },
-    {
-        "id": "264b9f2.1aba9e",
-        "type": "outcomeFalse",
-        "name": "false",
-        "xml": "<outcome value='false'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2225.999755859375,
-        "y": 1062,
-        "z": "b189bed1.bef5e8",
-        "wires": [
-            [
-                "beac7966.aff0e"
-            ]
-        ]
-    },
-    {
-        "id": "c924f778.a2b848",
-        "type": "save",
-        "name": "get connectivityA from aai",
-        "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",
-        "comments": "",
-        "outputs": 1,
-        "x": 2448.9998664855957,
-        "y": 635.999979019165,
-        "z": "b189bed1.bef5e8",
-        "wires": [
-            [
-                "b8d26364.3207e8",
-                "ce782cd0.462e9",
-                "c0db2841.2c9108"
-            ]
-        ]
-    },
-    {
-        "id": "beac7966.aff0e",
-        "type": "save",
-        "name": "get connectivityB from aai",
-        "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",
-        "comments": "",
-        "outputs": 1,
-        "x": 2421.999755859375,
-        "y": 1062,
-        "z": "b189bed1.bef5e8",
-        "wires": [
-            [
-                "e783575a.ee3408",
-                "f2d51460.33b19",
-                "7c2969db.4e66a"
-            ]
-        ]
-    },
-    {
-        "id": "b8d26364.3207e8",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2654.9998664855957,
-        "y": 595.999979019165,
-        "z": "b189bed1.bef5e8",
-        "wires": [
-            [
-                "888a4917.61b98"
-            ]
-        ]
-    },
-    {
-        "id": "ce782cd0.462e9",
-        "type": "not-found",
-        "name": "not-found",
-        "xml": "<outcome value='not-found'>\n",
-        "comments": "",
-        "outputs": 1,
-        "x": 2655.4908332824707,
-        "y": 641.5740146636963,
-        "z": "b189bed1.bef5e8",
-        "wires": [
-            [
-                "a71edbbe.5f5c18"
-            ]
-        ]
-    },
-    {
-        "id": "c0db2841.2c9108",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
+        "id": "45ccee1d.26f07",
+        "type": "execute",
+        "name": "execute properties",
+        "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' />",
         "comments": "",
         "outputs": 1,
-        "x": 2652.9998664855957,
-        "y": 684.999979019165,
-        "z": "b189bed1.bef5e8",
+        "x": 731,
+        "y": 335,
+        "z": "e2fe7a53.da009",
         "wires": [
-            [
-                "a3da676a.d60b68"
-            ]
-        ]
-    },
-    {
-        "id": "888a4917.61b98",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 2827.6663703918457,
-        "y": 594.999979019165,
-        "z": "b189bed1.bef5e8",
-        "wires": [
-            [
-                "e61d24fe.b9f57"
-            ]
+            []
         ]
     },
     {
-        "id": "a71edbbe.5f5c18",
-        "type": "returnFailure",
-        "name": "return failure",
-        "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",
-        "comments": "",
-        "x": 2818.062244415283,
-        "y": 641.8597507476807,
-        "z": "b189bed1.bef5e8",
-        "wires": []
-    },
-    {
-        "id": "a3da676a.d60b68",
-        "type": "returnFailure",
-        "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+        "id": "e51d2b5.f353758",
+        "type": "save",
+        "name": "get connectivity from aai",
+        "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",
         "comments": "",
-        "x": 2821.9998664855957,
-        "y": 685.999979019165,
-        "z": "b189bed1.bef5e8",
-        "wires": []
+        "outputs": 1,
+        "x": 1843,
+        "y": 324,
+        "z": "e2fe7a53.da009",
+        "wires": [
+            [
+                "bd96538d.fc9d98",
+                "d296a5a5.03f2d8",
+                "59d0b561.049ff4"
+            ]
+        ]
     },
     {
-        "id": "e783575a.ee3408",
+        "id": "bd96538d.fc9d98",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2641.999755859375,
-        "y": 1033,
-        "z": "b189bed1.bef5e8",
+        "x": 2051,
+        "y": 288,
+        "z": "e2fe7a53.da009",
         "wires": [
             [
-                "589b1078.8544c"
+                "a935f75b.7b8ae8"
             ]
         ]
     },
     {
-        "id": "f2d51460.33b19",
+        "id": "d296a5a5.03f2d8",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2643.49072265625,
-        "y": 1078.5740356445312,
-        "z": "b189bed1.bef5e8",
+        "x": 2051.490966796875,
+        "y": 333.57403564453125,
+        "z": "e2fe7a53.da009",
         "wires": [
             [
-                "41e63be3.fadc5c"
+                "b4d9ea13.dc5c6"
             ]
         ]
     },
     {
-        "id": "7c2969db.4e66a",
+        "id": "59d0b561.049ff4",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2639.999755859375,
-        "y": 1124,
-        "z": "b189bed1.bef5e8",
-        "wires": [
-            [
-                "2d54d7a1.ac5068"
-            ]
-        ]
-    },
-    {
-        "id": "589b1078.8544c",
-        "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
-        "outputs": 1,
-        "x": 2814.666259765625,
-        "y": 1034,
-        "z": "b189bed1.bef5e8",
+        "x": 2049,
+        "y": 377,
+        "z": "e2fe7a53.da009",
         "wires": [
             [
-                "be4e9140.d69b68"
+                "cc59ead5.ab58f"
             ]
         ]
     },
     {
-        "id": "41e63be3.fadc5c",
+        "id": "b4d9ea13.dc5c6",
         "type": "returnFailure",
         "name": "return failure",
         "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",
         "comments": "",
-        "x": 2805.0621337890625,
-        "y": 1080.8597717285156,
-        "z": "b189bed1.bef5e8",
+        "x": 2214.0623779296875,
+        "y": 333.8597717285156,
+        "z": "e2fe7a53.da009",
         "wires": []
     },
     {
-        "id": "2d54d7a1.ac5068",
+        "id": "cc59ead5.ab58f",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 2808.999755859375,
-        "y": 1125,
-        "z": "b189bed1.bef5e8",
+        "x": 2218,
+        "y": 378,
+        "z": "e2fe7a53.da009",
         "wires": []
     },
     {
-        "id": "e61d24fe.b9f57",
+        "id": "2055e9c.9575d16",
         "type": "save",
-        "name": "get vpn-binding-A from aai",
-        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-binding\"\n\t    key=\"vpn-binding.vpn-id = $tmp.aai.connectivityA.relationship-list.relationship[0].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.vpn-bindingA\" >\n",
+        "name": "get vpn-binding from aai",
+        "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",
         "comments": "",
         "outputs": 1,
-        "x": 3047,
-        "y": 579,
-        "z": "b189bed1.bef5e8",
+        "x": 2524,
+        "y": 377,
+        "z": "e2fe7a53.da009",
         "wires": [
             [
-                "2b60392e.ff6d9e",
-                "49846022.e395b8",
-                "b35a5936.c908e8"
+                "1719bc42.5de0cc",
+                "b2907373.b3b1a",
+                "fb17b477.f9109"
             ]
         ]
     },
     {
-        "id": "abc0c7ad.b5acd8",
+        "id": "c87f5113.e0af38",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 3431,
-        "y": 579,
-        "z": "b189bed1.bef5e8",
+        "x": 2908,
+        "y": 377,
+        "z": "e2fe7a53.da009",
         "wires": [
             [
-                "4263af43.fa9c48",
-                "196f2286.5bda85",
-                "e474491b.fe4e98",
-                "f4710eb9.81bb",
-                "4d26fd5b.dd7194"
+                "1985ee34.d96bba",
+                "52698c53.01b1dc",
+                "6e17a44c.f8e15c",
+                "9562cdef.811fc8",
+                "51f18b3b.809efc",
+                "9405a159.40925",
+                "e776447c.da84c8"
             ]
         ]
     },
     {
-        "id": "4263af43.fa9c48",
-        "type": "set",
-        "name": "set attachment_param for TN NSSSI deleteion in PNC A",
-        "xml": "<set>\n<parameter name='ietf-te_te.tunnels.tunnel[0].source' value='`$tmp.aai.vpn-bindingA.access-node-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].destination' value='`$tmp.aai.vpn-bindingA.dst-access-node-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].dst-ttp-id' value='`$tmp.aai.vpn-bindingA.dst-access-ltp-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].ietf-otn-tunnel_dst-tpn' value='' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.client-id' value='`$tmp.aai.vpn-bindingA.access-client-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.provider-id' value='`$tmp.aai.vpn-bindingA.access-provider-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.topology-id' value='`$tmp.aai.vpn-bindingA.access-topology-id`' />\n\n<parameter name='ietf-te_te.tunnels.tunnel[1].source' value='`$tmp.aai.vpn-bindingA.access-node-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[1].destination' value='`$tmp.aai.vpn-bindingA.dst-access-node-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[1].name' value='tptunnel-22' />\n<parameter name='ietf-te_te.tunnels.tunnel[1].dependency-tunnels.dependency-tunnel[0].name' value='`$tmp.aai.vpn-bindingA.vpn-name`' />\n\n<parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.client-id' value='`$tmp.aai.vpn-bindingA.access-client-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.provider-id' value='`$tmp.aai.vpn-bindingA.access-provider-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.topology-id' value='`$tmp.aai.vpn-bindingA.access-topology-id`' />\n\n",
-        "comments": "",
-        "x": 3783,
-        "y": 572,
-        "z": "b189bed1.bef5e8",
-        "wires": []
-    },
-    {
-        "id": "2b60392e.ff6d9e",
+        "id": "1719bc42.5de0cc",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3258,
-        "y": 581,
-        "z": "b189bed1.bef5e8",
+        "x": 2735,
+        "y": 379,
+        "z": "e2fe7a53.da009",
         "wires": [
             [
-                "abc0c7ad.b5acd8"
+                "c87f5113.e0af38"
             ]
         ]
     },
     {
-        "id": "49846022.e395b8",
+        "id": "b2907373.b3b1a",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3258.490966796875,
-        "y": 626.5740356445312,
-        "z": "b189bed1.bef5e8",
+        "x": 2735.490966796875,
+        "y": 424.57403564453125,
+        "z": "e2fe7a53.da009",
         "wires": [
             [
-                "df7bab95.4da49"
+                "34c1a665.03471a"
             ]
         ]
     },
     {
-        "id": "b35a5936.c908e8",
+        "id": "fb17b477.f9109",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3256,
-        "y": 670,
-        "z": "b189bed1.bef5e8",
+        "x": 2733,
+        "y": 468,
+        "z": "e2fe7a53.da009",
         "wires": [
             [
-                "2e3ee94d.2c9d76"
+                "8d4bf215.03d04"
             ]
         ]
     },
     {
-        "id": "2e3ee94d.2c9d76",
+        "id": "8d4bf215.03d04",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
         "comments": "",
-        "x": 3423,
-        "y": 669,
-        "z": "b189bed1.bef5e8",
+        "x": 2900,
+        "y": 467,
+        "z": "e2fe7a53.da009",
         "wires": []
     },
     {
-        "id": "df7bab95.4da49",
+        "id": "34c1a665.03471a",
         "type": "returnFailure",
         "name": "return failure",
         "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",
         "comments": "",
-        "x": 3421.0623779296875,
-        "y": 626.8597717285156,
-        "z": "b189bed1.bef5e8",
+        "x": 2898.0623779296875,
+        "y": 424.8597717285156,
+        "z": "e2fe7a53.da009",
         "wires": []
     },
     {
-        "id": "4d26fd5b.dd7194",
-        "type": "execute",
-        "name": "execute RestApiCallNode Delete TN NSSI",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sotn-otn-tunnel-service.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-te:te'`\" />\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=\"patch\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<!--<parameter name='dirPath' value=\"/opt/sdnc/restapi/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<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
+        "id": "a935f75b.7b8ae8",
+        "type": "for",
+        "name": "for each relationship",
+        "xml": "<for silentFailure='true' index='cridx' start='0' end='`$tmp.aai.connectivity.relationship-list.relationship_length`' >\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 3739,
-        "y": 623,
-        "z": "b189bed1.bef5e8",
+        "x": 2252,
+        "y": 283,
+        "z": "e2fe7a53.da009",
         "wires": [
             [
-                "1605b46c.2a0984",
-                "49599f6.eb505e"
+                "67091bed.864304"
             ]
         ]
     },
     {
-        "id": "1605b46c.2a0984",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
+        "id": "67091bed.864304",
+        "type": "switchNode",
+        "name": "switch related-to",
+        "xml": "<switch test='`$tmp.aai.connectivity.relationship-list.relationship[$cridx].related-to`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4086.5,
-        "y": 593,
-        "z": "b189bed1.bef5e8",
+        "x": 2457,
+        "y": 283,
+        "z": "e2fe7a53.da009",
         "wires": [
             [
-                "c35b0230.a333b8"
+                "4e4ac25c.008624"
             ]
         ]
     },
     {
-        "id": "49599f6.eb505e",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
+        "id": "4e4ac25c.008624",
+        "type": "outcome",
+        "name": "vpn-binding",
+        "xml": "<outcome value='vpn-binding'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4101.5,
-        "y": 658,
-        "z": "b189bed1.bef5e8",
+        "x": 2623,
+        "y": 283,
+        "z": "e2fe7a53.da009",
         "wires": [
             [
-                "c575a6f8.585bd8"
+                "7c62e56b.ccfd7c"
             ]
         ]
     },
     {
-        "id": "c35b0230.a333b8",
-        "type": "returnFailure",
-        "name": "return failure",
-        "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",
-        "comments": "",
-        "x": 4270.5,
-        "y": 589,
-        "z": "b189bed1.bef5e8",
-        "wires": []
-    },
-    {
-        "id": "c575a6f8.585bd8",
+        "id": "7c62e56b.ccfd7c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
-        "comments": "",
         "outputs": 1,
-        "x": 4296,
-        "y": 651,
-        "z": "b189bed1.bef5e8",
+        "x": 2786,
+        "y": 283,
+        "z": "e2fe7a53.da009",
         "wires": [
-            []
+            [
+                "2055e9c.9575d16"
+            ]
         ]
     },
     {
-        "id": "196f2286.5bda85",
+        "id": "1985ee34.d96bba",
+        "type": "set",
+        "name": "set pnf-name",
+        "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",
+        "comments": "",
+        "x": 3123,
+        "y": 87,
+        "z": "e2fe7a53.da009",
+        "wires": []
+    },
+    {
+        "id": "52698c53.01b1dc",
         "type": "get-resource",
-        "name": "get-resource esr-thirdparty-sdnc",
-        "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",
+        "name": "get-resource src pnf",
+        "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",
         "comments": "",
         "outputs": 1,
-        "x": 3734,
-        "y": 444,
-        "z": "b189bed1.bef5e8",
+        "x": 3149,
+        "y": 204,
+        "z": "e2fe7a53.da009",
         "wires": [
             [
-                "1da34d03.94651b",
-                "c42b64ae.aaab8",
-                "25d5725f.b07fee"
+                "df3dfd24.e7243",
+                "21f9901e.5c5cb",
+                "23d5d99c.1069c6"
             ]
         ]
     },
     {
-        "id": "1da34d03.94651b",
+        "id": "df3dfd24.e7243",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3980,
-        "y": 404,
-        "z": "b189bed1.bef5e8",
+        "x": 3344.5001220703125,
+        "y": 156,
+        "z": "e2fe7a53.da009",
         "wires": [
             [
-                "6e678297.9224ac"
+                "b45e1015.15138"
             ]
         ]
     },
     {
-        "id": "c42b64ae.aaab8",
+        "id": "21f9901e.5c5cb",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3984,
-        "y": 444,
-        "z": "b189bed1.bef5e8",
+        "x": 3336.5001220703125,
+        "y": 211,
+        "z": "e2fe7a53.da009",
         "wires": [
             [
-                "96b16b61.297a58"
+                "77f6a688.81ce38"
             ]
         ]
     },
     {
-        "id": "25d5725f.b07fee",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
+        "id": "b45e1015.15138",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 3976,
-        "y": 484,
-        "z": "b189bed1.bef5e8",
+        "x": 3488.8824462890625,
+        "y": 155.65567016601562,
+        "z": "e2fe7a53.da009",
         "wires": [
             [
-                "8951a2c3.b71c18"
+                "a3edca1c.ba087"
             ]
         ]
     },
     {
-        "id": "8951a2c3.b71c18",
-        "type": "returnFailure",
-        "name": "return failure",
-        "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",
-        "comments": "",
-        "x": 4134,
-        "y": 484,
-        "z": "b189bed1.bef5e8",
-        "wires": []
-    },
-    {
-        "id": "96b16b61.297a58",
-        "type": "returnFailure",
-        "name": "return failure",
-        "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",
+        "id": "a3edca1c.ba087",
+        "type": "for",
+        "name": "for each relationship",
+        "xml": "<for silentFailure='true' index='spvidx' start='0' end='`$tmp.aai.source-pnf.relationship-list.relationship_length`' >\n",
         "comments": "",
-        "x": 4134,
-        "y": 444,
-        "z": "b189bed1.bef5e8",
-        "wires": []
+        "outputs": 1,
+        "x": 3673,
+        "y": 154,
+        "z": "e2fe7a53.da009",
+        "wires": [
+            [
+                "db4aebfd.10c0f"
+            ]
+        ]
     },
     {
-        "id": "6e678297.9224ac",
-        "type": "set",
-        "name": "set controller data",
-        "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",
+        "id": "db4aebfd.10c0f",
+        "type": "switchNode",
+        "name": "switch related-to",
+        "xml": "<switch test='`$tmp.aai.source-pnf.relationship-list.relationship[$spvidx].related-to`'>\n",
         "comments": "",
-        "x": 4150,
-        "y": 404,
-        "z": "b189bed1.bef5e8",
-        "wires": []
+        "outputs": 1,
+        "x": 3868,
+        "y": 154,
+        "z": "e2fe7a53.da009",
+        "wires": [
+            [
+                "47e44765.fd9158"
+            ]
+        ]
     },
     {
-        "id": "7ef0083.0af5478",
-        "type": "comment",
-        "name": "Get controller info and send request",
-        "info": "",
+        "id": "23d5d99c.1069c6",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
         "comments": "",
-        "x": 3742,
-        "y": 404,
-        "z": "b189bed1.bef5e8",
-        "wires": []
+        "outputs": 1,
+        "x": 3341.5001220703125,
+        "y": 268,
+        "z": "e2fe7a53.da009",
+        "wires": [
+            [
+                "4952922a.0e6edc"
+            ]
+        ]
     },
     {
-        "id": "3d0f709d.f526f8",
-        "type": "comment",
-        "name": "TODO: FIXME:",
-        "info": "How to know which domain's (A or B) controller is bein retrieved?",
+        "id": "4952922a.0e6edc",
+        "type": "returnFailure",
+        "name": "return failure",
+        "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",
         "comments": "",
-        "x": 3674,
-        "y": 364,
-        "z": "b189bed1.bef5e8",
+        "x": 3493.5001220703125,
+        "y": 269,
+        "z": "e2fe7a53.da009",
         "wires": []
     },
     {
-        "id": "744d9a2e.8e773c",
-        "type": "comment",
-        "name": "TODO: FIXME:",
-        "info": "Set proper values to generate a good JSON body to be sent to PNC A for TN NSSI deletion.",
+        "id": "77f6a688.81ce38",
+        "type": "returnFailure",
+        "name": "return failure",
+        "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",
         "comments": "",
-        "x": 3654,
-        "y": 528,
-        "z": "b189bed1.bef5e8",
+        "x": 3504.5001220703125,
+        "y": 212,
+        "z": "e2fe7a53.da009",
         "wires": []
     },
     {
-        "id": "e474491b.fe4e98",
-        "type": "save",
-        "name": "delete connectivity resource in AAI",
-        "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.connectivityA.connectivity-id'>\n",
+        "id": "fa4dfe6b.cee79",
+        "type": "execute",
+        "name": "get esr-thirdparty-sdnc",
+        "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' >",
         "comments": "",
         "outputs": 1,
-        "x": 3711,
-        "y": 715,
-        "z": "b189bed1.bef5e8",
+        "x": 4456,
+        "y": 171,
+        "z": "e2fe7a53.da009",
         "wires": [
-            []
+            [
+                "cbb209f7.a6664",
+                "74e5e9b0.d9729",
+                "a328bb91.cda89"
+            ]
         ]
     },
     {
-        "id": "47618fca.ed7b18",
-        "type": "comment",
-        "name": "TODO: FIXME",
-        "info": "using the output of regex string arrays,\nconcatinate index 0 to index[?] all together\nin order to assemble the correct values for provider-id, \ntopology-id, node-id, etc.",
-        "comments": "",
-        "x": 3646,
-        "y": 681,
-        "z": "b189bed1.bef5e8",
-        "wires": []
-    },
-    {
-        "id": "f4710eb9.81bb",
-        "type": "save",
-        "name": "delete vpn-binding resource in AAI",
-        "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='tmp.aai.vpn-bindingA = $tmp.aai.vpn-bindingA'>\n",
-        "comments": "",
+        "id": "3f03e2fb.b5f81e",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
         "outputs": 1,
-        "x": 3707,
-        "y": 759,
-        "z": "b189bed1.bef5e8",
+        "x": 4250,
+        "y": 158,
+        "z": "e2fe7a53.da009",
         "wires": [
-            []
+            [
+                "8d9a188f.1a7a4",
+                "fa4dfe6b.cee79",
+                "920b64ba.47efa"
+            ]
         ]
     },
     {
-        "id": "be4e9140.d69b68",
-        "type": "save",
-        "name": "get vpn-binding-B from aai",
-        "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"vpn-binding\"\n\t    key=\"vpn-binding.vpn-id = $tmp.aai.connectivityB.relationship-list.relationship[0].relationship-data[0].relationship-value\"\n\t\tlocal-only=\"false\" \n\t\tpfx=\"tmp.aai.vpn-bindingB\" >\n",
+        "id": "8d9a188f.1a7a4",
+        "type": "set",
+        "name": "set esr-thirdparty-sdnc domain id",
+        "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",
         "comments": "",
-        "outputs": 1,
-        "x": 3079,
-        "y": 1027,
-        "z": "b189bed1.bef5e8",
-        "wires": [
-            [
-                "ef723c11.8ecf08",
-                "d24eb3b1.82784",
-                "d82f4ae7.ff1938"
-            ]
-        ]
+        "x": 4486,
+        "y": 119,
+        "z": "e2fe7a53.da009",
+        "wires": []
     },
     {
-        "id": "ef723c11.8ecf08",
+        "id": "cbb209f7.a6664",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3286,
-        "y": 1030,
-        "z": "b189bed1.bef5e8",
+        "x": 4666,
+        "y": 162,
+        "z": "e2fe7a53.da009",
         "wires": [
             [
-                "db88eddf.0d68b8"
+                "d166346a.002478"
             ]
         ]
     },
     {
-        "id": "d24eb3b1.82784",
+        "id": "74e5e9b0.d9729",
         "type": "not-found",
         "name": "not-found",
         "xml": "<outcome value='not-found'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3286.490966796875,
-        "y": 1075.5740356445312,
-        "z": "b189bed1.bef5e8",
+        "x": 4658,
+        "y": 217,
+        "z": "e2fe7a53.da009",
         "wires": [
             [
-                "b2d386a0.34fcc8"
+                "73697be7.45641c"
             ]
         ]
     },
     {
-        "id": "d82f4ae7.ff1938",
-        "type": "failure",
-        "name": "failure",
-        "xml": "<outcome value='failure'>\n",
+        "id": "a328bb91.cda89",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3284,
-        "y": 1119,
-        "z": "b189bed1.bef5e8",
+        "x": 4663,
+        "y": 274,
+        "z": "e2fe7a53.da009",
         "wires": [
             [
-                "fced2850.46c338"
+                "482cf24f.1774ec"
             ]
         ]
     },
     {
-        "id": "fced2850.46c338",
+        "id": "482cf24f.1774ec",
         "type": "returnFailure",
         "name": "return failure",
-        "xml": "<return status='failure'>\n<parameter name='error-code' value='' />\n<parameter name='error-message' value='' />\n",
+        "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",
         "comments": "",
-        "x": 3453,
-        "y": 1120,
-        "z": "b189bed1.bef5e8",
+        "x": 4815,
+        "y": 275,
+        "z": "e2fe7a53.da009",
         "wires": []
     },
     {
-        "id": "b2d386a0.34fcc8",
+        "id": "73697be7.45641c",
         "type": "returnFailure",
         "name": "return failure",
-        "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",
+        "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",
         "comments": "",
-        "x": 3449.0623779296875,
-        "y": 1075.8597717285156,
-        "z": "b189bed1.bef5e8",
+        "x": 4826,
+        "y": 220,
+        "z": "e2fe7a53.da009",
         "wires": []
     },
     {
-        "id": "db88eddf.0d68b8",
+        "id": "d166346a.002478",
         "type": "block",
-        "name": "block : atomic",
-        "xml": "<block atomic=\"true\">",
-        "atomic": "true",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
+        "comments": "",
+        "outputs": 1,
+        "x": 4810.38232421875,
+        "y": 159.65567016601562,
+        "z": "e2fe7a53.da009",
+        "wires": [
+            [
+                "2f421760.45d288"
+            ]
+        ]
+    },
+    {
+        "id": "47e44765.fd9158",
+        "type": "outcome",
+        "name": "esr-thirdparty-sdnc",
+        "xml": "<outcome value='esr-thirdparty-sdnc'>\n",
+        "comments": "",
         "outputs": 1,
-        "x": 3455,
-        "y": 1030,
-        "z": "b189bed1.bef5e8",
+        "x": 4071,
+        "y": 158,
+        "z": "e2fe7a53.da009",
         "wires": [
             [
-                "968b60ca.b919a8",
-                "4bf2b1b3.14be6",
-                "474863fb.23ac14",
-                "13714ee3.ae8141",
-                "408a0c32.404a4c"
+                "3f03e2fb.b5f81e"
             ]
         ]
     },
     {
-        "id": "968b60ca.b919a8",
+        "id": "2f421760.45d288",
         "type": "set",
-        "name": "set attachment_param for TN NSSSI deleteion in PNC B",
-        "xml": "<set>\n<parameter name='ietf-te_te.tunnels.tunnel[0].source' value='`$tmp.aai.vpn-bindingB.access-node-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].destination' value='`$tmp.aai.vpn-bindingB.dst-access-node-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].dst-ttp-id' value='`$tmp.aai.vpn-bindingB.dst-access-ltp-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].ietf-otn-tunnel_dst-tpn' value='' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].name' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.client-id' value='`$tmp.aai.vpn-bindingB.access-client-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.provider-id' value='`$tmp.aai.vpn-bindingB.access-provider-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[0].te-topology-identifier.topology-id' value='`$tmp.aai.vpn-bindingB.access-topology-id`' />\n\n<parameter name='ietf-te_te.tunnels.tunnel[1].source' value='`$tmp.aai.vpn-bindingB.access-node-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[1].destination' value='`$tmp.aai.vpn-bindingB.dst-access-node-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[1].name' value='tptunnel-22' />\n<parameter name='ietf-te_te.tunnels.tunnel[1].dependency-tunnels.dependency-tunnel[0].name' value='`$tmp.aai.vpn-bindingB.vpn-name`' />\n\n<parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.client-id' value='`$tmp.aai.vpn-bindingB.access-client-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.provider-id' value='`$tmp.aai.vpn-bindingB.access-provider-id`' />\n<parameter name='ietf-te_te.tunnels.tunnel[1].te-topology-identifier.topology-id' value='`$tmp.aai.vpn-bindingB.access-topology-id`' />\n\n",
+        "name": "set controller domain data",
+        "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",
+        "comments": "",
+        "x": 5025,
+        "y": 156,
+        "z": "e2fe7a53.da009",
+        "wires": []
+    },
+    {
+        "id": "920b64ba.47efa",
+        "type": "break",
+        "name": "break",
+        "xml": "<break>\n",
         "comments": "",
-        "x": 3816,
-        "y": 1131,
-        "z": "b189bed1.bef5e8",
+        "x": 4406,
+        "y": 235,
+        "z": "e2fe7a53.da009",
         "wires": []
     },
     {
-        "id": "cb725e7f.5dd5b",
+        "id": "9405a159.40925",
+        "type": "execute",
+        "name": "execute RestApiCallNode Delete transport slice without token",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.transport-slice-creation.templatefile`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url +  '/restconf/operations/ietf-optical-slice:deallocate-optical-slice'`\" />\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=\"post\"/>\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`\" />\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 3273,
+        "y": 502,
+        "z": "e2fe7a53.da009",
+        "wires": [
+            [
+                "ecacf915.574818",
+                "e290fc99.96c1d8"
+            ]
+        ]
+    },
+    {
+        "id": "ecacf915.574818",
         "type": "failure",
         "name": "failure",
         "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4075,
-        "y": 1158,
-        "z": "b189bed1.bef5e8",
+        "x": 3616.5,
+        "y": 497,
+        "z": "e2fe7a53.da009",
         "wires": [
             [
-                "8ff601d0.110ad8"
+                "6c0fb618.3be698"
             ]
         ]
     },
     {
-        "id": "9cd7bc00.01b8a8",
+        "id": "e290fc99.96c1d8",
         "type": "success",
         "name": "success",
         "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 4090,
-        "y": 1223,
-        "z": "b189bed1.bef5e8",
+        "x": 3620.5,
+        "y": 537,
+        "z": "e2fe7a53.da009",
         "wires": [
             [
-                "f31755df.8bf058"
+                "735428f1.2ceb3"
             ]
         ]
     },
     {
-        "id": "8ff601d0.110ad8",
-        "type": "returnFailure",
-        "name": "return failure",
-        "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",
-        "comments": "",
-        "x": 4259,
-        "y": 1154,
-        "z": "b189bed1.bef5e8",
-        "wires": []
-    },
-    {
-        "id": "f31755df.8bf058",
+        "id": "735428f1.2ceb3",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "comments": "",
         "outputs": 1,
-        "x": 4257.5,
-        "y": 1217,
-        "z": "b189bed1.bef5e8",
+        "x": 3778,
+        "y": 537,
+        "z": "e2fe7a53.da009",
         "wires": [
             []
         ]
     },
     {
-        "id": "4bf2b1b3.14be6",
-        "type": "execute",
-        "name": "execute RestApiCallNode Delete TN NSSI",
-        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/sotn-otn-tunnel-service.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/ietf-te:te'`\" />\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=\"patch\"/>\n<parameter name='dirPath' value=\"/opt/onap/sdnc/restconfapi/yang\" />\n<!--<parameter name='dirPath' value=\"/opt/sdnc/restapi/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<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
+        "id": "6c0fb618.3be698",
+        "type": "returnFailure",
+        "name": "return failure",
+        "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 deallocate transport slice rest api\" />\n",
+        "comments": "",
+        "x": 3774.5,
+        "y": 497,
+        "z": "e2fe7a53.da009",
+        "wires": []
+    },
+    {
+        "id": "6e17a44c.f8e15c",
+        "type": "set",
+        "name": "set attachment_param for TN NSSSI deleteion in PNC",
+        "xml": "<set>\n<parameter name='slice-instance-id' value='`$tmp.aai.service-instance.service-instance-id`' />\n\n",
+        "comments": "",
+        "x": 3249,
+        "y": 377,
+        "z": "e2fe7a53.da009",
+        "wires": []
+    },
+    {
+        "id": "9562cdef.811fc8",
+        "type": "save",
+        "name": "delete connectivity resource in AAI",
+        "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.connectivity.connectivity-id'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3775.5,
-        "y": 1181,
-        "z": "b189bed1.bef5e8",
+        "x": 3179,
+        "y": 812,
+        "z": "e2fe7a53.da009",
         "wires": [
-            [
-                "cb725e7f.5dd5b",
-                "9cd7bc00.01b8a8"
-            ]
+            []
         ]
     },
     {
-        "id": "474863fb.23ac14",
-        "type": "get-resource",
-        "name": "get-resource esr-thirdparty-sdnc",
-        "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",
+        "id": "51f18b3b.809efc",
+        "type": "save",
+        "name": "delete vpn-binding resource in AAI",
+        "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='vpn-binding' \n      key='vpn-binding.vpn-id = $tmp.aai.vpn-binding.vpn-id' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 3743,
-        "y": 1016,
-        "z": "b189bed1.bef5e8",
+        "x": 3175,
+        "y": 856,
+        "z": "e2fe7a53.da009",
         "wires": [
-            [
-                "d06c3921.6cace",
-                "88d90a9f.091b3",
-                "12a460ba.ca9617"
-            ]
+            []
         ]
     },
     {
-        "id": "d06c3921.6cace",
-        "type": "success",
-        "name": "success",
-        "xml": "<outcome value='success'>\n",
+        "id": "9ec21c40.e14a88",
+        "type": "execute",
+        "name": "execute RestApiCallNode domain UNI deColoring",
+        "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<!--<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/' + $prop.restapi.ts-coloring-uni-port.templatefile`\" />-->\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.url + '/restconf/data/ietf-network:networks/network=networkId-providerId-' + $tmp.aai.connectivity.access-provider-id + '-clientId-' + $tmp.aai.connectivity.access-client-id + '-topologyId-' + $tmp.aai.connectivity.access-topology-id +  '/node=' + $tmp.aai.connectivity.access-node-id + '/ietf-network-topology:termination-point=' + $tmp.aai.connectivity.access-ltp-id + '/ietf-te-topology:te/ietf-optical-slice:slice-id-list=' + $slice-instance-id `\" />\n<parameter name=\"restapiUser\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.user`\" />\n<parameter name=\"restapiPassword\" value=\"`$prop.sdncRestApi.thirdpartySdnc.domain.password`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"delete\"/>\n<parameter name=\"responsePrefix\" value=\"otn-oof\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.onap.client.jks\"/>\n<parameter name=\"trustStorePassword\" value=\"adminadmin\"/>\n<parameter name=\"keyStoreFileName\" value=\"/opt/onap/sdnc/data/stores/sdnc.p12\"/>\n<parameter name=\"keyStorePassword\" value=\"adminadmin\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />\n",
         "comments": "",
         "outputs": 1,
-        "x": 3989,
-        "y": 976,
-        "z": "b189bed1.bef5e8",
+        "x": 3759,
+        "y": 676,
+        "z": "e2fe7a53.da009",
         "wires": [
             [
-                "21d11018.7e29f8"
+                "f05a4dc0.054df",
+                "f0f39295.b7b9a8"
             ]
         ]
     },
     {
-        "id": "88d90a9f.091b3",
-        "type": "not-found",
-        "name": "not-found",
-        "xml": "<outcome value='not-found'>\n",
+        "id": "f0f39295.b7b9a8",
+        "type": "failure",
+        "name": "failure",
+        "xml": "<outcome value='failure'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3993,
-        "y": 1016,
-        "z": "b189bed1.bef5e8",
+        "x": 4025,
+        "y": 656,
+        "z": "e2fe7a53.da009",
         "wires": [
             [
-                "863d5ed9.b49e18"
+                "b586e36a.93b3e8"
             ]
         ]
     },
     {
-        "id": "12a460ba.ca9617",
-        "type": "other",
-        "name": "other",
-        "xml": "<outcome value='Other'>\n",
+        "id": "f05a4dc0.054df",
+        "type": "success",
+        "name": "success",
+        "xml": "<outcome value='success'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3985,
-        "y": 1056,
-        "z": "b189bed1.bef5e8",
+        "x": 4026.000213623047,
+        "y": 706.9999094009399,
+        "z": "e2fe7a53.da009",
         "wires": [
             [
-                "1cdaf293.72e3fd"
+                "67ce9419.db502c"
             ]
         ]
     },
     {
-        "id": "1cdaf293.72e3fd",
-        "type": "returnFailure",
-        "name": "return failure",
-        "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",
-        "comments": "",
-        "x": 4143,
-        "y": 1056,
-        "z": "b189bed1.bef5e8",
-        "wires": []
-    },
-    {
-        "id": "863d5ed9.b49e18",
+        "id": "b586e36a.93b3e8",
         "type": "returnFailure",
         "name": "return failure",
-        "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",
-        "comments": "",
-        "x": 4143,
-        "y": 1016,
-        "z": "b189bed1.bef5e8",
-        "wires": []
-    },
-    {
-        "id": "21d11018.7e29f8",
-        "type": "set",
-        "name": "set controller data",
-        "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",
-        "comments": "",
-        "x": 4159,
-        "y": 976,
-        "z": "b189bed1.bef5e8",
-        "wires": []
-    },
-    {
-        "id": "ef8c4420.4b2328",
-        "type": "comment",
-        "name": "Get controller info and send request",
-        "info": "",
+        "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 decoloring UNI rest api\" />\n",
         "comments": "",
-        "x": 3751,
-        "y": 976,
-        "z": "b189bed1.bef5e8",
+        "x": 4165.000247955322,
+        "y": 656.0000009536743,
+        "z": "e2fe7a53.da009",
         "wires": []
     },
     {
-        "id": "e3821d69.5cd46",
-        "type": "comment",
-        "name": "TODO: FIXME:",
-        "info": "How to know which domain's (A or B) controller is bein retrieved?",
-        "comments": "",
-        "x": 3685.5,
-        "y": 936,
-        "z": "b189bed1.bef5e8",
-        "wires": []
-    },
-    {
-        "id": "e565282f.4ac74",
-        "type": "comment",
-        "name": "TODO: FIXME:",
-        "info": "Set proper values to generate a good JSON body to be sent to PNC A for TN NSSI deletion.",
+        "id": "67ce9419.db502c",
+        "type": "block",
+        "name": "block",
+        "xml": "<block>\n",
+        "atomic": "false",
         "comments": "",
-        "x": 3682,
-        "y": 1080,
-        "z": "b189bed1.bef5e8",
-        "wires": []
+        "outputs": 1,
+        "x": 4171.02725982666,
+        "y": 704.7453947067261,
+        "z": "e2fe7a53.da009",
+        "wires": [
+            []
+        ]
     },
     {
-        "id": "13714ee3.ae8141",
-        "type": "save",
-        "name": "delete connectivity resource in AAI",
-        "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='connectivity.connectivity-id = $tmp.aai.connectivityB.connectivity-id'>\n",
+        "id": "e776447c.da84c8",
+        "type": "switchNode",
+        "name": "switch connectivity has ethernet service",
+        "xml": "<switch test='`$tmp.aai.connectivity.etht-svc-name`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3733,
-        "y": 1273,
-        "z": "b189bed1.bef5e8",
+        "x": 3208,
+        "y": 693,
+        "z": "e2fe7a53.da009",
         "wires": [
-            []
+            [
+                "a367a533.706f78",
+                "4d988de7.d09044"
+            ]
         ]
     },
     {
-        "id": "36d49abc.7de96e",
-        "type": "comment",
-        "name": "TODO: FIXME",
-        "info": "using the output of regex string arrays,\nconcatinate index 0 to index[?] all together\nin order to assemble the correct values for provider-id, \ntopology-id, node-id, etc.",
+        "id": "4d988de7.d09044",
+        "type": "other",
+        "name": "other",
+        "xml": "<outcome value='Other'>\n",
         "comments": "",
-        "x": 3668,
-        "y": 1239,
-        "z": "b189bed1.bef5e8",
-        "wires": []
+        "outputs": 1,
+        "x": 3446,
+        "y": 676,
+        "z": "e2fe7a53.da009",
+        "wires": [
+            [
+                "9ec21c40.e14a88"
+            ]
+        ]
     },
     {
-        "id": "408a0c32.404a4c",
-        "type": "save",
-        "name": "delete vpn-binding resource in AAI",
-        "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='connectivity' \n      key='tmp.aai.vpn-bindingB = $tmp.aai.vpn-bindingB'>\n",
+        "id": "a367a533.706f78",
+        "type": "outcome",
+        "name": "Null",
+        "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 3729,
-        "y": 1317,
-        "z": "b189bed1.bef5e8",
+        "x": 3458,
+        "y": 743,
+        "z": "e2fe7a53.da009",
         "wires": [
             []
         ]