X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=platform-logic%2Fgeneric-resource-api%2Fsrc%2Fmain%2Fjson%2FGENERIC-RESOURCE-API_network-topology-operation-delete.json;h=cdc84ac152990e92d22495952baf8d36f42c2b54;hb=42fb5723b7b11e94fc7d5ab901ae293b7fd67d7f;hp=3c8257f1c33f850e963b7197c54ced057a0b8dfd;hpb=125ff04404f8cacc991ad4059e1553d74dac30a2;p=sdnc%2Foam.git

diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation-delete.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation-delete.json
index 3c8257f1..cdc84ac1 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation-delete.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation-delete.json
@@ -1,20 +1,20 @@
 [
   {
-    "id": "1bc16ce.3c28013",
+    "id": "ba06c89a.024e98",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 87,
-    "y": 114.11099243164062,
-    "z": "e87b72fe.07c73",
+    "x": 113.03125,
+    "y": 95.03125,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "97da490c.021388"
+        "35e8925f.3178be"
       ]
     ]
   },
   {
-    "id": "97da490c.021388",
+    "id": "35e8925f.3178be",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -22,892 +22,1245 @@
     "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": 299.00000381469727,
-    "y": 186.11100959777832,
-    "z": "e87b72fe.07c73",
+    "x": 325.03125381469727,
+    "y": 167.0312671661377,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "3dca7f57.a19ca8"
+        "f972abf0.8e2ed8"
       ]
     ]
   },
   {
-    "id": "3dca7f57.a19ca8",
+    "id": "f972abf0.8e2ed8",
     "type": "method",
     "name": "method network-topology-operation-delete",
     "xml": "<method rpc='network-topology-operation-delete' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 287.0001220703125,
-    "y": 274.1109924316406,
-    "z": "e87b72fe.07c73",
+    "x": 313.0313720703125,
+    "y": 255.03125,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "2917b139.6003be"
+        "61264142.433c9"
       ]
     ]
   },
   {
-    "id": "2917b139.6003be",
+    "id": "61264142.433c9",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 563.0000305175781,
-    "y": 282.11100578308105,
-    "z": "e87b72fe.07c73",
+    "x": 589.0312805175781,
+    "y": 263.03126335144043,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "93de9a8e.85cd28",
-        "8a99a44.0aea6d8",
-        "b9e067fb.af43c8",
-        "8f63fe5a.ce23c",
-        "6e9a7fc8.6e80c8",
-        "4f853de5.1d70d4",
-        "80aa2c3b.44b74",
-        "c6199aa8.b4cf08",
-        "cd746090.90a5a",
-        "e9b167f.6457618"
+        "6c17c5f9.a1c91c",
+        "17a845f7.81ad5a",
+        "1c470b8.4988df5",
+        "ae6fca7d.b3be38",
+        "30cf8a2a.4aa6d6",
+        "3287501.60ecab",
+        "19bbbbde.0c4ee4",
+        "99fa60a9.97d56",
+        "a9f02234.2759e8",
+        "d94a9bb9.76a0c8",
+        "c820d47.424eda8",
+        "6c64d01.a0fff3"
       ]
     ]
   },
   {
-    "id": "93de9a8e.85cd28",
+    "id": "6c17c5f9.a1c91c",
     "type": "call",
     "name": "call GENERIC-RESOURCE-API:validate-network-input-parameters",
     "xml": "<call module='GENERIC-RESOURCE-API' rpc='validate-network-input-parameters' mode='sync' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 884,
-    "y": 65.11099243164062,
-    "z": "e87b72fe.07c73",
+    "x": 910.03125,
+    "y": 46.03125,
+    "z": "b1a89180.b5141",
     "wires": [
       []
     ]
   },
   {
-    "id": "8a99a44.0aea6d8",
+    "id": "17a845f7.81ad5a",
     "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 = $tmp.thirdparty-sdnc-id AND \n\t\t     depth = '1'\"\n        pfx='tmp.aai.esr-thirdparty-sdnc' local-only='false' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 828,
-    "y": 510.1109619140625,
-    "z": "e87b72fe.07c73",
+    "x": 854.03125,
+    "y": 491.0312194824219,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "3ab5ee96.e1d5ea",
-        "5289c8c7.4bcd4",
-        "756a44de.032acc"
+        "f27f6e92.d1699",
+        "2cd26321.b8d7fc",
+        "207daa4b.421516"
       ]
     ]
   },
   {
-    "id": "3ab5ee96.e1d5ea",
+    "id": "f27f6e92.d1699",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1066,
-    "y": 466.1109924316406,
-    "z": "e87b72fe.07c73",
+    "x": 1092.03125,
+    "y": 447.03125,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "e5229a2a.d65d6"
+        "4f5e00fc.7741e"
       ]
     ]
   },
   {
-    "id": "5289c8c7.4bcd4",
+    "id": "2cd26321.b8d7fc",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1070.490966796875,
-    "y": 507.68505859375,
-    "z": "e87b72fe.07c73",
+    "x": 1096.522216796875,
+    "y": 488.6053161621094,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "84a50f20.350108"
+        "2d398a89.807716"
       ]
     ]
   },
   {
-    "id": "756a44de.032acc",
+    "id": "207daa4b.421516",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1063.823974609375,
-    "y": 559.018310546875,
-    "z": "e87b72fe.07c73",
+    "x": 1089.855224609375,
+    "y": 539.9385681152344,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "ad52005e.b9cf1"
+        "8e9c4cf9.162de"
       ]
     ]
   },
   {
-    "id": "84a50f20.350108",
+    "id": "2d398a89.807716",
     "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=\"Network model is_bound_to_vpn=true but no vpn_binding is present\" />\n\n",
     "comments": "",
-    "x": 1246.0623779296875,
-    "y": 505.97076416015625,
-    "z": "e87b72fe.07c73",
+    "x": 1272.0936279296875,
+    "y": 486.8910217285156,
+    "z": "b1a89180.b5141",
     "wires": []
   },
   {
-    "id": "ad52005e.b9cf1",
+    "id": "8e9c4cf9.162de",
     "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 retrieving vpn binding\" />\n\n",
     "comments": "",
-    "x": 1224.5965576171875,
-    "y": 557.45751953125,
-    "z": "e87b72fe.07c73",
+    "x": 1250.6278076171875,
+    "y": 538.3777770996094,
+    "z": "b1a89180.b5141",
     "wires": []
   },
   {
-    "id": "b9e067fb.af43c8",
+    "id": "1c470b8.4988df5",
     "type": "for",
     "name": "for each network-input-parameters",
     "xml": "<for index='idx' start='0' end='`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 846,
-    "y": 243.11099243164062,
-    "z": "e87b72fe.07c73",
+    "x": 872.03125,
+    "y": 224.03125,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "dba902b2.65b6e"
+        "c4d07fe0.ade9b"
       ]
     ]
   },
   {
-    "id": "dba902b2.65b6e",
+    "id": "c4d07fe0.ade9b",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1127.8333740234375,
-    "y": 221.4443359375,
-    "z": "e87b72fe.07c73",
+    "x": 1153.8646240234375,
+    "y": 202.36459350585938,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "6dbc1962.e67808",
-        "a7f93024.722988",
-        "84a77140.b8364"
+        "c0182537.1ffaf8",
+        "ce9d1ad8.d1f0c8",
+        "ae7fca3e.07e458",
+        "e1b9eee0.2059b8",
+        "f7a24587.ec9238",
+        "a35f5ef6.a6cd28"
       ]
     ]
   },
   {
-    "id": "6dbc1962.e67808",
+    "id": "c0182537.1ffaf8",
     "type": "switchNode",
     "name": "switch name",
     "xml": "<switch test=\"`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].name == 'name'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1336,
-    "y": 182.11099243164062,
-    "z": "e87b72fe.07c73",
+    "x": 1362.03125,
+    "y": 163.03125,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "5945c6d2.51585"
+        "c674745c.2d98c8"
       ]
     ]
   },
   {
-    "id": "5945c6d2.51585",
+    "id": "c674745c.2d98c8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1523,
-    "y": 182.11099243164062,
-    "z": "e87b72fe.07c73",
+    "x": 1549.03125,
+    "y": 163.03125,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "7ba84df2.2f3aec"
+        "ff72bcee.d766c"
       ]
     ]
   },
   {
-    "id": "7ba84df2.2f3aec",
+    "id": "ff72bcee.d766c",
     "type": "set",
     "name": "set name",
     "xml": "<set>\n<parameter name='prop.l3vpn.name' value='`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1691,
-    "y": 182.71099853515625,
-    "z": "e87b72fe.07c73",
+    "x": 1717.03125,
+    "y": 163.63125610351562,
+    "z": "b1a89180.b5141",
     "wires": []
   },
   {
-    "id": "a7f93024.722988",
+    "id": "ce9d1ad8.d1f0c8",
     "type": "switchNode",
     "name": "switch service-type",
     "xml": "<switch test=\"`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].name == 'serviceType'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1341,
-    "y": 236.71096801757812,
-    "z": "e87b72fe.07c73",
+    "x": 1367.03125,
+    "y": 217.6312255859375,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "24243087.264e7"
+        "7439fd72.4e49b4"
       ]
     ]
   },
   {
-    "id": "24243087.264e7",
+    "id": "7439fd72.4e49b4",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1524.9999389648438,
-    "y": 241.71096801757812,
-    "z": "e87b72fe.07c73",
+    "x": 1551.0311889648438,
+    "y": 222.6312255859375,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "4b08822f.ede664"
+        "4c0474c2.96c4ac"
       ]
     ]
   },
   {
-    "id": "4b08822f.ede664",
+    "id": "4c0474c2.96c4ac",
     "type": "set",
     "name": "set service-type",
     "xml": "<set>\n<parameter name='prop.l3vpn.service-type' value='`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1693.9999389648438,
-    "y": 239.71096801757812,
-    "z": "e87b72fe.07c73",
+    "x": 1720.0311889648438,
+    "y": 220.6312255859375,
+    "z": "b1a89180.b5141",
     "wires": []
   },
   {
-    "id": "e5229a2a.d65d6",
+    "id": "4f5e00fc.7741e",
     "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].serviceUrl`\" />\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",
     "comments": "",
-    "x": 1252,
-    "y": 463.1109619140625,
-    "z": "e87b72fe.07c73",
+    "x": 1278.03125,
+    "y": 444.0312194824219,
+    "z": "b1a89180.b5141",
     "wires": []
   },
   {
-    "id": "8892b470.2ab318",
+    "id": "d58d3bad.af4188",
     "type": "execute",
     "name": "execute REST DELETE VPN",
-    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir +'/l3smvpntemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/huawei-ac-net-l3vpn-svc:l3vpn-svc-cfg/vpn-services/vpnservice=' + $prop.l3vpn.name`\" />\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=\"responsePrefix\" value=\"restapi-result\"/>\n<parameter name='customHttpHeaders' value=\"`'X-ACCESS-TOKEN=' + $prop.sdncRestApi.token_id`\" />",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/huawei-ac-net-l3vpn-svc:l3vpn-svc-cfg/vpn-services/vpnservice=' + $prop.l3vpn.name`\" />\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=\"responsePrefix\" value=\"vpn-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.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`\" />",
     "comments": "",
     "outputs": 1,
-    "x": 1574,
-    "y": 678.110969543457,
-    "z": "e87b72fe.07c73",
+    "x": 1604.03125,
+    "y": 925.03125,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "6ace128e.38bbf4",
-        "e03ea1f6.8ae24"
+        "a48f9d80.400a6",
+        "17b55d13.d0f583"
       ]
     ]
   },
   {
-    "id": "8f63fe5a.ce23c",
+    "id": "6c64d01.a0fff3",
     "type": "switchNode",
     "name": "switch service-type",
     "xml": "<switch test=\"`$prop.l3vpn.service-type`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 787,
-    "y": 614.1109924316406,
-    "z": "e87b72fe.07c73",
+    "x": 813.03125,
+    "y": 595.03125,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "cf2b0eea.34d2e"
+        "f5f24c7e.c89f9"
       ]
     ]
   },
   {
-    "id": "cf2b0eea.34d2e",
+    "id": "f5f24c7e.c89f9",
     "type": "outcomeTrue",
     "name": "l3vpn-ipwan",
     "xml": "<outcome value='l3vpn-ipwan'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1044,
-    "y": 615.110969543457,
-    "z": "e87b72fe.07c73",
+    "x": 1070.03125,
+    "y": 596.0312271118164,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "46db16ed.796608"
+        "730f31fc.13307"
       ]
     ]
   },
   {
-    "id": "6e9a7fc8.6e80c8",
+    "id": "ae6fca7d.b3be38",
     "type": "switchNode",
     "name": "switch service-data.networks.network_length",
     "xml": "<switch test='`$service-data.networks.network_length`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 826,
-    "y": 138.11099243164062,
-    "z": "e87b72fe.07c73",
+    "x": 852.03125,
+    "y": 119.03125,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "53ed314.a330f5",
-        "eeed55fd.c22298"
+        "520c693e.a9d358",
+        "655f0893.61f278",
+        "4cb232f8.ebf31c"
       ]
     ]
   },
   {
-    "id": "53ed314.a330f5",
+    "id": "520c693e.a9d358",
     "type": "other",
-    "name": "outcome Null",
+    "name": "Null",
     "xml": "<outcome value=''>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1271,
-    "y": 64.11105346679688,
-    "z": "e87b72fe.07c73",
+    "x": 1269.03125,
+    "y": 56.03131103515625,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "7b50ad9a.577e8c"
+        "55192e25.8885f"
       ]
     ]
   },
   {
-    "id": "7b50ad9a.577e8c",
+    "id": "55192e25.8885f",
     "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=\"network-topology-operation-input.network-request-input.network-id not found in service-data\" />\n",
     "comments": "",
-    "x": 1461.7774658203125,
-    "y": 51,
-    "z": "e87b72fe.07c73",
+    "x": 1487.8087158203125,
+    "y": 31.920257568359375,
+    "z": "b1a89180.b5141",
     "wires": []
   },
   {
-    "id": "eeed55fd.c22298",
+    "id": "655f0893.61f278",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1155.0003662109375,
-    "y": 129.11106872558594,
-    "z": "e87b72fe.07c73",
+    "x": 1181.0316162109375,
+    "y": 110.03132629394531,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "29041a71.02b546"
+        "f1d97fd4.8fa63"
       ]
     ]
   },
   {
-    "id": "29041a71.02b546",
+    "id": "f1d97fd4.8fa63",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1326.2698974609375,
-    "y": 112.66560363769531,
-    "z": "e87b72fe.07c73",
+    "x": 1352.3011474609375,
+    "y": 93.58586120605469,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "3af5398b.f7aa0e",
-        "4821e95f.09e458"
+        "e876eb36.5c4d68",
+        "34cad983.d68aa6"
       ]
     ]
   },
   {
-    "id": "3af5398b.f7aa0e",
+    "id": "e876eb36.5c4d68",
     "type": "for",
     "name": "for nidx..service-data.networks.network[]",
     "xml": "<for index='nidx' start='0' end='`$service-data.networks.network_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 1624.285888671875,
-    "y": 93.53961181640625,
-    "z": "e87b72fe.07c73",
+    "x": 1650.317138671875,
+    "y": 74.45986938476562,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "21827fa6.3c3c7"
+        "5659c979.043e78"
       ]
     ]
   },
   {
-    "id": "4821e95f.09e458",
+    "id": "34cad983.d68aa6",
     "type": "switchNode",
     "name": "switch tmp.nidx ",
     "xml": "<switch test=\"`$tmp.nidx`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 1545.5872802734375,
-    "y": 136.52279663085938,
-    "z": "e87b72fe.07c73",
+    "x": 1571.6185302734375,
+    "y": 117.44305419921875,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "4af90ffc.0818b"
+        "42b4cc11.e782c4"
       ]
     ]
   },
   {
-    "id": "4af90ffc.0818b",
+    "id": "42b4cc11.e782c4",
     "type": "outcome",
     "name": "NULL",
     "xml": "<outcome value=''>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1746.015869140625,
-    "y": 142.09420776367188,
-    "z": "e87b72fe.07c73",
+    "x": 1772.047119140625,
+    "y": 123.01446533203125,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "98ba5173.0d34e"
+        "fffba6d3.fe8418"
       ]
     ]
   },
   {
-    "id": "21827fa6.3c3c7",
+    "id": "5659c979.043e78",
     "type": "switchNode",
     "name": "switch networkid found",
     "xml": "<switch test=\"`$service-data.networks.network[$nidx].network-id == $network-topology-operation-input.network-information.network-id`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 1934.7144775390625,
-    "y": 91.78970336914062,
-    "z": "e87b72fe.07c73",
+    "x": 1960.7457275390625,
+    "y": 72.7099609375,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "22099867.c65e3"
+        "c95e7fc4.b303b"
       ]
     ]
   },
   {
-    "id": "98ba5173.0d34e",
+    "id": "fffba6d3.fe8418",
     "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=\"network-topology-operation-input.network-request-input.network-id not found in service-data\" />\n",
     "comments": "",
-    "x": 1917.4443359375,
-    "y": 142.237060546875,
-    "z": "e87b72fe.07c73",
+    "x": 1943.4755859375,
+    "y": 123.15731811523438,
+    "z": "b1a89180.b5141",
     "wires": []
   },
   {
-    "id": "22099867.c65e3",
+    "id": "c95e7fc4.b303b",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2140.666748046875,
-    "y": 90.68243408203125,
-    "z": "e87b72fe.07c73",
+    "x": 2166.697998046875,
+    "y": 71.60269165039062,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "44687f12.3eae5"
+        "6b863b90.836d94"
       ]
     ]
   },
   {
-    "id": "44687f12.3eae5",
+    "id": "6b863b90.836d94",
     "type": "set",
     "name": "set tmp.nidx and ctx.network-data",
     "xml": "<set>\n<parameter name='tmp.nidx' value='`$nidx`' />\n<parameter name='ctx.network-data.' value='`$service-data.networks.network[$nidx].`' />\n",
     "comments": "",
-    "x": 2379.198486328125,
-    "y": 86.43243408203125,
-    "z": "e87b72fe.07c73",
+    "x": 2405.229736328125,
+    "y": 67.35269165039062,
+    "z": "b1a89180.b5141",
     "wires": []
   },
   {
-    "id": "4f853de5.1d70d4",
-    "type": "block",
-    "name": "block : saveNetworkData",
-    "xml": "<block atomic=\"true\">",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 805,
-    "y": 704.1109924316406,
-    "z": "e87b72fe.07c73",
-    "wires": [
-      [
-        "191edb15.f0a32d",
-        "7bfb16ed.b031d8",
-        "3a334836.fa7ed",
-        "cc07591b.5791f"
-      ]
-    ]
-  },
-  {
-    "id": "80aa2c3b.44b74",
+    "id": "30cf8a2a.4aa6d6",
     "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": 757.6665649414062,
-    "y": 922.4442749023438,
-    "z": "e87b72fe.07c73",
-    "wires": []
-  },
-  {
-    "id": "3a334836.fa7ed",
-    "type": "set",
-    "name": "copy input to service-data",
-    "xml": "<set>\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.sdnc-request-header.' value='`$network-topology-operation-input.sdnc-request-header.`' />\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.request-information.' value='`$network-topology-operation-input.request-information.`' />\n",
-    "comments": "",
-    "x": 1098.0000076293945,
-    "y": 684.4443044662476,
-    "z": "e87b72fe.07c73",
-    "wires": []
-  },
-  {
-    "id": "191edb15.f0a32d",
-    "type": "set",
-    "name": "set networkId",
-    "xml": "<set>\n<parameter name='networkId' value='`$network-topology-operation-input.network-information.network-id`' />\n",
-    "comments": "",
-    "x": 1062.2895622253418,
-    "y": 728.1621513366699,
-    "z": "e87b72fe.07c73",
-    "wires": []
-  },
-  {
-    "id": "7bfb16ed.b031d8",
-    "type": "set",
-    "name": "set object-path",
-    "xml": "<set>\n<parameter name='network-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $network-topology-operation-input.service-information.service-instance-id\n + '/service-data/networks/network/'\n + $networkId\n + '/network-data/'` \" />\n \n",
-    "comments": "",
-    "x": 1068.0039291381836,
-    "y": 765.30504322052,
-    "z": "e87b72fe.07c73",
-    "wires": []
-  },
-  {
-    "id": "cc07591b.5791f",
-    "type": "set",
-    "name": "set network-level-oper-status",
-    "xml": "<set>\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status' value='Deleted' />\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.last-rpc-action' value='`$network-topology-operation-input.sdnc-request-header.svc-action`' />\n<parameter name='service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.last-action' value='`$network-topology-operation-input.request-information.request-action`' />\n",
-    "comments": "",
-    "x": 1111.9999389648438,
-    "y": 812.4442625045776,
-    "z": "e87b72fe.07c73",
+    "x": 806.6978149414062,
+    "y": 941.364501953125,
+    "z": "b1a89180.b5141",
     "wires": []
   },
   {
-    "id": "c6199aa8.b4cf08",
+    "id": "3287501.60ecab",
     "type": "get-resource",
     "name": "get-resource pnf",
     "xml": "<get-resource plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\t\tresource=\"pnf\" \n\t\tkey=\"pnf.pnf-name = $prop.l3vpn.pe1_id AND \n\t\t     depth = '0'\"\n        pfx='tmp.aai.pnf' local-only='false' >\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 784,
-    "y": 388,
-    "z": "e87b72fe.07c73",
+    "x": 810.03125,
+    "y": 368.9202575683594,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "eb78427.8aeffc",
-        "9468b1f6.acd4a8",
-        "8869b2de.4cd318"
+        "c2bd93d4.a50d6",
+        "50eb06db.534748",
+        "a9ca7e11.e6b52"
       ]
     ]
   },
   {
-    "id": "eb78427.8aeffc",
+    "id": "c2bd93d4.a50d6",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 978,
-    "y": 326,
-    "z": "e87b72fe.07c73",
+    "x": 1004.03125,
+    "y": 306.9202575683594,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "68cda5fa.8580d4"
+        "70989a52.14a154"
       ]
     ]
   },
   {
-    "id": "9468b1f6.acd4a8",
+    "id": "50eb06db.534748",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 987.490966796875,
-    "y": 368.57403564453125,
-    "z": "e87b72fe.07c73",
+    "x": 1013.522216796875,
+    "y": 349.4942932128906,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "f68a2741.7b13e"
+        "a043bfd1.99253"
       ]
     ]
   },
   {
-    "id": "8869b2de.4cd318",
+    "id": "a9ca7e11.e6b52",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 980.823974609375,
-    "y": 416.9073486328125,
-    "z": "e87b72fe.07c73",
+    "x": 1006.855224609375,
+    "y": 397.8276062011719,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "ff173828.c81cc"
+        "a1cb98a2.af1948"
       ]
     ]
   },
   {
-    "id": "f68a2741.7b13e",
+    "id": "a043bfd1.99253",
     "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": 1173.0623779296875,
-    "y": 369.8597717285156,
-    "z": "e87b72fe.07c73",
+    "x": 1199.0936279296875,
+    "y": 350.780029296875,
+    "z": "b1a89180.b5141",
     "wires": []
   },
   {
-    "id": "ff173828.c81cc",
+    "id": "a1cb98a2.af1948",
     "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": 1169.5965576171875,
-    "y": 420.3465270996094,
-    "z": "e87b72fe.07c73",
+    "x": 1195.6278076171875,
+    "y": 401.26678466796875,
+    "z": "b1a89180.b5141",
     "wires": []
   },
   {
-    "id": "68cda5fa.8580d4",
+    "id": "70989a52.14a154",
     "type": "set",
     "name": "set tmp.thirdparty-sdnc-id",
     "xml": "<set>\n<parameter name='tmp.thirdparty-sdnc-id' value=\"`$tmp.aai.pnf.relationship-list.relationship[0].relationship-data[0].relationship-value`\" />\n",
     "comments": "",
-    "x": 1192,
-    "y": 322,
-    "z": "e87b72fe.07c73",
+    "x": 1218.03125,
+    "y": 302.9202575683594,
+    "z": "b1a89180.b5141",
     "wires": []
   },
   {
-    "id": "84a77140.b8364",
+    "id": "ae7fca3e.07e458",
     "type": "switchNode",
     "name": "switch pe1_id",
     "xml": "<switch test=\"`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].name == 'pe1_id'`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1343,
-    "y": 283,
-    "z": "e87b72fe.07c73",
+    "x": 1369.03125,
+    "y": 263.9202575683594,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "16fa329d.f3dce5"
+        "7fbf4ad7.4e3104"
       ]
     ]
   },
   {
-    "id": "16fa329d.f3dce5",
+    "id": "7fbf4ad7.4e3104",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1529,
-    "y": 292,
-    "z": "e87b72fe.07c73",
+    "x": 1555.03125,
+    "y": 272.9202575683594,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "b53db17c.0ef078"
+        "63b25ae1.3cec14"
       ]
     ]
   },
   {
-    "id": "b53db17c.0ef078",
+    "id": "63b25ae1.3cec14",
     "type": "set",
     "name": "set pe1_id",
     "xml": "<set>\n<parameter name='prop.l3vpn.pe1_id' value='`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].value`' />\n",
     "comments": "",
-    "x": 1712,
-    "y": 296,
-    "z": "e87b72fe.07c73",
+    "x": 1738.03125,
+    "y": 276.9202575683594,
+    "z": "b1a89180.b5141",
     "wires": []
   },
   {
-    "id": "cd746090.90a5a",
+    "id": "19bbbbde.0c4ee4",
     "type": "delete",
     "name": "delete underlay configuration in AAI",
     "xml": "<delete plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource='configuration' \n        key='configuration.configuration-id = $network-topology-operation-input.network-information.network-id'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 815,
-    "y": 850,
-    "z": "e87b72fe.07c73",
+    "x": 858.03125,
+    "y": 687.9202880859375,
+    "z": "b1a89180.b5141",
     "wires": [
       []
     ]
   },
   {
-    "id": "599b3e84.010d1",
+    "id": "1f654f28.833041",
     "type": "execute",
     "name": "execute RestApiCallNode Get token",
-    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/actokentemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"token-result\"/>",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"templateFileName\" value=\"`$prop.restapi.templateDir + '/actokentemplate.json'`\" />\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/controller/v2/tokens'`\" />\n<parameter name=\"format\" value=\"json\"/>\n<parameter name=\"httpMethod\" value=\"post\"/>\n<parameter name=\"responsePrefix\" value=\"token-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.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\"/>",
     "comments": "",
     "outputs": 1,
-    "x": 1597,
-    "y": 605.7776565551758,
-    "z": "e87b72fe.07c73",
+    "x": 1623.03125,
+    "y": 586.6979141235352,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "d3f6644d.349f88",
-        "3ae81ceb.b03874"
+        "ca41c77.6b99238",
+        "b6f946b3.5d1538"
       ]
     ]
   },
   {
-    "id": "d3f6644d.349f88",
+    "id": "ca41c77.6b99238",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1837,
-    "y": 568.7776565551758,
-    "z": "e87b72fe.07c73",
+    "x": 1863.03125,
+    "y": 549.6979141235352,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "7b5e645e.7d6674"
+        "fb54fc36.0391d"
       ]
     ]
   },
   {
-    "id": "3ae81ceb.b03874",
+    "id": "b6f946b3.5d1538",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1844.25,
-    "y": 635.420539855957,
-    "z": "e87b72fe.07c73",
+    "x": 1870.28125,
+    "y": 616.3407974243164,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "50b8cd7f.3d5c64"
+        "987fca22.525748"
       ]
     ]
   },
   {
-    "id": "50b8cd7f.3d5c64",
+    "id": "987fca22.525748",
     "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 get token rest api\" />\n",
     "comments": "",
-    "x": 2025,
-    "y": 634.1706008911133,
-    "z": "e87b72fe.07c73",
+    "x": 2051.03125,
+    "y": 615.0908584594727,
+    "z": "b1a89180.b5141",
     "wires": []
   },
   {
-    "id": "7b5e645e.7d6674",
+    "id": "fb54fc36.0391d",
     "type": "set",
     "name": "set token-id",
-    "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='$token-result.token_id' />\n",
+    "xml": "<set>\n<parameter name='prop.sdncRestApi.token_id' value='$token-result.data.token_id' />\n",
     "comments": "",
-    "x": 2022,
-    "y": 565.7776565551758,
-    "z": "e87b72fe.07c73",
+    "x": 2048.03125,
+    "y": 546.6979141235352,
+    "z": "b1a89180.b5141",
     "wires": []
   },
   {
-    "id": "6ace128e.38bbf4",
+    "id": "a48f9d80.400a6",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1794,
-    "y": 690.7776565551758,
-    "z": "e87b72fe.07c73",
+    "x": 1899.03125,
+    "y": 737.6979370117188,
+    "z": "b1a89180.b5141",
     "wires": [
-      []
+      [
+        "c960eb18.e0632"
+      ]
     ]
   },
   {
-    "id": "e03ea1f6.8ae24",
+    "id": "17b55d13.d0f583",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1795.25,
-    "y": 754.4204788208008,
-    "z": "e87b72fe.07c73",
+    "x": 1851.28125,
+    "y": 978.3407592773438,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "2b054857.56f558"
+        "896de823.531688"
       ]
     ]
   },
   {
-    "id": "2b054857.56f558",
+    "id": "896de823.531688",
     "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 3rd party controller rest api\" />\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=\"Error executing Delete VPN rest api\" />\n",
     "comments": "",
-    "x": 1961,
-    "y": 757.1706008911133,
-    "z": "e87b72fe.07c73",
+    "x": 2040.03125,
+    "y": 981.0908813476562,
+    "z": "b1a89180.b5141",
     "wires": []
   },
   {
-    "id": "46db16ed.796608",
+    "id": "730f31fc.13307",
     "type": "block",
     "name": "block : atomic",
-    "xml": "<block atomic=\"true\">\n",
-    "atomic": "false",
+    "xml": "<block atomic='true'>",
+    "atomic": "true",
     "comments": "",
     "outputs": 1,
-    "x": 1268,
-    "y": 616.7776565551758,
-    "z": "e87b72fe.07c73",
+    "x": 1294.03125,
+    "y": 597.6979141235352,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "599b3e84.010d1",
-        "8892b470.2ab318"
+        "d58d3bad.af4188",
+        "e2203ccc.e2252",
+        "d01694ec.b6d578",
+        "1f654f28.833041",
+        "298989a7.60397e"
       ]
     ]
   },
   {
-    "id": "e9b167f.6457618",
+    "id": "99fa60a9.97d56",
     "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' />\n",
     "comments": "",
     "outputs": 1,
-    "x": 798,
-    "y": 564,
-    "z": "e87b72fe.07c73",
+    "x": 824.03125,
+    "y": 544.9202575683594,
+    "z": "b1a89180.b5141",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "298989a7.60397e",
+    "type": "execute",
+    "name": "execute REST DELETE Site",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/huawei-ac-net-l3vpn-svc:l3vpn-svc-cfg/sites/site=' + $prop.l3vpn.site1_name`\" />\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=\"responsePrefix\" value=\"site-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.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`\" />",
+    "comments": "",
+    "outputs": 1,
+    "x": 1604,
+    "y": 668,
+    "z": "b1a89180.b5141",
+    "wires": [
+      [
+        "a48f9d80.400a6",
+        "22e4152.0989b6a"
+      ]
+    ]
+  },
+  {
+    "id": "e2203ccc.e2252",
+    "type": "execute",
+    "name": "execute REST DELETE VRF1",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/huawei-ac-net-l3vpn-svc:l3vpn-svc-cfg/huawei-ac-net-l3vpn-svc-vfi:vrf-attributes/vrf-attribute=' + $prop.l3vpn.vrf1-id`\" />\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=\"responsePrefix\" value=\"vrf1-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.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`\" />",
+    "comments": "",
+    "outputs": 1,
+    "x": 1604,
+    "y": 760,
+    "z": "b1a89180.b5141",
+    "wires": [
+      [
+        "a48f9d80.400a6",
+        "ab599bb0.a4be38"
+      ]
+    ]
+  },
+  {
+    "id": "d01694ec.b6d578",
+    "type": "execute",
+    "name": "execute REST DELETE VRF2",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n<parameter name=\"restapiUrl\" value=\"`$prop.sdncRestApi.thirdpartySdnc.url + '/restconf/data/huawei-ac-net-l3vpn-svc:l3vpn-svc-cfg/huawei-ac-net-l3vpn-svc-vfi:vrf-attributes/vrf-attribute=' + $prop.l3vpn.vrf2-id`\" />\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=\"responsePrefix\" value=\"vrf2-result\"/>\n<parameter name=\"trustStoreFileName\" value=\"/opt/onap/sdnc/data/stores/truststore.openecomp.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`\" />",
+    "comments": "",
+    "outputs": 1,
+    "x": 1611,
+    "y": 846,
+    "z": "b1a89180.b5141",
+    "wires": [
+      [
+        "a48f9d80.400a6",
+        "a7e72531.ac08f"
+      ]
+    ]
+  },
+  {
+    "id": "c960eb18.e0632",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 2056,
+    "y": 734,
+    "z": "b1a89180.b5141",
+    "wires": [
+      []
+    ]
+  },
+  {
+    "id": "22e4152.0989b6a",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1877,
+    "y": 673,
+    "z": "b1a89180.b5141",
+    "wires": [
+      [
+        "c62b7174.0cde6"
+      ]
+    ]
+  },
+  {
+    "id": "c62b7174.0cde6",
+    "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 Delete Site rest api\" />\n",
+    "comments": "",
+    "x": 2057.75,
+    "y": 671.7500610351562,
+    "z": "b1a89180.b5141",
+    "wires": []
+  },
+  {
+    "id": "ab599bb0.a4be38",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1896,
+    "y": 805,
+    "z": "b1a89180.b5141",
+    "wires": [
+      [
+        "fd500d75.5f667"
+      ]
+    ]
+  },
+  {
+    "id": "fd500d75.5f667",
+    "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 Delete VRF1 rest api\" />\n",
+    "comments": "",
+    "x": 2076.75,
+    "y": 803.7500610351562,
+    "z": "b1a89180.b5141",
+    "wires": []
+  },
+  {
+    "id": "a7e72531.ac08f",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1894,
+    "y": 879,
+    "z": "b1a89180.b5141",
+    "wires": [
+      [
+        "6fdfb503.fe47a4"
+      ]
+    ]
+  },
+  {
+    "id": "6fdfb503.fe47a4",
+    "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 Delete VRF2 rest api\" />\n",
+    "comments": "",
+    "x": 2074.75,
+    "y": 877.7500610351562,
+    "z": "b1a89180.b5141",
+    "wires": []
+  },
+  {
+    "id": "e1b9eee0.2059b8",
+    "type": "switchNode",
+    "name": "switch site1_name",
+    "xml": "<switch test=\"`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].name == 'site1_name'`\">\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1472,
+    "y": 326,
+    "z": "b1a89180.b5141",
+    "wires": [
+      [
+        "dfa9e32d.91d8d8"
+      ]
+    ]
+  },
+  {
+    "id": "f7a24587.ec9238",
+    "type": "switchNode",
+    "name": "switch vrf1_id",
+    "xml": "<switch test=\"`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].name == 'vrf1_id'`\">\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1477,
+    "y": 380.5999755859375,
+    "z": "b1a89180.b5141",
+    "wires": [
+      [
+        "c15e7dfb.74d14"
+      ]
+    ]
+  },
+  {
+    "id": "a35f5ef6.a6cd28",
+    "type": "switchNode",
+    "name": "switch vrf2_id",
+    "xml": "<switch test=\"`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].name == 'vrf2_id'`\">\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1479,
+    "y": 426.8890075683594,
+    "z": "b1a89180.b5141",
+    "wires": [
+      [
+        "ca400331.dc161"
+      ]
+    ]
+  },
+  {
+    "id": "dfa9e32d.91d8d8",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1659,
+    "y": 326,
+    "z": "b1a89180.b5141",
+    "wires": [
+      [
+        "9e12816.9f59e"
+      ]
+    ]
+  },
+  {
+    "id": "c15e7dfb.74d14",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1660.9999389648438,
+    "y": 385.5999755859375,
+    "z": "b1a89180.b5141",
+    "wires": [
+      [
+        "b6297fef.ebefb"
+      ]
+    ]
+  },
+  {
+    "id": "ca400331.dc161",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1665,
+    "y": 435.8890075683594,
+    "z": "b1a89180.b5141",
+    "wires": [
+      [
+        "b6b8b28d.368718"
+      ]
+    ]
+  },
+  {
+    "id": "9e12816.9f59e",
+    "type": "set",
+    "name": "set site1_name",
+    "xml": "<set>\n<parameter name='prop.l3vpn.site1_name' value='`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].value`' />\n",
+    "comments": "",
+    "x": 1827,
+    "y": 326.6000061035156,
+    "z": "b1a89180.b5141",
+    "wires": []
+  },
+  {
+    "id": "b6297fef.ebefb",
+    "type": "set",
+    "name": "set vrf1_id",
+    "xml": "<set>\n<parameter name='prop.l3vpn.vrf1-id' value='`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].value`' />\n",
+    "comments": "",
+    "x": 1829.9999389648438,
+    "y": 383.5999755859375,
+    "z": "b1a89180.b5141",
+    "wires": []
+  },
+  {
+    "id": "b6b8b28d.368718",
+    "type": "set",
+    "name": "set vrf2_id",
+    "xml": "<set>\n<parameter name='prop.l3vpn.vrf2-id' value='`$service-data.networks.network[$tmp.nidx].network-data.network-request-input.network-input-parameters.param[$idx].value`' />\n",
+    "comments": "",
+    "x": 1848,
+    "y": 439.8890075683594,
+    "z": "b1a89180.b5141",
+    "wires": []
+  },
+  {
+    "id": "4cb232f8.ebf31c",
+    "type": "outcome",
+    "name": "0",
+    "xml": "<outcome value='0'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1263,
+    "y": 20,
+    "z": "b1a89180.b5141",
+    "wires": [
+      [
+        "55192e25.8885f"
+      ]
+    ]
+  },
+  {
+    "id": "c820d47.424eda8",
+    "type": "set",
+    "name": "set output to api handler",
+    "xml": "<set>\n<parameter name='networkId' value='`$network-topology-operation-input.network-information.network-id`' />\n<parameter name='service-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $network-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'` \" />\n \n",
+    "comments": "",
+    "x": 832,
+    "y": 875,
+    "z": "b1a89180.b5141",
+    "wires": []
+  },
+  {
+    "id": "d94a9bb9.76a0c8",
+    "type": "execute",
+    "name": "execute RestApiCallNode - DELETE network-data",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode' method='sendRequest' >\n    <parameter name='restapiUrl' value='`$prop.controller.url + $tmp.nw-url`' />\n    <parameter name='restapiUser' value='`$prop.controller.user`' />\n    <parameter name='restapiPassword' value='`$prop.controller.pwd`' />\n    <parameter name='format' value='json' />\n    <parameter name='httpMethod' value='DELETE' />\n    <parameter name=\"responsePrefix\" value=\"mdsal-nw\" />",
+    "comments": "",
+    "outputs": 1,
+    "x": 908,
+    "y": 802,
+    "z": "b1a89180.b5141",
+    "wires": [
+      [
+        "e93feae8.46a908",
+        "e4b9f022.5b775",
+        "6dfa3475.c889ec"
+      ]
+    ]
+  },
+  {
+    "id": "e93feae8.46a908",
+    "type": "success",
+    "name": "success",
+    "xml": "<outcome value='success'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1179.5873565673828,
+    "y": 789.289436340332,
+    "z": "b1a89180.b5141",
+    "wires": [
+      [
+        "98b108c8.15ac98"
+      ]
+    ]
+  },
+  {
+    "id": "e4b9f022.5b775",
+    "type": "failure",
+    "name": "failure",
+    "xml": "<outcome value='failure'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1175.8373184204102,
+    "y": 818.9323314651847,
+    "z": "b1a89180.b5141",
+    "wires": [
+      [
+        "de27e6ee.26b61"
+      ]
+    ]
+  },
+  {
+    "id": "6dfa3475.c889ec",
+    "type": "not-found",
+    "name": "not-found",
+    "xml": "<outcome value='not-found'>\n",
+    "comments": "",
+    "outputs": 1,
+    "x": 1184.8372688293457,
+    "y": 850.4323057159781,
+    "z": "b1a89180.b5141",
+    "wires": [
+      [
+        "de27e6ee.26b61"
+      ]
+    ]
+  },
+  {
+    "id": "98b108c8.15ac98",
+    "type": "block",
+    "name": "block",
+    "xml": "<block>\n",
+    "atomic": "false",
+    "comments": "",
+    "outputs": 1,
+    "x": 1321.2433242797852,
+    "y": 785.4816055297852,
+    "z": "b1a89180.b5141",
     "wires": [
       []
     ]
+  },
+  {
+    "id": "de27e6ee.26b61",
+    "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 updating md-sal for network-data\" />",
+    "comments": "",
+    "x": 1345.5873565673828,
+    "y": 819.6823553070426,
+    "z": "b1a89180.b5141",
+    "wires": []
+  },
+  {
+    "id": "a9f02234.2759e8",
+    "type": "set",
+    "name": "set tmp.nw-url",
+    "xml": "<set>\n<parameter name='tmp.nw-url' value=\"`'/restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $network-topology-operation-input.service-information.service-instance-id\n + '/service-data/networks/network/' \n + $network-topology-operation-input.network-information.network-id` \" />",
+    "comments": "",
+    "x": 809,
+    "y": 748,
+    "z": "b1a89180.b5141",
+    "wires": []
   }
 ]