SDWAN vpn-site-res delete DG duplicate removal 47/86047/2
authorprakash.e <prakash.e@huawei.com>
Tue, 23 Apr 2019 12:44:51 +0000 (18:14 +0530)
committerDan Timoney <dtimoney@att.com>
Wed, 24 Apr 2019 18:08:57 +0000 (18:08 +0000)
In SDWAN vip-site-resource-delete DG, Duplicat
validation of vnf-id is deleted where requiredParameters
method is called for validation and again validating
for NULL check with the same input.

Change-Id: Ic28da8a0d4f03203d0535ac7fa696b725011242f
Issue-ID: SDNC-659
Signed-off-by: Prakash.E <prakash.e@huawei.com>
Former-commit-id: 0e235c74665b23535ab9a715684c700de8d910cb

platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-delete.json
platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_vnf-topology-operation-vpn-site-resource-delete.xml

index 3d26891..41f88c4 100644 (file)
@@ -1,36 +1,36 @@
 [\r
     {\r
-        "id": "eafcb830.49a558",\r
+        "id": "a34c8b72.7caca8",\r
         "type": "method",\r
         "name": "method vnf-topology-operation-vpn-site-resource-delete",\r
         "xml": "<method rpc='vnf-topology-operation-vpn-site-resource-delete' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 207,\r
-        "y": 214,\r
-        "z": "db08cdbb.446ef",\r
+        "x": 244.00390625,\r
+        "y": 243.9999988079071,\r
+        "z": "f9f35a3e.860ce8",\r
         "wires": [\r
             [\r
-                "d02b15b4.dd4488"\r
+                "54a7ab4c.cd61a4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d0a64a79.788248",\r
+        "id": "d8d59f04.fbf0d",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 151.57138061523438,\r
-        "y": 38,\r
-        "z": "db08cdbb.446ef",\r
+        "x": 188.57528686523438,\r
+        "y": 67.9999988079071,\r
+        "z": "f9f35a3e.860ce8",\r
         "wires": [\r
             [\r
-                "188a7052.71591"\r
+                "115026d6.80ce89"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "188a7052.71591",\r
+        "id": "115026d6.80ce89",\r
         "type": "service-logic",\r
         "name": "GENERIC-RESOURCE-API ${project.version}",\r
         "module": "GENERIC-RESOURCE-API",\r
         "comments": "",\r
         "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",\r
         "outputs": 1,\r
-        "x": 226.85708618164062,\r
-        "y": 78.23811149597168,\r
-        "z": "db08cdbb.446ef",\r
+        "x": 263.8609924316406,\r
+        "y": 108.23811030387878,\r
+        "z": "f9f35a3e.860ce8",\r
         "wires": [\r
             [\r
-                "eafcb830.49a558"\r
+                "a34c8b72.7caca8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c2640aa8.7edda8",\r
+        "id": "e3e6f054.e2739",\r
         "type": "comment",\r
         "name": "site-vnf-topology-operation-delete",\r
         "info": "",\r
         "comments": "",\r
-        "x": 600.9162979125977,\r
-        "y": 111.58639907836914,\r
-        "z": "db08cdbb.446ef",\r
+        "x": 637.9202041625977,\r
+        "y": 141.58639788627625,\r
+        "z": "f9f35a3e.860ce8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d02b15b4.dd4488",\r
+        "id": "54a7ab4c.cd61a4",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 228.23804473876953,\r
-        "y": 339.6666717529297,\r
-        "z": "db08cdbb.446ef",\r
+        "x": 265.24195098876953,\r
+        "y": 369.6666705608368,\r
+        "z": "f9f35a3e.860ce8",\r
         "wires": [\r
             [\r
-                "ac2e49a1.5e8568",\r
-                "4d83bd7.fa4f844",\r
-                "8cb0635e.d8e2c",\r
-                "faf06bed.cf0a38",\r
-                "c3cf9f4.9560f6",\r
-                "5c51b14f.3f60b",\r
-                "84b98584.0b5d68",\r
-                "64b20017.f4e26",\r
-                "c1ccb47b.c48ef8",\r
-                "dfa19665.762578",\r
-                "f3ab3fd1.f188e"\r
+                "5cec27dc.b4f998",\r
+                "e053b514.a7c2a8",\r
+                "538824d6.c6a6fc",\r
+                "a69377b.4606688",\r
+                "3ec3b469.7cc4ec",\r
+                "25ca64f5.0561dc",\r
+                "7d20c9cf.4fef58",\r
+                "4cc92ad1.2ef524",\r
+                "c339a825.6ccfe8",\r
+                "dd31e4a5.a51148"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "faf06bed.cf0a38",\r
+        "id": "a69377b.4606688",\r
         "type": "switchNode",\r
         "name": "switch service-data.vnfs.vnf_length",\r
         "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 689.6660842895508,\r
-        "y": 273.26117038726807,\r
-        "z": "db08cdbb.446ef",\r
+        "x": 717.6699981689453,\r
+        "y": 287.2611780166626,\r
+        "z": "f9f35a3e.860ce8",\r
         "wires": [\r
             [\r
-                "7bb61b60.8ccfe4",\r
-                "6a78f7f6.d96ae8"\r
+                "4a61f22a.1420fc",\r
+                "5dae927c.612acc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7bb61b60.8ccfe4",\r
+        "id": "4a61f22a.1420fc",\r
         "type": "other",\r
         "name": "outcome Null",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 954.3883972167969,\r
-        "y": 255.81679248809814,\r
-        "z": "db08cdbb.446ef",\r
+        "x": 982.3923110961914,\r
+        "y": 269.8168001174927,\r
+        "z": "f9f35a3e.860ce8",\r
         "wires": [\r
             [\r
-                "ded5f144.4823a"\r
+                "2a103cd5.07a2e4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ded5f144.4823a",\r
+        "id": "2a103cd5.07a2e4",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data\" />\n",\r
         "comments": "",\r
-        "x": 1135.3882675170898,\r
-        "y": 250.81667041778564,\r
-        "z": "db08cdbb.446ef",\r
+        "x": 1163.3921813964844,\r
+        "y": 264.8166780471802,\r
+        "z": "f9f35a3e.860ce8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6a78f7f6.d96ae8",\r
+        "id": "5dae927c.612acc",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 939.8883972167969,\r
-        "y": 307.8167552947998,\r
-        "z": "db08cdbb.446ef",\r
+        "x": 967.8923110961914,\r
+        "y": 321.81676292419434,\r
+        "z": "f9f35a3e.860ce8",\r
         "wires": [\r
             [\r
-                "4b9e2f73.508cd"\r
+                "84a26be6.b55a98"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4b9e2f73.508cd",\r
+        "id": "84a26be6.b55a98",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1111.8881034851074,\r
-        "y": 307.8167533874512,\r
-        "z": "db08cdbb.446ef",\r
+        "x": 1139.892017364502,\r
+        "y": 321.8167610168457,\r
+        "z": "f9f35a3e.860ce8",\r
         "wires": [\r
             [\r
-                "247799a9.6130f6",\r
-                "84b938cb.78bee8"\r
+                "43c53e66.48eab",\r
+                "bc2744ca.9b7c98"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "84b938cb.78bee8",\r
+        "id": "bc2744ca.9b7c98",\r
         "type": "switchNode",\r
         "name": "switch tmp.nidx ",\r
         "xml": "<switch test=\"`$tmp.nidx`\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1286.8882751464844,\r
-        "y": 326.8166751861572,\r
-        "z": "db08cdbb.446ef",\r
+        "x": 1314.892189025879,\r
+        "y": 340.81668281555176,\r
+        "z": "f9f35a3e.860ce8",\r
         "wires": [\r
             [\r
-                "7a17688b.c98ab8"\r
+                "36fbace6.f16d84"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8cb0635e.d8e2c",\r
+        "id": "538824d6.c6a6fc",\r
         "type": "switchNode",\r
         "name": "switch vnf-level-oper-status",\r
         "xml": "<switch test='`$service-data.vnfs.vnf[$tmp.nidx].vnf-data.vnf-level-oper-status.order-status`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 660.0550842285156,\r
-        "y": 347.70563411712646,\r
-        "z": "db08cdbb.446ef",\r
+        "x": 688.0589981079102,\r
+        "y": 361.705641746521,\r
+        "z": "f9f35a3e.860ce8",\r
         "wires": [\r
             [\r
-                "6f0effe.88561",\r
-                "4d0008ab.c847c8"\r
+                "9a7aa2ec.10efc",\r
+                "8c012c8c.5b9ba"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6f0effe.88561",\r
+        "id": "9a7aa2ec.10efc",\r
         "type": "outcome",\r
         "name": "outcome PendingDelete",\r
         "xml": "<outcome value='PendingDelete'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 936.888427734375,\r
-        "y": 350.8167338371277,\r
-        "z": "db08cdbb.446ef",\r
+        "x": 964.8923416137695,\r
+        "y": 364.8167414665222,\r
+        "z": "f9f35a3e.860ce8",\r
         "wires": [\r
             [\r
-                "1d4d444b.bf117c"\r
+                "bf8c6806.a7bce8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4d0008ab.c847c8",\r
+        "id": "8c012c8c.5b9ba",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 897.8884124755859,\r
-        "y": 396.816782951355,\r
-        "z": "db08cdbb.446ef",\r
+        "x": 925.8923263549805,\r
+        "y": 410.8167905807495,\r
+        "z": "f9f35a3e.860ce8",\r
         "wires": [\r
             [\r
-                "640a50b6.3e86d"\r
+                "1ed98412.25294c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "640a50b6.3e86d",\r
+        "id": "1ed98412.25294c",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'VNF is not in appropriate state for activate. Current state is ' + $service-data.vnfs.vnf[$tmp.nidx].vnf-data.vnf-level-oper-status.order-status`\" />",\r
         "comments": "",\r
-        "x": 1046.388126373291,\r
-        "y": 395.81676292419434,\r
-        "z": "db08cdbb.446ef",\r
+        "x": 1074.3920402526855,\r
+        "y": 409.81677055358887,\r
+        "z": "f9f35a3e.860ce8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c3cf9f4.9560f6",\r
-        "type": "switchNode",\r
-        "name": "switch vnf-id",\r
-        "xml": "<switch test=\"`$vnf-topology-operation-input.vnf-information.vnf-id`\">\n",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 625.8884010314941,\r
-        "y": 228.81676387786865,\r
-        "z": "db08cdbb.446ef",\r
-        "wires": [\r
-            [\r
-                "6f94c17f.e94a6"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "6f94c17f.e94a6",\r
-        "type": "outcome",\r
-        "name": "NULL",\r
-        "xml": "<outcome value=''>",\r
-        "comments": "",\r
-        "outputs": 1,\r
-        "x": 823.8884658813477,\r
-        "y": 218.81677627563477,\r
-        "z": "db08cdbb.446ef",\r
-        "wires": [\r
-            [\r
-                "723f2fa7.6d1e3"\r
-            ]\r
-        ]\r
-    },\r
-    {\r
-        "id": "723f2fa7.6d1e3",\r
-        "type": "returnFailure",\r
-        "name": "return failure",\r
-        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"vnf-request-input.vnf-input-parameters.name is a required input\" />\n",\r
-        "comments": "",\r
-        "x": 990.3883514404297,\r
-        "y": 215.81677055358887,\r
-        "z": "db08cdbb.446ef",\r
-        "wires": []\r
-    },\r
-    {\r
-        "id": "5c51b14f.3f60b",\r
+        "id": "3ec3b469.7cc4ec",\r
         "type": "execute",\r
         "name": "execute requiredParameters",\r
         "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",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 683.3884582519531,\r
-        "y": 168.81676292419434,\r
-        "z": "db08cdbb.446ef",\r
+        "x": 704.392333984375,\r
+        "y": 230.8167576789856,\r
+        "z": "f9f35a3e.860ce8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "247799a9.6130f6",\r
+        "id": "43c53e66.48eab",\r
         "type": "for",\r
         "name": "for nidx..service-data.vnfs.vnf[]",\r
         "xml": "<for index='nidx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1347.3882789611816,\r
-        "y": 262.81667137145996,\r
-        "z": "db08cdbb.446ef",\r
+        "x": 1375.3921928405762,\r
+        "y": 276.8166790008545,\r
+        "z": "f9f35a3e.860ce8",\r
         "wires": [\r
             [\r
-                "b01b8e2f.7dbb9"\r
+                "d2baa75f.a56cd8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b01b8e2f.7dbb9",\r
+        "id": "d2baa75f.a56cd8",\r
         "type": "switchNode",\r
         "name": "switch vnf-id found",\r
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$nidx].vnf-id == $vnf-topology-operation-input.vnf-information.vnf-id`\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1603.388298034668,\r
-        "y": 262.81667137145996,\r
-        "z": "db08cdbb.446ef",\r
+        "x": 1631.3922119140625,\r
+        "y": 276.8166790008545,\r
+        "z": "f9f35a3e.860ce8",\r
         "wires": [\r
             [\r
-                "357169.84af7e98"\r
+                "16946d10.c0e503"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "357169.84af7e98",\r
+        "id": "16946d10.c0e503",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1779.8883514404297,\r
-        "y": 265.81667137145996,\r
-        "z": "db08cdbb.446ef",\r
+        "x": 1807.8922653198242,\r
+        "y": 279.8166790008545,\r
+        "z": "f9f35a3e.860ce8",\r
         "wires": [\r
             [\r
-                "38f16832.2c5d68"\r
+                "c1f09a0b.fa73f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "38f16832.2c5d68",\r
+        "id": "c1f09a0b.fa73f8",\r
         "type": "set",\r
         "name": "set tmp.nidx and ctx.vnf-data",\r
         "xml": "<set>\n<parameter name='tmp.nidx' value='`$nidx`' />\n<parameter name='ctx.vnf-data.' value='`$service-data.vnfs.vnf[$nidx].vnf-data.`' />\n",\r
         "comments": "",\r
-        "x": 1946.8883666992188,\r
-        "y": 326.81667137145996,\r
-        "z": "db08cdbb.446ef",\r
+        "x": 1974.8922805786133,\r
+        "y": 340.8166790008545,\r
+        "z": "f9f35a3e.860ce8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "fc674990.6f1398",\r
+        "id": "841f20a7.73592",\r
         "type": "returnFailure",\r
         "name": "return failure",\r
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"vnf-topology-operation-input.vnf-request-input.vnf-id not found in service-data\" />\n",\r
         "comments": "",\r
-        "x": 1592.3882904052734,\r
-        "y": 326.8166751861572,\r
-        "z": "db08cdbb.446ef",\r
+        "x": 1620.392204284668,\r
+        "y": 340.81668281555176,\r
+        "z": "f9f35a3e.860ce8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7a17688b.c98ab8",\r
+        "id": "36fbace6.f16d84",\r
         "type": "outcome",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1454.8882904052734,\r
-        "y": 326.8166751861572,\r
-        "z": "db08cdbb.446ef",\r
+        "x": 1482.892204284668,\r
+        "y": 340.81668281555176,\r
+        "z": "f9f35a3e.860ce8",\r
         "wires": [\r
             [\r
-                "fc674990.6f1398"\r
+                "841f20a7.73592"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ac2e49a1.5e8568",\r
+        "id": "5cec27dc.b4f998",\r
         "type": "set",\r
         "name": "set vnfId and vnf-object-path",\r
         "xml": "<set>\n<parameter name='vnfId' value='`$vnf-topology-operation-input.vnf-information.vnf-id`' />\n<parameter name='vnf-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vnf-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'` \" />",\r
         "comments": "",\r
-        "x": 646.9051055908203,\r
-        "y": 562.333676815033,\r
-        "z": "db08cdbb.446ef",\r
+        "x": 674.9090194702148,\r
+        "y": 576.3336844444275,\r
+        "z": "f9f35a3e.860ce8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4d83bd7.fa4f844",\r
+        "id": "e053b514.a7c2a8",\r
         "type": "returnSuccess",\r
         "name": "return success",\r
         "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",\r
         "comments": "",\r
-        "x": 603.0162582397461,\r
-        "y": 639.8892359733582,\r
-        "z": "db08cdbb.446ef",\r
+        "x": 631.0201721191406,\r
+        "y": 653.8892436027527,\r
+        "z": "f9f35a3e.860ce8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1d4d444b.bf117c",\r
+        "id": "bf8c6806.a7bce8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1132.1947860717773,\r
-        "y": 358.141939163208,\r
-        "z": "db08cdbb.446ef",\r
+        "x": 1160.1986999511719,\r
+        "y": 372.14194679260254,\r
+        "z": "f9f35a3e.860ce8",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "84b98584.0b5d68",\r
+        "id": "25ca64f5.0561dc",\r
         "type": "set",\r
         "name": "set prop.vnfNewidx",\r
         "xml": "<set>\n<parameter name='prop.vnfidxLen' value='`0`' />\n",\r
         "comments": "",\r
-        "x": 629.0000762939453,\r
-        "y": 398.00006914138794,\r
-        "z": "db08cdbb.446ef",\r
+        "x": 657.0039901733398,\r
+        "y": 412.00007677078247,\r
+        "z": "f9f35a3e.860ce8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "64b20017.f4e26",\r
+        "id": "7d20c9cf.4fef58",\r
         "type": "for",\r
         "name": "for lidx..service-data.vnfs.vnf[]",\r
         "xml": "<for index='lidx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 653.0000610351562,\r
-        "y": 440.00006771087646,\r
-        "z": "db08cdbb.446ef",\r
+        "x": 681.0039749145508,\r
+        "y": 454.000075340271,\r
+        "z": "f9f35a3e.860ce8",\r
         "wires": [\r
             [\r
-                "ac122a7c.345458"\r
+                "69a35263.2a030c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ac122a7c.345458",\r
+        "id": "69a35263.2a030c",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 914.0001373291016,\r
-        "y": 444.000102519989,\r
-        "z": "db08cdbb.446ef",\r
+        "x": 942.0040512084961,\r
+        "y": 458.00011014938354,\r
+        "z": "f9f35a3e.860ce8",\r
         "wires": [\r
             [\r
-                "7381e65e.fc3b68"\r
+                "a4d1dd60.ffc74"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7381e65e.fc3b68",\r
+        "id": "a4d1dd60.ffc74",\r
         "type": "switchNode",\r
         "name": "switch vnf-id found",\r
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$lidx].vnf-id == $vnf-topology-operation-input.vnf-information.vnf-id`\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1106.0000839233398,\r
-        "y": 453.0001468658447,\r
-        "z": "db08cdbb.446ef",\r
+        "x": 1134.0039978027344,\r
+        "y": 467.00015449523926,\r
+        "z": "f9f35a3e.860ce8",\r
         "wires": [\r
             [\r
-                "61719a57.800f34"\r
+                "4e20e907.55e038"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "61719a57.800f34",\r
+        "id": "4e20e907.55e038",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1292.000099182129,\r
-        "y": 437.0000333786011,\r
-        "z": "db08cdbb.446ef",\r
+        "x": 1320.0040130615234,\r
+        "y": 451.0000410079956,\r
+        "z": "f9f35a3e.860ce8",\r
         "wires": [\r
             [\r
-                "9df0dc24.7346c"\r
+                "58cf5365.23557c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9df0dc24.7346c",\r
+        "id": "58cf5365.23557c",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1443.0000228881836,\r
-        "y": 438.0000696182251,\r
-        "z": "db08cdbb.446ef",\r
+        "x": 1471.0039367675781,\r
+        "y": 452.00007724761963,\r
+        "z": "f9f35a3e.860ce8",\r
         "wires": [\r
             [\r
-                "c661d6a.46dd528",\r
-                "142b6671.1e430a"\r
+                "b99c095f.2dd4a8",\r
+                "9d68eef8.da1f9"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c661d6a.46dd528",\r
+        "id": "b99c095f.2dd4a8",\r
         "type": "set",\r
         "name": "set  vnf data",\r
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$prop.vnfidxLen].vnf-id' value='`$service-data.vnfs.vnf[$lidx].vnf-id`' />\n<parameter name='service-data.vnfs.vnf[$prop.vnfidxLen].vnf-data.' value='`$service-data.vnfs.vnf[$lidx].vnf-data.`' />\n",\r
         "comments": "",\r
-        "x": 1610.0001907348633,\r
-        "y": 412.000253200531,\r
-        "z": "db08cdbb.446ef",\r
+        "x": 1638.0041046142578,\r
+        "y": 426.00026082992554,\r
+        "z": "f9f35a3e.860ce8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "142b6671.1e430a",\r
+        "id": "9d68eef8.da1f9",\r
         "type": "set",\r
         "name": "set prop.vnfNewidx",\r
         "xml": "<set>\n<parameter name='prop.vnfidxLen' value='`$prop.vnfidxLen + 1`' />\n",\r
         "comments": "",\r
-        "x": 1630.0001182556152,\r
-        "y": 469.00018882751465,\r
-        "z": "db08cdbb.446ef",\r
+        "x": 1658.0040321350098,\r
+        "y": 483.0001964569092,\r
+        "z": "f9f35a3e.860ce8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c1ccb47b.c48ef8",\r
+        "id": "4cc92ad1.2ef524",\r
         "type": "set",\r
         "name": "set new vnf length",\r
         "xml": "<set>\n\t<parameter name=\"service-data.vnfs.vnf_length\" value='`$prop.vnfidxLen`'/>\n\n\t\n",\r
         "comments": "",\r
-        "x": 621.1014747619629,\r
-        "y": 483.80442094802856,\r
-        "z": "db08cdbb.446ef",\r
+        "x": 649.1053886413574,\r
+        "y": 497.8044285774231,\r
+        "z": "f9f35a3e.860ce8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "dfa19665.762578",\r
+        "id": "c339a825.6ccfe8",\r
         "type": "set",\r
         "name": "Remove vnf from ServiceData",\r
         "xml": "<set>\n\t<parameter name=\"service-data.vnfs.vnf[$prop.vnfidxLen].\" value=\"\"/>\n\n",\r
         "comments": "",\r
-        "x": 651.000244140625,\r
-        "y": 522.0002040863037,\r
-        "z": "db08cdbb.446ef",\r
+        "x": 679.0041580200195,\r
+        "y": 536.0002117156982,\r
+        "z": "f9f35a3e.860ce8",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f3ab3fd1.f188e",\r
+        "id": "dd31e4a5.a51148",\r
         "type": "save",\r
         "name": "delete AnAI - vnf-instance.orchestration-status",\r
         "xml": "<delete plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" \n\tresource=\"generic-vnf\"   \n\t\tkey=\"generic-vnf.vnf-id = $vnfId\" >\n<parameter name=\"orchestration-status\" value=\"PendingDelete\" />\n<parameter name=\"vnf-type\" value=\"some vnf-type\" />\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 708.0066375732422,\r
-        "y": 599.0106163024902,\r
-        "z": "db08cdbb.446ef",\r
+        "x": 736.0105514526367,\r
+        "y": 613.0106239318848,\r
+        "z": "f9f35a3e.860ce8",\r
         "wires": [\r
             []\r
         ]\r
index 41bab8f..87e6c52 100644 (file)
@@ -6,15 +6,6 @@
             <execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='requiredParameters' >\r
                 <parameter name="vnf-topology-operation-input.vnf-information.vnf-id" value="$vnf-topology-operation-input.vnf-information.vnf-id"/>\r
             </execute>\r
-            <switch test="`$vnf-topology-operation-input.vnf-information.vnf-id`">\r
-                <outcome value=''>\r
-                    <return status='failure'>\r
-                        <parameter name='ack-final' value='Y'/>\r
-                        <parameter name="error-code" value="500" />\r
-                        <parameter name="error-message" value="vnf-request-input.vnf-input-parameters.name is a required input" />\r
-                    </return>\r
-                </outcome>\r
-            </switch>\r
             <switch test='`$service-data.vnfs.vnf_length`'>\r
                 <outcome value=''>\r
                     <return status='failure'>\r