X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=platform-logic%2Fgeneric-resource-api%2Fsrc%2Fmain%2Fjson%2FGENERIC-RESOURCE-API_site-vnf-topology-operation-delete.json;h=01081e1fa890465c571575f1f501f476e42432ff;hb=f5b2457c6f66e4e357fe469df370d1ce8b4f0cd9;hp=0c5523424b65544fa20e1bd63ccbec3977f1b22e;hpb=3abd0b494d868f5cb30eea4665946a52956873b3;p=sdnc%2Foam.git

diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_site-vnf-topology-operation-delete.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_site-vnf-topology-operation-delete.json
index 0c552342..01081e1f 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_site-vnf-topology-operation-delete.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_site-vnf-topology-operation-delete.json
@@ -1,20 +1,20 @@
 [
   {
-    "id": "a2b91e00.0dacb",
+    "id": "a7726866.c82328",
     "type": "dgstart",
     "name": "DGSTART",
     "outputs": 1,
-    "x": 119,
-    "y": 37,
-    "z": "7bfb2dad.3744a4",
+    "x": 195,
+    "y": 120.41365623474121,
+    "z": "3abedd3.792ad22",
     "wires": [
       [
-        "17fbd1a8.a9b4ce"
+        "3384c619.e1dafa"
       ]
     ]
   },
   {
-    "id": "17fbd1a8.a9b4ce",
+    "id": "3384c619.e1dafa",
     "type": "service-logic",
     "name": "GENERIC-RESOURCE-API ${project.version}",
     "module": "GENERIC-RESOURCE-API",
@@ -22,596 +22,432 @@
     "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": 194.28570556640625,
-    "y": 77.23811149597168,
-    "z": "7bfb2dad.3744a4",
+    "x": 270.28570556640625,
+    "y": 160.6517677307129,
+    "z": "3abedd3.792ad22",
     "wires": [
       [
-        "cd1ac734.4667a8"
+        "ca099e7c.f45ae"
       ]
     ]
   },
   {
-    "id": "cd1ac734.4667a8",
+    "id": "ca099e7c.f45ae",
     "type": "method",
     "name": "method site-vnf-topology-operation-delete",
     "xml": "<method rpc='site-vnf-topology-operation-delete' mode='sync'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 215.42861938476562,
-    "y": 167,
-    "z": "7bfb2dad.3744a4",
+    "x": 250.42861938476562,
+    "y": 296.4136562347412,
+    "z": "3abedd3.792ad22",
     "wires": [
       [
-        "8f642f93.2a801"
+        "cdd2879.5989078"
       ]
     ]
   },
   {
-    "id": "8f642f93.2a801",
+    "id": "965a63f9.a0196",
+    "type": "comment",
+    "name": "site-vnf-topology-operation-delete",
+    "info": "",
+    "comments": "",
+    "x": 644.3449172973633,
+    "y": 194.00005531311035,
+    "z": "3abedd3.792ad22",
+    "wires": []
+  },
+  {
+    "id": "cdd2879.5989078",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 347.6666564941406,
-    "y": 226.66668701171875,
-    "z": "7bfb2dad.3744a4",
+    "x": 271.66666412353516,
+    "y": 422.0803279876709,
+    "z": "3abedd3.792ad22",
     "wires": [
       [
-        "76c48b79.d84cf4",
-        "bfaa0886.4026e8",
-        "d0626629.81a8c8",
-        "a00c6468.40dc18",
-        "d6cddc91.15c3a",
-        "1aa89ef4.371e21"
+        "e74f18c4.f49f98",
+        "e52597d4.97d0a8",
+        "6a942976.e989d8",
+        "6ffb0bce.7eb574",
+        "ba634d70.518cb",
+        "52c3ad0c.e6f634",
+        "26f755dc.77218a",
+        "ea9d888e.357438",
+        "a4fc2f21.bb9f6"
       ]
     ]
   },
   {
-    "id": "76c48b79.d84cf4",
+    "id": "26f755dc.77218a",
     "type": "switchNode",
     "name": "switch service-data.vnfs.vnf_length",
     "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 668.9895935058594,
-    "y": 73.98958587646484,
-    "z": "7bfb2dad.3744a4",
+    "x": 733.0947036743164,
+    "y": 355.6748266220093,
+    "z": "3abedd3.792ad22",
     "wires": [
       [
-        "e84dd0b6.bd49f",
-        "6abf3e26.6123e",
-        "cad37430.9a8ae8"
+        "41237296.cb603c",
+        "1b9b9bc6.ffabe4"
       ]
     ]
   },
   {
-    "id": "e84dd0b6.bd49f",
+    "id": "41237296.cb603c",
     "type": "other",
-    "name": "Null",
+    "name": "outcome Null",
     "xml": "<outcome value=''>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1081.9895935058594,
-    "y": 66.9896469116211,
-    "z": "7bfb2dad.3744a4",
+    "x": 997.8170166015625,
+    "y": 338.23044872283936,
+    "z": "3abedd3.792ad22",
     "wires": [
       [
-        "1e4a1529.eacc1b"
+        "37a1ebd3.c0d944"
       ]
     ]
   },
   {
-    "id": "1e4a1529.eacc1b",
+    "id": "37a1ebd3.c0d944",
     "type": "returnFailure",
     "name": "return failure",
     "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data\" />\n",
     "comments": "",
-    "x": 1300.7670593261719,
-    "y": 42.87859344482422,
-    "z": "7bfb2dad.3744a4",
-    "wires": [
-      
-    ]
+    "x": 1178.8168869018555,
+    "y": 333.23032665252686,
+    "z": "3abedd3.792ad22",
+    "wires": []
   },
   {
-    "id": "6abf3e26.6123e",
+    "id": "1b9b9bc6.ffabe4",
     "type": "other",
     "name": "other",
     "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 993.9899597167969,
-    "y": 120.98966217041016,
-    "z": "7bfb2dad.3744a4",
+    "x": 983.3170166015625,
+    "y": 390.230411529541,
+    "z": "3abedd3.792ad22",
     "wires": [
       [
-        "8e41da85.f0c968"
+        "af3a8c66.5e3d1"
       ]
     ]
   },
   {
-    "id": "8e41da85.f0c968",
+    "id": "af3a8c66.5e3d1",
     "type": "block",
     "name": "block : atomic",
     "xml": "<block atomic=\"true\">",
     "atomic": "true",
     "outputs": 1,
-    "x": 1165.2594909667969,
-    "y": 104.54419708251953,
-    "z": "7bfb2dad.3744a4",
+    "x": 1155.316722869873,
+    "y": 390.2304096221924,
+    "z": "3abedd3.792ad22",
     "wires": [
       [
-        "40ff91c4.16b8c",
-        "901feb4d.552588"
+        "2540b8b2.d6e138",
+        "8b080a11.ba38d8"
       ]
     ]
   },
   {
-    "id": "40ff91c4.16b8c",
-    "type": "for",
-    "name": "for vidx..service-data.vnfs.vnf_length[]",
-    "xml": "<for index='vidx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
+    "id": "8b080a11.ba38d8",
+    "type": "switchNode",
+    "name": "switch tmp.nidx ",
+    "xml": "<switch test=\"`$tmp.nidx`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 1463.2754821777344,
-    "y": 85.41820526123047,
-    "z": "7bfb2dad.3744a4",
+    "x": 1330.31689453125,
+    "y": 409.23033142089844,
+    "z": "3abedd3.792ad22",
     "wires": [
       [
-        "21662e74.a22c42"
+        "29f38b0a.335fc4"
       ]
     ]
   },
   {
-    "id": "901feb4d.552588",
+    "id": "52c3ad0c.e6f634",
     "type": "switchNode",
-    "name": "switch tmp.vidx ",
-    "xml": "<switch test=\"`$tmp.vidx`\">\n\n",
+    "name": "switch vnf-level-oper-status",
+    "xml": "<switch test='`$service-data.vnfs.vnf[$tmp.nidx].vnf-data.vnf-level-oper-status.order-status`'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1384.5768737792969,
-    "y": 128.4013900756836,
-    "z": "7bfb2dad.3744a4",
+    "x": 703.4837036132812,
+    "y": 430.1192903518677,
+    "z": "3abedd3.792ad22",
     "wires": [
       [
-        "ee9e043e.1f4d08"
+        "80dde12f.593ab",
+        "95f83539.1330d8"
       ]
     ]
   },
   {
-    "id": "ee9e043e.1f4d08",
+    "id": "80dde12f.593ab",
     "type": "outcome",
-    "name": "NULL",
-    "xml": "<outcome value=''>\n",
+    "name": "outcome PendingDelete",
+    "xml": "<outcome value='PendingDelete'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1585.0054626464844,
-    "y": 133.9728012084961,
-    "z": "7bfb2dad.3744a4",
+    "x": 994.3169708251953,
+    "y": 434.23041343688965,
+    "z": "3abedd3.792ad22",
     "wires": [
       [
-        "b08c7bb.174c688"
+        "c271a18f.ad7ae"
       ]
     ]
   },
   {
-    "id": "21662e74.a22c42",
-    "type": "switchNode",
-    "name": "switch vnfid found",
-    "xml": "<switch test=\"`$service-data.vnfs.vnf[$vidx].vnf-id == $vnf-topology-operation-input.vnf-information.vnf-id`\">\n\n",
+    "id": "95f83539.1330d8",
+    "type": "other",
+    "name": "other",
+    "xml": "<outcome value='Other'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 1773.7040710449219,
-    "y": 83.66829681396484,
-    "z": "7bfb2dad.3744a4",
+    "x": 940.3170318603516,
+    "y": 481.2304172515869,
+    "z": "3abedd3.792ad22",
     "wires": [
       [
-        "c6e29244.22831"
+        "c4d6206d.a0bea"
       ]
     ]
   },
   {
-    "id": "b08c7bb.174c688",
+    "id": "c4d6206d.a0bea",
     "type": "returnFailure",
     "name": "return failure",
-    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data\" />\n",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'VNF is not in appropriate state for activate. Current state is ' + $service-data.vnfs.vnf[$tmp.nidx].vnf-data.vnf-level-oper-status.order-status`\" />",
     "comments": "",
-    "x": 1756.4339294433594,
-    "y": 134.11565399169922,
-    "z": "7bfb2dad.3744a4",
-    "wires": [
-      
-    ]
+    "x": 1099.8167991638184,
+    "y": 484.2304162979126,
+    "z": "3abedd3.792ad22",
+    "wires": []
   },
   {
-    "id": "c6e29244.22831",
-    "type": "outcomeTrue",
-    "name": "true",
-    "xml": "<outcome value='true'>\n",
+    "id": "ea9d888e.357438",
+    "type": "switchNode",
+    "name": "switch vnf-id",
+    "xml": "<switch test=\"`$vnf-topology-operation-input.vnf-information.vnf-id`\">\n",
     "comments": "",
     "outputs": 1,
-    "x": 1979.6563415527344,
-    "y": 82.56102752685547,
-    "z": "7bfb2dad.3744a4",
+    "x": 669.3170204162598,
+    "y": 311.23042011260986,
+    "z": "3abedd3.792ad22",
     "wires": [
       [
-        "34cb4af6.5dade6"
+        "62e62064.0111a"
       ]
     ]
   },
   {
-    "id": "34cb4af6.5dade6",
-    "type": "set",
-    "name": "set tmp.vidx and ctx.vnf-data",
-    "xml": "<set>\n<parameter name='tmp.vidx' value='`$vidx`' />\n<parameter name='ctx.vnf-data.' value='`$service-data.vnfs.vnf[$vidx].`' />\n",
-    "comments": "",
-    "x": 2218.1880798339844,
-    "y": 78.31102752685547,
-    "z": "7bfb2dad.3744a4",
-    "wires": [
-      
-    ]
-  },
-  {
-    "id": "cad37430.9a8ae8",
+    "id": "62e62064.0111a",
     "type": "outcome",
-    "name": "0",
-    "xml": "<outcome value='0'>\n",
+    "name": "NULL",
+    "xml": "<outcome value=''>",
     "comments": "",
     "outputs": 1,
-    "x": 1075.9583435058594,
-    "y": 30.958335876464844,
-    "z": "7bfb2dad.3744a4",
+    "x": 867.3170852661133,
+    "y": 301.230432510376,
+    "z": "3abedd3.792ad22",
     "wires": [
       [
-        "1e4a1529.eacc1b"
+        "583791bd.81172"
       ]
     ]
   },
   {
-    "id": "4dc3e987.9fd4e8",
-    "type": "comment",
-    "name": "TODO: Check validation",
-    "info": "",
+    "id": "583791bd.81172",
+    "type": "returnFailure",
+    "name": "return failure",
+    "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"vnf-request-input.vnf-input-parameters.name is a required input\" />\n",
     "comments": "",
-    "x": 625.9895935058594,
-    "y": 25.989585876464844,
-    "z": "7bfb2dad.3744a4",
-    "wires": [
-      
-    ]
+    "x": 1033.8169708251953,
+    "y": 298.2304267883301,
+    "z": "3abedd3.792ad22",
+    "wires": []
   },
   {
-    "id": "bfaa0886.4026e8",
-    "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",
+    "id": "a4fc2f21.bb9f6",
+    "type": "execute",
+    "name": "execute requiredParameters",
+    "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='requiredParameters' >\n<parameter name=\"vnf-topology-operation-input.vnf-information.vnf-id\" value=\"$vnf-topology-operation-input.vnf-information.vnf-id\"/>\n\n",
     "comments": "",
-    "x": 590.333251953125,
-    "y": 562.3333740234375,
-    "z": "7bfb2dad.3744a4",
+    "outputs": 1,
+    "x": 726.8170776367188,
+    "y": 251.23041915893555,
+    "z": "3abedd3.792ad22",
     "wires": [
-      
+      []
     ]
   },
   {
-    "id": "728d2d28.940264",
+    "id": "2540b8b2.d6e138",
     "type": "for",
-    "name": "for each vnf",
-    "xml": "<for index='idx' start='`$vnf-index + 1`' end='`$service-data.vnfs.vnf_length`' >\n",
+    "name": "for nidx..service-data.vnfs.vnf[]",
+    "xml": "<for index='nidx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
     "comments": "",
     "outputs": 1,
-    "x": 1117.7793083190918,
-    "y": 393.66661167144775,
-    "z": "7bfb2dad.3744a4",
+    "x": 1390.8168983459473,
+    "y": 345.2303276062012,
+    "z": "3abedd3.792ad22",
     "wires": [
       [
-        "7caecd51.491534"
+        "58bd02b1.41b51c"
       ]
     ]
   },
   {
-    "id": "347e4d01.6da902",
-    "type": "comment",
-    "name": "Remove VNF from service data",
-    "info": "",
-    "comments": "",
-    "x": 640.9380798339844,
-    "y": 342.2382507324219,
-    "z": "7bfb2dad.3744a4",
-    "wires": [
-      
-    ]
-  },
-  {
-    "id": "7caecd51.491534",
-    "type": "set",
-    "name": "move vnf to remove one",
-    "xml": "<set>\n\t<parameter name=\"$tmpidx\" value=\"`$idx - 1`\"/>\n\t<parameter name=\"service-data.vnfs.vnf[$tmpidx].\" value=\"$service-data.vnfs.vnf[$idx].\" />\n\t\n",
-    "comments": "",
-    "x": 1351.3704414367676,
-    "y": 392.6905632019043,
-    "z": "7bfb2dad.3744a4",
-    "wires": [
-      
-    ]
-  },
-  {
-    "id": "d6cddc91.15c3a",
+    "id": "58bd02b1.41b51c",
     "type": "switchNode",
-    "name": "switch vnf_length",
-    "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",
+    "name": "switch vnf-id found",
+    "xml": "<switch test=\"`$service-data.vnfs.vnf[$nidx].vnf-id == $vnf-topology-operation-input.vnf-information.vnf-id`\">\n\n",
     "comments": "",
     "outputs": 1,
-    "x": 604.0371704101562,
-    "y": 395.2462406158447,
-    "z": "7bfb2dad.3744a4",
+    "x": 1646.8169174194336,
+    "y": 345.2303276062012,
+    "z": "3abedd3.792ad22",
     "wires": [
       [
-        "f6c22b0f.9c87a8",
-        "3909fa08.1288e6"
+        "c5d4dadf.96bed8"
       ]
     ]
   },
   {
-    "id": "f6c22b0f.9c87a8",
-    "type": "outcome",
-    "name": "1",
-    "xml": "<outcome value='1'>\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 781.0372123718262,
-    "y": 355.91282749176025,
-    "z": "7bfb2dad.3744a4",
-    "wires": [
-      [
-        "489f0baa.cc5474"
-      ]
-    ]
-  },
-  {
-    "id": "489f0baa.cc5474",
-    "type": "set",
-    "name": "Remove vnfs",
-    "xml": "<set>\n\t<parameter name=\"service-data.vnfs.\" value=\"\"/>\n\n",
-    "comments": "",
-    "x": 944.7037086486816,
-    "y": 355.91292667388916,
-    "z": "7bfb2dad.3744a4",
-    "wires": [
-      
-    ]
-  },
-  {
-    "id": "3909fa08.1288e6",
-    "type": "other",
-    "name": "other",
-    "xml": "<outcome value='Other'>\n",
+    "id": "c5d4dadf.96bed8",
+    "type": "outcomeTrue",
+    "name": "true",
+    "xml": "<outcome value='true'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 779.7039566040039,
-    "y": 439.2461004257202,
-    "z": "7bfb2dad.3744a4",
+    "x": 1823.3169708251953,
+    "y": 348.2303276062012,
+    "z": "3abedd3.792ad22",
     "wires": [
       [
-        "1459edc6.fe9a92"
+        "fef684cd.0b0aa8"
       ]
     ]
   },
   {
-    "id": "e0ce4e15.0694e",
+    "id": "fef684cd.0b0aa8",
     "type": "set",
-    "name": "set new vnf length",
-    "xml": "<set>\n\t<parameter name=\"service-data.vnfs.vnf_length\" value=\"`$service-data.vnfs.vnf_length - 1`\"/>\n\n\t\n",
-    "comments": "",
-    "x": 1137.333396911621,
-    "y": 484.2461853027344,
-    "z": "7bfb2dad.3744a4",
-    "wires": [
-      
-    ]
-  },
-  {
-    "id": "1b0c5771.6e6a79",
-    "type": "set",
-    "name": "Remove the last vnf in the list",
-    "xml": "<set>\n\t<parameter name=\"service-data.vnfs.vnf[$service-data.vnfs.vnf_length-1].\" value=\"\"/>\n\n",
-    "comments": "",
-    "x": 1173.037052154541,
-    "y": 439.3572063446045,
-    "z": "7bfb2dad.3744a4",
-    "wires": [
-      
-    ]
-  },
-  {
-    "id": "1459edc6.fe9a92",
-    "type": "block",
-    "name": "block : atomic",
-    "xml": "<block atomic=\"true\">",
-    "atomic": "true",
-    "outputs": 1,
-    "x": 948.3704452514648,
-    "y": 439.9127473831177,
-    "z": "7bfb2dad.3744a4",
-    "wires": [
-      [
-        "728d2d28.940264",
-        "1b0c5771.6e6a79",
-        "e0ce4e15.0694e"
-      ]
-    ]
-  },
-  {
-    "id": "d0626629.81a8c8",
-    "type": "switchNode",
-    "name": "switch current vnf-level-oper-status == PendingDelete",
-    "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vnf-level-oper-status.order-status == 'PendingDelete'`\">\n",
+    "name": "set tmp.nidx and ctx.vnf-data",
+    "xml": "<set>\n<parameter name='tmp.nidx' value='`$nidx`' />\n<parameter name='ctx.vnf-data.' value='`$service-data.vnfs.vnf[$nidx].vnf-data.`' />\n",
     "comments": "",
-    "outputs": 1,
-    "x": 702.9999885559082,
-    "y": 181.00003623962402,
-    "z": "7bfb2dad.3744a4",
-    "wires": [
-      [
-        "aa414c85.4ebad"
-      ]
-    ]
+    "x": 1990.3169860839844,
+    "y": 409.2303276062012,
+    "z": "3abedd3.792ad22",
+    "wires": []
   },
   {
-    "id": "350728d2.6ecb38",
+    "id": "a5b8b731.dc3498",
     "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=\"Cannot delete a VNF in a Created state\" />\n",
-    "comments": "",
-    "x": 1165.9999809265137,
-    "y": 180,
-    "z": "7bfb2dad.3744a4",
-    "wires": [
-      
-    ]
-  },
-  {
-    "id": "a00c6468.40dc18",
-    "type": "switchNode",
-    "name": "switch current vf-module_length",
-    "xml": "<switch test=\"`$ctx.vnf-data.vf-modules.vf-module_length`\">\n",
-    "comments": "",
-    "outputs": 1,
-    "x": 653.3333320617676,
-    "y": 267.00000190734863,
-    "z": "7bfb2dad.3744a4",
-    "wires": [
-      [
-        "e2c40a8f.28c2e8",
-        "efcade27.df8a7",
-        "fdf813a0.7dec9"
-      ]
-    ]
-  },
-  {
-    "id": "e2c40a8f.28c2e8",
-    "type": "outcome",
-    "name": "0",
-    "xml": "<outcome value='0'>\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=\"vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data\" />\n",
     "comments": "",
-    "outputs": 1,
-    "x": 881.9999732971191,
-    "y": 223.6666431427002,
-    "z": "7bfb2dad.3744a4",
-    "wires": [
-      [
-        "4056136c.450bfc"
-      ]
-    ]
+    "x": 1635.816909790039,
+    "y": 409.23033142089844,
+    "z": "3abedd3.792ad22",
+    "wires": []
   },
   {
-    "id": "efcade27.df8a7",
+    "id": "29f38b0a.335fc4",
     "type": "outcome",
     "name": "NULL",
-    "xml": "<outcome value=''>",
+    "xml": "<outcome value=''>\n",
     "comments": "",
     "outputs": 1,
-    "x": 880.5713844299316,
-    "y": 265.0953006744385,
-    "z": "7bfb2dad.3744a4",
+    "x": 1498.316909790039,
+    "y": 409.23033142089844,
+    "z": "3abedd3.792ad22",
     "wires": [
       [
-        "4056136c.450bfc"
+        "a5b8b731.dc3498"
       ]
     ]
   },
   {
-    "id": "4056136c.450bfc",
-    "type": "block",
-    "name": "block",
-    "xml": "<block>\n",
-    "atomic": "false",
+    "id": "6ffb0bce.7eb574",
+    "type": "set",
+    "name": "set vnfId and vnf-object-path",
+    "xml": "<set>\n<parameter name='vnfId' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />\n<parameter name='vnf-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vnf-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'` \" />",
     "comments": "",
-    "outputs": 1,
-    "x": 1029.1428985595703,
-    "y": 245.0953016281128,
-    "z": "7bfb2dad.3744a4",
-    "wires": [
-      [
-        
-      ]
-    ]
+    "x": 681.3334350585938,
+    "y": 605.747073173523,
+    "z": "3abedd3.792ad22",
+    "wires": []
   },
   {
-    "id": "fdf813a0.7dec9",
-    "type": "other",
-    "name": "other",
-    "xml": "<outcome value='Other'>\n",
+    "id": "ba634d70.518cb",
+    "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": "",
-    "outputs": 1,
-    "x": 880.5714340209961,
-    "y": 306.52388858795166,
-    "z": "7bfb2dad.3744a4",
-    "wires": [
-      [
-        "dbbd756.2a74488"
-      ]
-    ]
+    "x": 630.4445953369141,
+    "y": 731.3025035858154,
+    "z": "3abedd3.792ad22",
+    "wires": []
   },
   {
-    "id": "dbbd756.2a74488",
-    "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=\"Cannot delete the VNF because there are VFs defined\" />\n",
+    "id": "e52597d4.97d0a8",
+    "type": "set",
+    "name": "set new vnf length",
+    "xml": "<set>\n\t<parameter name=\"service-data.vnfs.vnf_length\" value=\"`$service-data.vnfs.vnf_length - 1`\"/>\n\n\t\n",
     "comments": "",
-    "x": 1047.7143287658691,
-    "y": 306.09527683258057,
-    "z": "7bfb2dad.3744a4",
-    "wires": [
-      
-    ]
+    "x": 661.9660186767578,
+    "y": 503.2179307937622,
+    "z": "3abedd3.792ad22",
+    "wires": []
   },
   {
-    "id": "aa414c85.4ebad",
-    "type": "outcomeTrue",
-    "name": "false",
-    "xml": "<outcome value='false'>\n",
+    "id": "6a942976.e989d8",
+    "type": "set",
+    "name": "Remove vnf from ServiceData",
+    "xml": "<set>\n\t<parameter name=\"service-data.vnfs.vnf[$tmp.nidx].\" value=\"\"/>\n\n",
     "comments": "",
-    "outputs": 1,
-    "x": 1005,
-    "y": 181,
-    "z": "7bfb2dad.3744a4",
-    "wires": [
-      [
-        "350728d2.6ecb38"
-      ]
-    ]
+    "x": 697.5902099609375,
+    "y": 547.1858978271484,
+    "z": "3abedd3.792ad22",
+    "wires": []
   },
   {
-    "id": "1aa89ef4.371e21",
+    "id": "e74f18c4.f49f98",
     "type": "delete",
-    "name": "delete Site in AAI",
-    "xml": "<delete plugin='org.onap.ccsdk.sli.adaptors.aai.AAIService' resource='generic-vnf' \n      key='generic-vnf.vnf-id = $prop.vnf-index' >",
+    "name": "delete site instance configuration in AAI",
+    "xml": "<delete plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource='site-resource' \n        key='site-resource.id = $vnf-topology-operation-input.vnf-information.vnf-id'>\n",
     "comments": "",
     "outputs": 1,
-    "x": 604,
-    "y": 510,
-    "z": "7bfb2dad.3744a4",
+    "x": 707.8549957275391,
+    "y": 674.5513019561768,
+    "z": "3abedd3.792ad22",
     "wires": [
-      [
-        
-      ]
+      []
     ]
   },
   {
-    "id": "e61bcb70.9a5e48",
-    "type": "comment",
-    "name": "TODO: AAI",
-    "info": "",
-    "comments": "",
-    "x": 775,
-    "y": 512,
-    "z": "7bfb2dad.3744a4",
+    "id": "c271a18f.ad7ae",
+    "type": "block",
+    "name": "block : atomic",
+    "xml": "<block atomic=\"true\">",
+    "atomic": "true",
+    "outputs": 1,
+    "x": 1191.6233711242676,
+    "y": 444.55556774139404,
+    "z": "3abedd3.792ad22",
     "wires": [
-      
+      []
     ]
   }
 ]