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=f28363f0fae83efa9cb09ddd61fd995ccdf8498c;hp=3cea529897bc32f34387c3d2972301a36c8aef63;hpb=9ea126b1bfbf0908e45eaf52d61b6b2032fc1b23;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 3cea5298..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": "d563afb0.056168",
+    "id": "ba06c89a.024e98",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 92,
-    "y": 121.33333587646484,
-    "z": "89eca582.be817",
+    "x": 113.03125,
+    "y": 95.03125,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "f7c87a2f.fb9cf"
+        "35e8925f.3178be"
       ]
     ]
   },
   {
-    "id": "f7c87a2f.fb9cf",
+    "id": "35e8925f.3178be",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -22,877 +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": 304.00000381469727,
-    "y": 193.33335304260254,
-    "z": "89eca582.be817",
+    "x": 325.03125381469727,
+    "y": 167.0312671661377,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "37f24cdb.d75cb4"
+        "f972abf0.8e2ed8"
       ]
     ]
   },
   {
-    "id": "37f24cdb.d75cb4",
+    "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": 292.0001220703125,
-    "y": 281.33333587646484,
-    "z": "89eca582.be817",
+    "x": 313.0313720703125,
+    "y": 255.03125,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "968f84c1.36e27"
+        "61264142.433c9"
       ]
     ]
   },
   {
-    "id": "968f84c1.36e27",
+    "id": "61264142.433c9",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 568.0000305175781,
-    "y": 289.3333492279053,
-    "z": "89eca582.be817",
+    "x": 589.0312805175781,
+    "y": 263.03126335144043,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "ae3d965a.4a7378",
-        "b83c4e05.5eb538",
-        "fc04e5a4.52eb5",
-        "a964f2cc.8cf37",
-        "92a504dc.ec13d8",
-        "229c0a0d.36236e",
-        "5b36b323.b34d7c",
-        "6331818b.c6bfc",
-        "e6735147.08a6d8"
+        "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": "ae3d965a.4a7378",
+    "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": 889,
-    "y": 72.33333587646484,
-    "z": "89eca582.be817",
+    "x": 910.03125,
+    "y": 46.03125,
+    "z": "b1a89180.b5141",
     "wires": [
       []
     ]
   },
   {
-    "id": "b83c4e05.5eb538",
+    "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": 833,
-    "y": 517.3333053588867,
-    "z": "89eca582.be817",
+    "x": 854.03125,
+    "y": 491.0312194824219,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "3ddcae6d.d600c2",
-        "8879d867.b4938",
-        "24d0dda7.8f860a"
+        "f27f6e92.d1699",
+        "2cd26321.b8d7fc",
+        "207daa4b.421516"
       ]
     ]
   },
   {
-    "id": "3ddcae6d.d600c2",
+    "id": "f27f6e92.d1699",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1071,
-    "y": 473.33333587646484,
-    "z": "89eca582.be817",
+    "x": 1092.03125,
+    "y": 447.03125,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "2875c9d1.a679ce"
+        "4f5e00fc.7741e"
       ]
     ]
   },
   {
-    "id": "8879d867.b4938",
+    "id": "2cd26321.b8d7fc",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1075.490966796875,
-    "y": 514.9074020385742,
-    "z": "89eca582.be817",
+    "x": 1096.522216796875,
+    "y": 488.6053161621094,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "2fdf1df8.d37b9a"
+        "2d398a89.807716"
       ]
     ]
   },
   {
-    "id": "24d0dda7.8f860a",
+    "id": "207daa4b.421516",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1068.823974609375,
-    "y": 566.2406539916992,
-    "z": "89eca582.be817",
+    "x": 1089.855224609375,
+    "y": 539.9385681152344,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "d6d9101d.068098"
+        "8e9c4cf9.162de"
       ]
     ]
   },
   {
-    "id": "2fdf1df8.d37b9a",
+    "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": 1251.0623779296875,
-    "y": 513.1931076049805,
-    "z": "89eca582.be817",
+    "x": 1272.0936279296875,
+    "y": 486.8910217285156,
+    "z": "b1a89180.b5141",
     "wires": []
   },
   {
-    "id": "d6d9101d.068098",
+    "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": 1229.5965576171875,
-    "y": 564.6798629760742,
-    "z": "89eca582.be817",
+    "x": 1250.6278076171875,
+    "y": 538.3777770996094,
+    "z": "b1a89180.b5141",
     "wires": []
   },
   {
-    "id": "fc04e5a4.52eb5",
+    "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": 851,
-    "y": 250.33333587646484,
-    "z": "89eca582.be817",
+    "x": 872.03125,
+    "y": 224.03125,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "21f32325.9d7694"
+        "c4d07fe0.ade9b"
       ]
     ]
   },
   {
-    "id": "21f32325.9d7694",
+    "id": "c4d07fe0.ade9b",
     "type": "block",
     "name": "block",
     "xml": "<block>\n",
     "atomic": "false",
     "comments": "",
     "outputs": 1,
-    "x": 1132.8333740234375,
-    "y": 228.66667938232422,
-    "z": "89eca582.be817",
+    "x": 1153.8646240234375,
+    "y": 202.36459350585938,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "15f7b5bc.24b652",
-        "58a03af6.4686fc",
-        "83edb691.4ecc08"
+        "c0182537.1ffaf8",
+        "ce9d1ad8.d1f0c8",
+        "ae7fca3e.07e458",
+        "e1b9eee0.2059b8",
+        "f7a24587.ec9238",
+        "a35f5ef6.a6cd28"
       ]
     ]
   },
   {
-    "id": "15f7b5bc.24b652",
+    "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": 1341,
-    "y": 189.33333587646484,
-    "z": "89eca582.be817",
+    "x": 1362.03125,
+    "y": 163.03125,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "57533497.32b74c"
+        "c674745c.2d98c8"
       ]
     ]
   },
   {
-    "id": "57533497.32b74c",
+    "id": "c674745c.2d98c8",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1528,
-    "y": 189.33333587646484,
-    "z": "89eca582.be817",
+    "x": 1549.03125,
+    "y": 163.03125,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "636e0cba.4ad824"
+        "ff72bcee.d766c"
       ]
     ]
   },
   {
-    "id": "636e0cba.4ad824",
+    "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": 1696,
-    "y": 189.93334197998047,
-    "z": "89eca582.be817",
+    "x": 1717.03125,
+    "y": 163.63125610351562,
+    "z": "b1a89180.b5141",
     "wires": []
   },
   {
-    "id": "58a03af6.4686fc",
+    "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 == 'service-type'`\">\n",
+    "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": 1346,
-    "y": 243.93331146240234,
-    "z": "89eca582.be817",
+    "x": 1367.03125,
+    "y": 217.6312255859375,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "49b85e52.02df98"
+        "7439fd72.4e49b4"
       ]
     ]
   },
   {
-    "id": "49b85e52.02df98",
+    "id": "7439fd72.4e49b4",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1529.9999389648438,
-    "y": 248.93331146240234,
-    "z": "89eca582.be817",
+    "x": 1551.0311889648438,
+    "y": 222.6312255859375,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "8bbe0d91.97e45"
+        "4c0474c2.96c4ac"
       ]
     ]
   },
   {
-    "id": "8bbe0d91.97e45",
+    "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": 1698.9999389648438,
-    "y": 246.93331146240234,
-    "z": "89eca582.be817",
+    "x": 1720.0311889648438,
+    "y": 220.6312255859375,
+    "z": "b1a89180.b5141",
     "wires": []
   },
   {
-    "id": "2875c9d1.a679ce",
+    "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.templateDir' value='/opt/onap/sdnc/data' />\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",
+    "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": 1257,
-    "y": 470.3333053588867,
-    "z": "89eca582.be817",
+    "x": 1278.03125,
+    "y": 444.0312194824219,
+    "z": "b1a89180.b5141",
     "wires": []
   },
   {
-    "id": "e7464274.0f82b8",
+    "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.sdncRestApi.tempDir +'/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": 1579,
-    "y": 685.3333129882812,
-    "z": "89eca582.be817",
+    "x": 1604.03125,
+    "y": 925.03125,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "9b0fa013.788a28",
-        "19c42608.424b9a"
+        "a48f9d80.400a6",
+        "17b55d13.d0f583"
       ]
     ]
   },
   {
-    "id": "a964f2cc.8cf37",
+    "id": "6c64d01.a0fff3",
     "type": "switchNode",
     "name": "switch service-type",
     "xml": "<switch test=\"`$prop.l3vpn.service-type`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 792,
-    "y": 621.3333358764648,
-    "z": "89eca582.be817",
+    "x": 813.03125,
+    "y": 595.03125,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "93ec2320.02d11"
+        "f5f24c7e.c89f9"
       ]
     ]
   },
   {
-    "id": "93ec2320.02d11",
+    "id": "f5f24c7e.c89f9",
     "type": "outcomeTrue",
     "name": "l3vpn-ipwan",
     "xml": "<outcome value='l3vpn-ipwan'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1049,
-    "y": 622.3333129882812,
-    "z": "89eca582.be817",
+    "x": 1070.03125,
+    "y": 596.0312271118164,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "4e922d10.8ba70c"
+        "730f31fc.13307"
       ]
     ]
   },
   {
-    "id": "92a504dc.ec13d8",
+    "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": 831,
-    "y": 145.33333587646484,
-    "z": "89eca582.be817",
+    "x": 852.03125,
+    "y": 119.03125,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "8e028d38.9057d",
-        "c340ac4a.71f85"
+        "520c693e.a9d358",
+        "655f0893.61f278",
+        "4cb232f8.ebf31c"
       ]
     ]
   },
   {
-    "id": "8e028d38.9057d",
+    "id": "520c693e.a9d358",
     "type": "other",
-    "name": "outcome Null",
+    "name": "Null",
     "xml": "<outcome value=''>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1276,
-    "y": 71.3333969116211,
-    "z": "89eca582.be817",
+    "x": 1269.03125,
+    "y": 56.03131103515625,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "ac7b7cef.c3a35"
+        "55192e25.8885f"
       ]
     ]
   },
   {
-    "id": "ac7b7cef.c3a35",
+    "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": 1466.7774658203125,
-    "y": 58.22234344482422,
-    "z": "89eca582.be817",
+    "x": 1487.8087158203125,
+    "y": 31.920257568359375,
+    "z": "b1a89180.b5141",
     "wires": []
   },
   {
-    "id": "c340ac4a.71f85",
+    "id": "655f0893.61f278",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1160.0003662109375,
-    "y": 136.33341217041016,
-    "z": "89eca582.be817",
+    "x": 1181.0316162109375,
+    "y": 110.03132629394531,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "8cbfe4b9.2a2368"
+        "f1d97fd4.8fa63"
       ]
     ]
   },
   {
-    "id": "8cbfe4b9.2a2368",
+    "id": "f1d97fd4.8fa63",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1331.2698974609375,
-    "y": 119.88794708251953,
-    "z": "89eca582.be817",
+    "x": 1352.3011474609375,
+    "y": 93.58586120605469,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "7a7f5cb9.3ef364",
-        "89dd7f04.eed92"
+        "e876eb36.5c4d68",
+        "34cad983.d68aa6"
       ]
     ]
   },
   {
-    "id": "7a7f5cb9.3ef364",
+    "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": 1629.285888671875,
-    "y": 100.76195526123047,
-    "z": "89eca582.be817",
+    "x": 1650.317138671875,
+    "y": 74.45986938476562,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "b49be6d2.09dbc8"
+        "5659c979.043e78"
       ]
     ]
   },
   {
-    "id": "89dd7f04.eed92",
+    "id": "34cad983.d68aa6",
     "type": "switchNode",
     "name": "switch tmp.nidx ",
     "xml": "<switch test=\"`$tmp.nidx`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 1550.5872802734375,
-    "y": 143.7451400756836,
-    "z": "89eca582.be817",
+    "x": 1571.6185302734375,
+    "y": 117.44305419921875,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "ab419b0d.e9521"
+        "42b4cc11.e782c4"
       ]
     ]
   },
   {
-    "id": "ab419b0d.e9521",
+    "id": "42b4cc11.e782c4",
     "type": "outcome",
     "name": "NULL",
     "xml": "<outcome value=''>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1751.015869140625,
-    "y": 149.3165512084961,
-    "z": "89eca582.be817",
+    "x": 1772.047119140625,
+    "y": 123.01446533203125,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "8e89ca22.c1f468"
+        "fffba6d3.fe8418"
       ]
     ]
   },
   {
-    "id": "b49be6d2.09dbc8",
+    "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": 1939.7144775390625,
-    "y": 99.01204681396484,
-    "z": "89eca582.be817",
+    "x": 1960.7457275390625,
+    "y": 72.7099609375,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "92fa60c6.e61928"
+        "c95e7fc4.b303b"
       ]
     ]
   },
   {
-    "id": "8e89ca22.c1f468",
+    "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": 1922.4443359375,
-    "y": 149.45940399169922,
-    "z": "89eca582.be817",
+    "x": 1943.4755859375,
+    "y": 123.15731811523438,
+    "z": "b1a89180.b5141",
     "wires": []
   },
   {
-    "id": "92fa60c6.e61928",
+    "id": "c95e7fc4.b303b",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 2145.666748046875,
-    "y": 97.90477752685547,
-    "z": "89eca582.be817",
+    "x": 2166.697998046875,
+    "y": 71.60269165039062,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "13e93e78.dc98f2"
+        "6b863b90.836d94"
       ]
     ]
   },
   {
-    "id": "13e93e78.dc98f2",
+    "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": 2384.198486328125,
-    "y": 93.65477752685547,
-    "z": "89eca582.be817",
+    "x": 2405.229736328125,
+    "y": 67.35269165039062,
+    "z": "b1a89180.b5141",
     "wires": []
   },
   {
-    "id": "229c0a0d.36236e",
-    "type": "block",
-    "name": "block : saveNetworkData",
-    "xml": "<block atomic=\"true\">",
-    "atomic": "true",
-    "comments": "",
-    "outputs": 1,
-    "x": 810,
-    "y": 711.3333358764648,
-    "z": "89eca582.be817",
-    "wires": [
-      [
-        "2f2a571f.f701d8",
-        "ad0ac3a3.801d88",
-        "3a891d55.fcf27a",
-        "4dbcadac.7cacd4"
-      ]
-    ]
-  },
-  {
-    "id": "5b36b323.b34d7c",
+    "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": 762.6665649414062,
-    "y": 929.666618347168,
-    "z": "89eca582.be817",
-    "wires": []
-  },
-  {
-    "id": "3a891d55.fcf27a",
-    "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": 1103.0000076293945,
-    "y": 691.6666479110718,
-    "z": "89eca582.be817",
-    "wires": []
-  },
-  {
-    "id": "2f2a571f.f701d8",
-    "type": "set",
-    "name": "set networkId",
-    "xml": "<set>\n<parameter name='networkId' value='`$network-topology-operation-input.network-information.network-id`' />\n",
-    "comments": "",
-    "x": 1067.2895622253418,
-    "y": 735.3844947814941,
-    "z": "89eca582.be817",
-    "wires": []
-  },
-  {
-    "id": "ad0ac3a3.801d88",
-    "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": 1073.0039291381836,
-    "y": 772.5273866653442,
-    "z": "89eca582.be817",
-    "wires": []
-  },
-  {
-    "id": "4dbcadac.7cacd4",
-    "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": 1116.9999389648438,
-    "y": 819.6666059494019,
-    "z": "89eca582.be817",
+    "x": 806.6978149414062,
+    "y": 941.364501953125,
+    "z": "b1a89180.b5141",
     "wires": []
   },
   {
-    "id": "6331818b.c6bfc",
+    "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": 789,
-    "y": 395.2223434448242,
-    "z": "89eca582.be817",
+    "x": 810.03125,
+    "y": 368.9202575683594,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "2c36397a.e13af6",
-        "81511490.7b5318",
-        "8ef29169.d30308"
+        "c2bd93d4.a50d6",
+        "50eb06db.534748",
+        "a9ca7e11.e6b52"
       ]
     ]
   },
   {
-    "id": "2c36397a.e13af6",
+    "id": "c2bd93d4.a50d6",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 983,
-    "y": 333.2223434448242,
-    "z": "89eca582.be817",
+    "x": 1004.03125,
+    "y": 306.9202575683594,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "69eaa950.7e3dd"
+        "70989a52.14a154"
       ]
     ]
   },
   {
-    "id": "81511490.7b5318",
+    "id": "50eb06db.534748",
     "type": "not-found",
     "name": "not-found",
     "xml": "<outcome value='not-found'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 992.490966796875,
-    "y": 375.79637908935547,
-    "z": "89eca582.be817",
+    "x": 1013.522216796875,
+    "y": 349.4942932128906,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "a2279b64.597d58"
+        "a043bfd1.99253"
       ]
     ]
   },
   {
-    "id": "8ef29169.d30308",
+    "id": "a9ca7e11.e6b52",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 985.823974609375,
-    "y": 424.1296920776367,
-    "z": "89eca582.be817",
+    "x": 1006.855224609375,
+    "y": 397.8276062011719,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "48d06926.05169"
+        "a1cb98a2.af1948"
       ]
     ]
   },
   {
-    "id": "a2279b64.597d58",
+    "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": 1178.0623779296875,
-    "y": 377.08211517333984,
-    "z": "89eca582.be817",
+    "x": 1199.0936279296875,
+    "y": 350.780029296875,
+    "z": "b1a89180.b5141",
     "wires": []
   },
   {
-    "id": "48d06926.05169",
+    "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": 1174.5965576171875,
-    "y": 427.5688705444336,
-    "z": "89eca582.be817",
+    "x": 1195.6278076171875,
+    "y": 401.26678466796875,
+    "z": "b1a89180.b5141",
     "wires": []
   },
   {
-    "id": "69eaa950.7e3dd",
+    "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": 1197,
-    "y": 329.2223434448242,
-    "z": "89eca582.be817",
+    "x": 1218.03125,
+    "y": 302.9202575683594,
+    "z": "b1a89180.b5141",
     "wires": []
   },
   {
-    "id": "83edb691.4ecc08",
+    "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": 1348,
-    "y": 290.2223434448242,
-    "z": "89eca582.be817",
+    "x": 1369.03125,
+    "y": 263.9202575683594,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "6271005d.f22478"
+        "7fbf4ad7.4e3104"
       ]
     ]
   },
   {
-    "id": "6271005d.f22478",
+    "id": "7fbf4ad7.4e3104",
     "type": "outcomeTrue",
     "name": "true",
     "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1534,
-    "y": 299.2223434448242,
-    "z": "89eca582.be817",
+    "x": 1555.03125,
+    "y": 272.9202575683594,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "170629d3.536056"
+        "63b25ae1.3cec14"
       ]
     ]
   },
   {
-    "id": "170629d3.536056",
+    "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": 1717,
-    "y": 303.2223434448242,
-    "z": "89eca582.be817",
+    "x": 1738.03125,
+    "y": 276.9202575683594,
+    "z": "b1a89180.b5141",
     "wires": []
   },
   {
-    "id": "e6735147.08a6d8",
+    "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": 820,
-    "y": 857.2223434448242,
-    "z": "89eca582.be817",
+    "x": 858.03125,
+    "y": 687.9202880859375,
+    "z": "b1a89180.b5141",
     "wires": [
       []
     ]
   },
   {
-    "id": "390c3473.62cfd4",
+    "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.sdncRestApi.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": 1602,
-    "y": 613,
-    "z": "89eca582.be817",
+    "x": 1623.03125,
+    "y": 586.6979141235352,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "114e384f.cecfb8",
-        "a016d52e.8ce4a8"
+        "ca41c77.6b99238",
+        "b6f946b3.5d1538"
       ]
     ]
   },
   {
-    "id": "114e384f.cecfb8",
+    "id": "ca41c77.6b99238",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1842,
-    "y": 576,
-    "z": "89eca582.be817",
+    "x": 1863.03125,
+    "y": 549.6979141235352,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "600363c2.6867f4"
+        "fb54fc36.0391d"
       ]
     ]
   },
   {
-    "id": "a016d52e.8ce4a8",
+    "id": "b6f946b3.5d1538",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1849.25,
-    "y": 642.6428833007812,
-    "z": "89eca582.be817",
+    "x": 1870.28125,
+    "y": 616.3407974243164,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "e5ef3b3f.f1e878"
+        "987fca22.525748"
       ]
     ]
   },
   {
-    "id": "e5ef3b3f.f1e878",
+    "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": 2030,
-    "y": 641.3929443359375,
-    "z": "89eca582.be817",
+    "x": 2051.03125,
+    "y": 615.0908584594727,
+    "z": "b1a89180.b5141",
     "wires": []
   },
   {
-    "id": "600363c2.6867f4",
+    "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": 2027,
-    "y": 573,
-    "z": "89eca582.be817",
+    "x": 2048.03125,
+    "y": 546.6979141235352,
+    "z": "b1a89180.b5141",
     "wires": []
   },
   {
-    "id": "9b0fa013.788a28",
+    "id": "a48f9d80.400a6",
     "type": "success",
     "name": "success",
     "xml": "<outcome value='success'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1799,
-    "y": 698,
-    "z": "89eca582.be817",
+    "x": 1899.03125,
+    "y": 737.6979370117188,
+    "z": "b1a89180.b5141",
     "wires": [
-      []
+      [
+        "c960eb18.e0632"
+      ]
     ]
   },
   {
-    "id": "19c42608.424b9a",
+    "id": "17b55d13.d0f583",
     "type": "failure",
     "name": "failure",
     "xml": "<outcome value='failure'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1800.25,
-    "y": 761.642822265625,
-    "z": "89eca582.be817",
+    "x": 1851.28125,
+    "y": 978.3407592773438,
+    "z": "b1a89180.b5141",
     "wires": [
       [
-        "6961c23b.26892c"
+        "896de823.531688"
       ]
     ]
   },
   {
-    "id": "6961c23b.26892c",
+    "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": 1966,
-    "y": 764.3929443359375,
-    "z": "89eca582.be817",
+    "x": 2040.03125,
+    "y": 981.0908813476562,
+    "z": "b1a89180.b5141",
     "wires": []
   },
   {
-    "id": "4e922d10.8ba70c",
+    "id": "730f31fc.13307",
     "type": "block",
     "name": "block : atomic",
-    "xml": "<block atomic=\"true\">\n",
+    "xml": "<block atomic='true'>",
+    "atomic": "true",
+    "comments": "",
+    "outputs": 1,
+    "x": 1294.03125,
+    "y": 597.6979141235352,
+    "z": "b1a89180.b5141",
+    "wires": [
+      [
+        "d58d3bad.af4188",
+        "e2203ccc.e2252",
+        "d01694ec.b6d578",
+        "1f654f28.833041",
+        "298989a7.60397e"
+      ]
+    ]
+  },
+  {
+    "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": 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": 1273,
-    "y": 624,
-    "z": "89eca582.be817",
+    "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": [
       [
-        "390c3473.62cfd4",
-        "e7464274.0f82b8"
+        "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": []
   }
 ]