Fixed SDWN lan-port-delete issue in AAI 26/85926/1
authorprakash.e <prakash.e@huawei.com>
Mon, 22 Apr 2019 03:30:38 +0000 (09:00 +0530)
committerprakash.e <prakash.e@huawei.com>
Mon, 22 Apr 2019 03:30:53 +0000 (09:00 +0530)
modifed lan-port-delete DG by chnging AAI
resource name to lan-port-config

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

platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-delete.json
platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-lanport-delete.xml

index 012deec..d66530d 100644 (file)
@@ -1,22 +1,22 @@
 [\r
     {\r
-        "id": "a54d86da.b0b4c8",\r
+        "id": "5b377527.318dfc",\r
         "type": "method",\r
         "name": "method sdwan-vf-operation-lanport-delete",\r
         "xml": "<method rpc='sdwan-vf-operation-lanport-delete' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 234.00000762939453,\r
-        "y": 230.00012350082397,\r
-        "z": "1f04287d.306418",\r
+        "x": 289.00390625,\r
+        "y": 239.5863505601883,\r
+        "z": "6e499246.1345bc",\r
         "wires": [\r
             [\r
-                "4d4d77e8.c38938"\r
+                "b6ef6d6.088219"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "db831233.33e69",\r
+        "id": "5fa9c4d6.4ec86c",\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": 222.28571319580078,\r
-        "y": 130.65188121795654,\r
-        "z": "1f04287d.306418",\r
+        "x": 277.28961181640625,\r
+        "y": 140.23810827732086,\r
+        "z": "6e499246.1345bc",\r
         "wires": [\r
             [\r
-                "a54d86da.b0b4c8"\r
+                "5b377527.318dfc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "62c65238.af2cac",\r
+        "id": "3e4efa76.6244b6",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 143.00000762939453,\r
-        "y": 68.4137716293335,\r
-        "z": "1f04287d.306418",\r
+        "x": 198.00390625,\r
+        "y": 77.99999868869781,\r
+        "z": "6e499246.1345bc",\r
         "wires": [\r
             [\r
-                "db831233.33e69"\r
+                "5fa9c4d6.4ec86c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4d4d77e8.c38938",\r
+        "id": "b6ef6d6.088219",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 250.66670989990234,\r
-        "y": 459.080491065979,\r
-        "z": "1f04287d.306418",\r
+        "x": 305.6706085205078,\r
+        "y": 468.6667181253433,\r
+        "z": "6e499246.1345bc",\r
         "wires": [\r
             [\r
-                "26d66719.d43da8",\r
-                "e7e6cf90.f4145",\r
-                "2040df5d.c513d",\r
-                "58084a37.394334",\r
-                "8cf55d8b.9b86e",\r
-                "6f98bfc7.8211a",\r
-                "b57e1a43.a54548",\r
-                "9d1a9cea.dd56",\r
-                "49881624.abb0c8",\r
-                "c5683ab4.530598",\r
-                "d5b959e7.7e0cc8",\r
-                "d3e08866.ee2d18"\r
+                "71f387b9.003178",\r
+                "a6a43527.61a1e8",\r
+                "4d09affd.63ec7",\r
+                "158609f4.fc8936",\r
+                "7132f9a1.7bd008",\r
+                "379a2e2e.3a8382",\r
+                "6e5f86e6.881a38",\r
+                "13d12ad9.b40a25",\r
+                "50901066.93c6f",\r
+                "71b32013.3584b",\r
+                "c59a5d45.5b06a",\r
+                "4315ff0e.d57d4",\r
+                "cd89e451.16b298"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e7e6cf90.f4145",\r
+        "id": "a6a43527.61a1e8",\r
         "type": "for",\r
         "name": "for each vnf",\r
         "xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 566.0313720703125,\r
-        "y": 304.6829128265381,\r
-        "z": "1f04287d.306418",\r
+        "x": 640.0352554321289,\r
+        "y": 249.26914072036743,\r
+        "z": "6e499246.1345bc",\r
         "wires": [\r
             [\r
-                "7275fe1.35167"\r
+                "5c4cd934.c95538"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "26d66719.d43da8",\r
+        "id": "71f387b9.003178",\r
         "type": "switchNode",\r
         "name": "switch vnf_length",\r
         "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 571.0000267028809,\r
-        "y": 243.41378211975098,\r
-        "z": "1f04287d.306418",\r
+        "x": 645.0039100646973,\r
+        "y": 188.00001001358032,\r
+        "z": "6e499246.1345bc",\r
         "wires": [\r
             [\r
-                "4f7f751d.4ffa8c"\r
+                "ec17d276.93fee"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4f7f751d.4ffa8c",\r
+        "id": "ec17d276.93fee",\r
         "type": "outcome",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 751.0000076293945,\r
-        "y": 242.4137716293335,\r
-        "z": "1f04287d.306418",\r
+        "x": 825.0038909912109,\r
+        "y": 186.99999952316284,\r
+        "z": "6e499246.1345bc",\r
         "wires": [\r
             [\r
-                "b8464fa4.268c7"\r
+                "2a49b970.30fb16"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b8464fa4.268c7",\r
+        "id": "2a49b970.30fb16",\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": 900.4287338256836,\r
-        "y": 243.55668926239014,\r
-        "z": "1f04287d.306418",\r
+        "x": 974.4326171875,\r
+        "y": 188.14291715621948,\r
+        "z": "6e499246.1345bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7275fe1.35167",\r
+        "id": "5c4cd934.c95538",\r
         "type": "switchNode",\r
         "name": "switch this vnf-id == input vnf-id",\r
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$idx].vnf-id == $vf-module-topology-operation-input.vnf-information.vnf-id`\">    \n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 789.0000228881836,\r
-        "y": 305.41377782821655,\r
-        "z": "1f04287d.306418",\r
+        "x": 863.00390625,\r
+        "y": 250.0000057220459,\r
+        "z": "6e499246.1345bc",\r
         "wires": [\r
             [\r
-                "2f21af21.529ff"\r
+                "2a4d20b9.66aac"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2f21af21.529ff",\r
+        "id": "2a4d20b9.66aac",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1004.0000076293945,\r
-        "y": 303.4137716293335,\r
-        "z": "1f04287d.306418",\r
+        "x": 1078.003890991211,\r
+        "y": 247.99999952316284,\r
+        "z": "6e499246.1345bc",\r
         "wires": [\r
             [\r
-                "a1139d12.89e01"\r
+                "991cadde.a1c2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a1139d12.89e01",\r
+        "id": "991cadde.a1c2",\r
         "type": "set",\r
         "name": "set vnf-index",\r
         "xml": "<set>\n<parameter name='vnf-index' value='`$idx`' />\n",\r
         "comments": "",\r
-        "x": 1168.0000076293945,\r
-        "y": 298.4137716293335,\r
-        "z": "1f04287d.306418",\r
+        "x": 1242.003890991211,\r
+        "y": 242.99999952316284,\r
+        "z": "6e499246.1345bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "2040df5d.c513d",\r
+        "id": "4d09affd.63ec7",\r
         "type": "switchNode",\r
         "name": "switch vf-modules.vf-module_length",\r
         "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 637.0000419616699,\r
-        "y": 381.4137964248657,\r
-        "z": "1f04287d.306418",\r
+        "x": 692.0039405822754,\r
+        "y": 391.00002348423004,\r
+        "z": "6e499246.1345bc",\r
         "wires": [\r
             [\r
-                "6da138cf.958678",\r
-                "2a607157.3c86fe",\r
-                "9b455cd1.ad8b9"\r
+                "7db8009f.80aa9",\r
+                "7fce8758.381048",\r
+                "58a4a3cc.ac1abc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2a607157.3c86fe",\r
+        "id": "7fce8758.381048",\r
         "type": "outcome",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 859.0000343322754,\r
-        "y": 415.4138059616089,\r
-        "z": "1f04287d.306418",\r
+        "x": 914.0039329528809,\r
+        "y": 425.0000330209732,\r
+        "z": "6e499246.1345bc",\r
         "wires": [\r
             [\r
-                "9e4075b3.63ff28"\r
+                "c31ea383.0d2c3"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6da138cf.958678",\r
+        "id": "7db8009f.80aa9",\r
         "type": "outcome",\r
         "name": "0",\r
         "xml": "<outcome value='0'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 864.0000305175781,\r
-        "y": 362.41380500793457,\r
-        "z": "1f04287d.306418",\r
+        "x": 919.0039291381836,\r
+        "y": 372.0000320672989,\r
+        "z": "6e499246.1345bc",\r
         "wires": [\r
             [\r
-                "9e4075b3.63ff28"\r
+                "c31ea383.0d2c3"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9e4075b3.63ff28",\r
+        "id": "c31ea383.0d2c3",\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": 1022.0000343322754,\r
-        "y": 375.4138059616089,\r
-        "z": "1f04287d.306418",\r
+        "x": 1077.0039329528809,\r
+        "y": 385.0000330209732,\r
+        "z": "6e499246.1345bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "9b455cd1.ad8b9",\r
+        "id": "58a4a3cc.ac1abc",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 859.0000343322754,\r
-        "y": 476.4138059616089,\r
-        "z": "1f04287d.306418",\r
+        "x": 914.0039329528809,\r
+        "y": 486.0000330209732,\r
+        "z": "6e499246.1345bc",\r
         "wires": [\r
             [\r
-                "76d683a5.eebfec"\r
+                "d3465076.36c57"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3f214675.09ba1a",\r
+        "id": "b0e78257.0ab82",\r
         "type": "set",\r
         "name": "set vf-module_length",\r
         "xml": "<set>\n<parameter name='vf-module-length' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`' />\n\n",\r
         "comments": "",\r
-        "x": 1213.0000495910645,\r
-        "y": 474.41381990909576,\r
-        "z": "1f04287d.306418",\r
+        "x": 1268.00394821167,\r
+        "y": 484.0000469684601,\r
+        "z": "6e499246.1345bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "76d683a5.eebfec",\r
+        "id": "d3465076.36c57",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1020.0000801086426,\r
-        "y": 473.41379737854004,\r
-        "z": "1f04287d.306418",\r
+        "x": 1075.003978729248,\r
+        "y": 483.00002443790436,\r
+        "z": "6e499246.1345bc",\r
         "wires": [\r
             [\r
-                "3f214675.09ba1a",\r
-                "42fcda16.d37964"\r
+                "b0e78257.0ab82",\r
+                "d9692dd.614b9d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "42fcda16.d37964",\r
+        "id": "d9692dd.614b9d",\r
         "type": "for",\r
         "name": "for each existing vf-index",\r
         "xml": "<for index='idx' start='0' end='`$vf-module-length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1232.0000190734863,\r
-        "y": 527.4137964248657,\r
-        "z": "1f04287d.306418",\r
+        "x": 1287.0039176940918,\r
+        "y": 537.00002348423,\r
+        "z": "6e499246.1345bc",\r
         "wires": [\r
             [\r
-                "9de7c553.fd25f8"\r
+                "45a4bb37.a28924"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9de7c553.fd25f8",\r
+        "id": "45a4bb37.a28924",\r
         "type": "switchNode",\r
         "name": "switch vf-module-id found",\r
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-id == $vf-module-topology-operation-input.vf-module-information.vf-module-id`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1503.0000381469727,\r
-        "y": 528.4138336181641,\r
-        "z": "1f04287d.306418",\r
+        "x": 1558.0039367675781,\r
+        "y": 538.0000606775284,\r
+        "z": "6e499246.1345bc",\r
         "wires": [\r
             [\r
-                "f61f0e52.12de6"\r
+                "a0aa45d1.8fe618"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f61f0e52.12de6",\r
+        "id": "a0aa45d1.8fe618",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1716.0001621246338,\r
-        "y": 515.4138031005859,\r
-        "z": "1f04287d.306418",\r
+        "x": 1771.0040607452393,\r
+        "y": 525.0000301599503,\r
+        "z": "6e499246.1345bc",\r
         "wires": [\r
             [\r
-                "cf9e9748.fd3478"\r
+                "e8f5881c.0d1318"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cf9e9748.fd3478",\r
+        "id": "e8f5881c.0d1318",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1868.0001335144043,\r
-        "y": 517.4137964248657,\r
-        "z": "1f04287d.306418",\r
+        "x": 1923.0040321350098,\r
+        "y": 527.00002348423,\r
+        "z": "6e499246.1345bc",\r
         "wires": [\r
             [\r
-                "1f23fa4e.25db46",\r
-                "5446fb0a.a3b5a4",\r
-                "71d1f1bd.544fb"\r
+                "f7c8637f.374ce",\r
+                "c9be57ad.3da878",\r
+                "26312e31.67daa2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1f23fa4e.25db46",\r
+        "id": "f7c8637f.374ce",\r
         "type": "set",\r
         "name": "set tmp.vidx and ctx.vnf-data",\r
         "xml": "<set>\n<parameter name='tmp.vidx' value='`$idx`' />\n<parameter name='ctx.vf-module-data.' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$idx].vf-module-data.`' />\n",\r
         "comments": "",\r
-        "x": 2090.0001335144043,\r
-        "y": 513.4137964248657,\r
-        "z": "1f04287d.306418",\r
+        "x": 2145.0040321350098,\r
+        "y": 523.00002348423,\r
+        "z": "6e499246.1345bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5446fb0a.a3b5a4",\r
+        "id": "c9be57ad.3da878",\r
         "type": "set",\r
         "name": "set vf-module-request-input.",\r
         "xml": "<set>\n<parameter name='vf-module-request-input.' value='`$ctx.vf-module-data.vf-module-request-input.`' />\n\n",\r
         "comments": "",\r
-        "x": 2096.0001335144043,\r
-        "y": 562.4137964248657,\r
-        "z": "1f04287d.306418",\r
+        "x": 2151.0040321350098,\r
+        "y": 572.00002348423,\r
+        "z": "6e499246.1345bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "71d1f1bd.544fb",\r
+        "id": "26312e31.67daa2",\r
         "type": "call",\r
         "name": "call sdwan-get-vf-module-lan-param",\r
         "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-vf-module-lan-param' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2124.0003547668457,\r
-        "y": 610.4138021469116,\r
-        "z": "1f04287d.306418",\r
+        "x": 2179.004253387451,\r
+        "y": 620.0000292062759,\r
+        "z": "6e499246.1345bc",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "58084a37.394334",\r
+        "id": "158609f4.fc8936",\r
         "type": "switchNode",\r
         "name": "switch tmp.vidx ",\r
         "xml": "<switch test=\"`$tmp.vidx`\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 576.0312538146973,\r
-        "y": 554.4298791885376,\r
-        "z": "1f04287d.306418",\r
+        "x": 631.0351524353027,\r
+        "y": 564.0161062479019,\r
+        "z": "6e499246.1345bc",\r
         "wires": [\r
             [\r
-                "a8fd4f02.a0c39"\r
+                "cbb03bf0.425b98"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a8fd4f02.a0c39",\r
+        "id": "cbb03bf0.425b98",\r
         "type": "outcome",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 723.4598960876465,\r
-        "y": 554.0012893676758,\r
-        "z": "1f04287d.306418",\r
+        "x": 778.463794708252,\r
+        "y": 563.5875164270401,\r
+        "z": "6e499246.1345bc",\r
         "wires": [\r
             [\r
-                "e19c0822.f14e78"\r
+                "6af4136a.19a86c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e19c0822.f14e78",\r
+        "id": "6af4136a.19a86c",\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": 872.8886222839355,\r
-        "y": 555.1442070007324,\r
-        "z": "1f04287d.306418",\r
+        "x": 927.892520904541,\r
+        "y": 564.7304340600967,\r
+        "z": "6e499246.1345bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8cf55d8b.9b86e",\r
+        "id": "7132f9a1.7bd008",\r
         "type": "switchNode",\r
         "name": "switch vf-module-oper-status",\r
         "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].vf-module-data.vf-module-level-oper-status.order-status`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 620.3294143676758,\r
-        "y": 624.7470846176147,\r
-        "z": "1f04287d.306418",\r
+        "x": 675.3333129882812,\r
+        "y": 634.3333116769791,\r
+        "z": "6e499246.1345bc",\r
         "wires": [\r
             [\r
-                "56dc0c78.140284",\r
-                "7bad1343.8cb25c"\r
+                "32ea7a53.265046",\r
+                "d6d3b52a.3f5ab8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "56dc0c78.140284",\r
+        "id": "32ea7a53.265046",\r
         "type": "outcome",\r
         "name": "outcome PendingDelete",\r
         "xml": "<outcome value='PendingDelete'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 911.1626815795898,\r
-        "y": 628.8582077026367,\r
-        "z": "1f04287d.306418",\r
+        "x": 966.1665802001953,\r
+        "y": 638.444434762001,\r
+        "z": "6e499246.1345bc",\r
         "wires": [\r
             [\r
-                "27edf28.129770e"\r
+                "6b31ad53.5727b4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7bad1343.8cb25c",\r
+        "id": "d6d3b52a.3f5ab8",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 878.1628189086914,\r
-        "y": 680.8582603931427,\r
-        "z": "1f04287d.306418",\r
+        "x": 933.1667175292969,\r
+        "y": 690.444487452507,\r
+        "z": "6e499246.1345bc",\r
         "wires": [\r
             [\r
-                "ea590f8e.65b32"\r
+                "148355e2.614e0a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ea590f8e.65b32",\r
+        "id": "148355e2.614e0a",\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": 1037.6625862121582,\r
-        "y": 683.8582594394684,\r
-        "z": "1f04287d.306418",\r
+        "x": 1092.6664848327637,\r
+        "y": 693.4444864988327,\r
+        "z": "6e499246.1345bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "27edf28.129770e",\r
+        "id": "6b31ad53.5727b4",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1108.469081878662,\r
-        "y": 639.1833620071411,\r
-        "z": "1f04287d.306418",\r
+        "x": 1163.4729804992676,\r
+        "y": 648.7695890665054,\r
+        "z": "6e499246.1345bc",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "9d1a9cea.dd56",\r
+        "id": "13d12ad9.b40a25",\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": 591.4406318664551,\r
-        "y": 1071.635935306549,\r
-        "z": "1f04287d.306418",\r
+        "x": 646.4445304870605,\r
+        "y": 1081.2221623659134,\r
+        "z": "6e499246.1345bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c5683ab4.530598",\r
+        "id": "71b32013.3584b",\r
         "type": "set",\r
         "name": "set prop.vnfNewidx",\r
         "xml": "<set>\n<parameter name='prop.vnfidxLen' value='`0`' />\n",\r
         "comments": "",\r
-        "x": 598.5272789001465,\r
-        "y": 695.7472534179688,\r
-        "z": "1f04287d.306418",\r
+        "x": 653.531177520752,\r
+        "y": 705.3334804773331,\r
+        "z": "6e499246.1345bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "49881624.abb0c8",\r
+        "id": "50901066.93c6f",\r
         "type": "for",\r
         "name": "for lidx..service-data.vf-modules.vf-module[]",\r
         "xml": "<for index='lidx' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 674.5271987915039,\r
-        "y": 749.7471284866333,\r
-        "z": "1f04287d.306418",\r
+        "x": 729.5310974121094,\r
+        "y": 759.3333555459976,\r
+        "z": "6e499246.1345bc",\r
         "wires": [\r
             [\r
-                "3538a71e.fcff88"\r
+                "18389e8.0583e62"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6f98bfc7.8211a",\r
+        "id": "379a2e2e.3a8382",\r
         "type": "set",\r
         "name": "set new vnf length",\r
         "xml": "<set>\n\t<parameter name=\"service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length\" value='`$prop.vnfidxLen`'/>\n\n\t\n",\r
         "comments": "",\r
-        "x": 598.6285705566406,\r
-        "y": 802.5513463020325,\r
-        "z": "1f04287d.306418",\r
+        "x": 653.6324691772461,\r
+        "y": 812.1375733613968,\r
+        "z": "6e499246.1345bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d5b959e7.7e0cc8",\r
+        "id": "c59a5d45.5b06a",\r
         "type": "set",\r
         "name": "Remove vnf from ServiceData",\r
         "xml": "<set>\n\t<parameter name=\"service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$prop.vnfidxLen].\" value=\"\"/>\n",\r
         "comments": "",\r
-        "x": 639.5272369384766,\r
-        "y": 849.7472591400146,\r
-        "z": "1f04287d.306418",\r
+        "x": 694.531135559082,\r
+        "y": 859.333486199379,\r
+        "z": "6e499246.1345bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3538a71e.fcff88",\r
+        "id": "18389e8.0583e62",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 934.5271892547607,\r
-        "y": 756.7469882965088,\r
-        "z": "1f04287d.306418",\r
+        "x": 989.5310878753662,\r
+        "y": 766.3332153558731,\r
+        "z": "6e499246.1345bc",\r
         "wires": [\r
             [\r
-                "10631fee.66247"\r
+                "a366647e.22aaf8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d3e08866.ee2d18",\r
+        "id": "4315ff0e.d57d4",\r
         "type": "delete",\r
         "name": "delete lanport vf instance configuration in AAI",\r
-        "xml": "<delete plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource='lan-port-config' \n        key='site-resource.site-resource-id = $vf-module-topology-operation-input.vf-module-information.vf-module-id'>\n",\r
+        "xml": "<delete plugin=\"org.onap.ccsdk.sli.adaptors.aai.AAIService\" resource='lan-port-config' \n        key='lan-port-config.lan-port-config-id = $vf-module-topology-operation-input.vf-module-information.vf-module-id'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 673.5276069641113,\r
-        "y": 1019.008641242981,\r
-        "z": "1f04287d.306418",\r
+        "x": 728.5315055847168,\r
+        "y": 1028.5948683023453,\r
+        "z": "6e499246.1345bc",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "10631fee.66247",\r
+        "id": "a366647e.22aaf8",\r
         "type": "switchNode",\r
         "name": "switch vnf-id found",\r
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$lidx].vf-module-data.vf-module-information.vf-module-id == $vf-module-topology-operation-input.vf-module-information.vf-module-id`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1120.527256011963,\r
-        "y": 756.7471489906311,\r
-        "z": "1f04287d.306418",\r
+        "x": 1175.5311546325684,\r
+        "y": 766.3333760499954,\r
+        "z": "6e499246.1345bc",\r
         "wires": [\r
             [\r
-                "5f2f4339.fa3b9c"\r
+                "c7c20dda.52c1b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5f2f4339.fa3b9c",\r
+        "id": "c7c20dda.52c1b",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1289.5272636413574,\r
-        "y": 755.7469863891602,\r
-        "z": "1f04287d.306418",\r
+        "x": 1344.531162261963,\r
+        "y": 765.3332134485245,\r
+        "z": "6e499246.1345bc",\r
         "wires": [\r
             [\r
-                "282bbccf.a76394"\r
+                "72fa222d.49f9ac"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "282bbccf.a76394",\r
+        "id": "72fa222d.49f9ac",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1443.527102470398,\r
-        "y": 747.7469873428345,\r
-        "z": "1f04287d.306418",\r
+        "x": 1498.5310010910034,\r
+        "y": 757.3332144021988,\r
+        "z": "6e499246.1345bc",\r
         "wires": [\r
             [\r
-                "15dd9ec6.9cd7d1",\r
-                "810eaf7a.70186"\r
+                "ed2c94b0.3c96e8",\r
+                "f18820dc.cc2b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "15dd9ec6.9cd7d1",\r
+        "id": "ed2c94b0.3c96e8",\r
         "type": "set",\r
         "name": "set  vnf data",\r
         "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$prop.vnfidxLen].vnf-id' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[lidx].vf-module-id`' />\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$prop.vnfidxLen].vnf-data.' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[lidx].vf-module-data.`' />\n",\r
         "comments": "",\r
-        "x": 1608.5271978378296,\r
-        "y": 722.747142791748,\r
-        "z": "1f04287d.306418",\r
+        "x": 1663.531096458435,\r
+        "y": 732.3333698511124,\r
+        "z": "6e499246.1345bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "810eaf7a.70186",\r
+        "id": "f18820dc.cc2b",\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.5271978378296,\r
-        "y": 778.747106552124,\r
-        "z": "1f04287d.306418",\r
+        "x": 1685.531096458435,\r
+        "y": 788.3333336114883,\r
+        "z": "6e499246.1345bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b57e1a43.a54548",\r
+        "id": "6e5f86e6.881a38",\r
         "type": "set",\r
         "name": "set vf-module-object-path",\r
         "xml": "<set>\n<parameter name='vf-module-object-path' value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/vnfs/vnf/'\n + $service-data.vnfs.vnf[$vnf-index].vnf-id\n + '/vnf-data/vf-modules/vf-module/'\n + $vf-module-topology-operation-input.vf-module-information.vf-module-id\n + '/vf-module-data/vf-module-topology/'`\"/>\n<parameter name='vnf-object-path'\n value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/vnfs/vnf/'\n + $service-data.vnfs.vnf[$vnf-index].vnf-id\n + '/vnf-data/vnf-topology/'`\"/>\n<parameter name='service-object-path'\n value=\"`'restconf/config/GENERIC-RESOURCE-API:services/service/'\n + $vf-module-topology-operation-input.service-information.service-instance-id\n + '/service-data/service-topology/'`\"/>\n",\r
         "comments": "",\r
-        "x": 615.3294677734375,\r
-        "y": 966.0804300308228,\r
-        "z": "1f04287d.306418",\r
+        "x": 670.333366394043,\r
+        "y": 975.6666570901871,\r
+        "z": "6e499246.1345bc",\r
         "wires": []\r
     },\r
     {\r
-        "id": "eeeb55b5.4909d8",\r
+        "id": "8ba40e29.5c2bb",\r
         "type": "set",\r
         "name": "Remove vnf from ServiceData",\r
         "xml": "<set>\n\t<parameter name=\"service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.vidx].\" value=\"\"/>\n",\r
         "comments": "",\r
-        "x": 629.3333129882812,\r
-        "y": 900,\r
-        "z": "1f04287d.306418",\r
+        "x": 684.3372116088867,\r
+        "y": 909.5862270593643,\r
+        "z": "6e499246.1345bc",\r
+        "wires": []\r
+    },\r
+    {\r
+        "id": "cd89e451.16b298",\r
+        "type": "switchNode",\r
+        "name": "switch vnf-index",\r
+        "xml": "<switch test='`$vnf-index`'>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 649.00390625,\r
+        "y": 314.00390625,\r
+        "z": "6e499246.1345bc",\r
+        "wires": [\r
+            [\r
+                "ccd2db16.3151b8"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "ccd2db16.3151b8",\r
+        "type": "other",\r
+        "name": "Null",\r
+        "xml": "<outcome value=''>\n",\r
+        "comments": "",\r
+        "outputs": 1,\r
+        "x": 811.0039520263672,\r
+        "y": 313.0039052963257,\r
+        "z": "6e499246.1345bc",\r
+        "wires": [\r
+            [\r
+                "2eb95e60.9609a2"\r
+            ]\r
+        ]\r
+    },\r
+    {\r
+        "id": "2eb95e60.9609a2",\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 id not found in service-data\" />\n",\r
+        "comments": "",\r
+        "x": 960.2540435791016,\r
+        "y": 310.78178310394287,\r
+        "z": "6e499246.1345bc",\r
         "wires": []\r
     }\r
 ]
\ No newline at end of file
index 5fb6735..30df6e0 100644 (file)
                     </outcome>\r
                 </switch>\r
             </for>\r
+            <switch test='`$vnf-index`'>\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 id not found in service-data" />\r
+                    </return>\r
+                </outcome>\r
+            </switch>\r
             <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`'>\r
                 <outcome value='0'>\r
                     <return status='failure'>\r
  + '/service-data/service-topology/'`"/>\r
             </set>\r
             <delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource='lan-port-config' \r
-        key='site-resource.site-resource-id = $vf-module-topology-operation-input.vf-module-information.vf-module-id'></delete>\r
+        key='lan-port-config.lan-port-config-id = $vf-module-topology-operation-input.vf-module-information.vf-module-id'></delete>\r
             <return status='success'>\r
                 <parameter name="ack-final-indicator" value="Y" />\r
                 <parameter name="error-code" value="200" />\r