Fix SDWAN lan-port-delete DG by passing valid index 04/86604/3
authorprakash.e <prakash.e@huawei.com>
Mon, 6 May 2019 05:23:14 +0000 (10:53 +0530)
committerprakash.e <prakash.e@huawei.com>
Mon, 6 May 2019 05:23:26 +0000 (10:53 +0530)
SDWAN lan-port-config-delete DG, vf-module-id is passed
with correct vnf-index.

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

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 d66530d..74c64fd 100644 (file)
@@ -1,22 +1,22 @@
 [\r
     {\r
-        "id": "5b377527.318dfc",\r
+        "id": "ec163be6.3f3848",\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": 289.00390625,\r
-        "y": 239.5863505601883,\r
-        "z": "6e499246.1345bc",\r
+        "x": 257,\r
+        "y": 184.58635187149048,\r
+        "z": "1c424bc5.8e5824",\r
         "wires": [\r
             [\r
-                "b6ef6d6.088219"\r
+                "4793fbaf.4f8194"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5fa9c4d6.4ec86c",\r
+        "id": "1bec69d8.54d756",\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": 277.28961181640625,\r
-        "y": 140.23810827732086,\r
-        "z": "6e499246.1345bc",\r
+        "x": 245.28570556640625,\r
+        "y": 85.23810958862305,\r
+        "z": "1c424bc5.8e5824",\r
         "wires": [\r
             [\r
-                "5b377527.318dfc"\r
+                "ec163be6.3f3848"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3e4efa76.6244b6",\r
+        "id": "8b3450fa.11be1",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 198.00390625,\r
-        "y": 77.99999868869781,\r
-        "z": "6e499246.1345bc",\r
+        "x": 166,\r
+        "y": 23,\r
+        "z": "1c424bc5.8e5824",\r
         "wires": [\r
             [\r
-                "5fa9c4d6.4ec86c"\r
+                "1bec69d8.54d756"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b6ef6d6.088219",\r
+        "id": "4793fbaf.4f8194",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 305.6706085205078,\r
-        "y": 468.6667181253433,\r
-        "z": "6e499246.1345bc",\r
+        "x": 273.6667022705078,\r
+        "y": 413.6667194366455,\r
+        "z": "1c424bc5.8e5824",\r
         "wires": [\r
             [\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
+                "9dfafdb.c466",\r
+                "a32b04df.766888",\r
+                "1b926ba7.620a94",\r
+                "d56abb49.55c298",\r
+                "dcdd31d0.479e7",\r
+                "fb17bb23.b22de8",\r
+                "4443f52d.bb0e4c",\r
+                "3673a6e1.e30cca",\r
+                "2bcb08d.42550f8",\r
+                "48c6ddd.4092a24",\r
+                "96d011a.ebe42f",\r
+                "279f2432.3dd51c",\r
+                "9d4a1934.79a7a8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a6a43527.61a1e8",\r
+        "id": "a32b04df.766888",\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": 640.0352554321289,\r
-        "y": 249.26914072036743,\r
-        "z": "6e499246.1345bc",\r
+        "x": 608.0313491821289,\r
+        "y": 194.26914203166962,\r
+        "z": "1c424bc5.8e5824",\r
         "wires": [\r
             [\r
-                "5c4cd934.c95538"\r
+                "f4a89702.3708f8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "71f387b9.003178",\r
+        "id": "9dfafdb.c466",\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": 645.0039100646973,\r
-        "y": 188.00001001358032,\r
-        "z": "6e499246.1345bc",\r
+        "x": 613.0000038146973,\r
+        "y": 133.0000113248825,\r
+        "z": "1c424bc5.8e5824",\r
         "wires": [\r
             [\r
-                "ec17d276.93fee"\r
+                "58b9bfe5.41c97"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ec17d276.93fee",\r
+        "id": "58b9bfe5.41c97",\r
         "type": "outcome",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 825.0038909912109,\r
-        "y": 186.99999952316284,\r
-        "z": "6e499246.1345bc",\r
+        "x": 792.9999847412109,\r
+        "y": 132.00000083446503,\r
+        "z": "1c424bc5.8e5824",\r
         "wires": [\r
             [\r
-                "2a49b970.30fb16"\r
+                "2d04caf9.98dff6"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2a49b970.30fb16",\r
+        "id": "2d04caf9.98dff6",\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": 974.4326171875,\r
-        "y": 188.14291715621948,\r
-        "z": "6e499246.1345bc",\r
+        "x": 942.4287109375,\r
+        "y": 133.14291846752167,\r
+        "z": "1c424bc5.8e5824",\r
         "wires": []\r
     },\r
     {\r
-        "id": "5c4cd934.c95538",\r
+        "id": "f4a89702.3708f8",\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": 863.00390625,\r
-        "y": 250.0000057220459,\r
-        "z": "6e499246.1345bc",\r
+        "x": 831,\r
+        "y": 195.00000703334808,\r
+        "z": "1c424bc5.8e5824",\r
         "wires": [\r
             [\r
-                "2a4d20b9.66aac"\r
+                "4ee74d2f.481124"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2a4d20b9.66aac",\r
+        "id": "4ee74d2f.481124",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1078.003890991211,\r
-        "y": 247.99999952316284,\r
-        "z": "6e499246.1345bc",\r
+        "x": 1045.999984741211,\r
+        "y": 193.00000083446503,\r
+        "z": "1c424bc5.8e5824",\r
         "wires": [\r
             [\r
-                "991cadde.a1c2"\r
+                "864b8c78.81cb3"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "991cadde.a1c2",\r
+        "id": "864b8c78.81cb3",\r
         "type": "set",\r
         "name": "set vnf-index",\r
         "xml": "<set>\n<parameter name='vnf-index' value='`$idx`' />\n",\r
         "comments": "",\r
-        "x": 1242.003890991211,\r
-        "y": 242.99999952316284,\r
-        "z": "6e499246.1345bc",\r
+        "x": 1209.999984741211,\r
+        "y": 188.00000083446503,\r
+        "z": "1c424bc5.8e5824",\r
         "wires": []\r
     },\r
     {\r
-        "id": "4d09affd.63ec7",\r
+        "id": "1b926ba7.620a94",\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": 692.0039405822754,\r
-        "y": 391.00002348423004,\r
-        "z": "6e499246.1345bc",\r
+        "x": 660.0000343322754,\r
+        "y": 336.0000247955322,\r
+        "z": "1c424bc5.8e5824",\r
         "wires": [\r
             [\r
-                "7db8009f.80aa9",\r
-                "7fce8758.381048",\r
-                "58a4a3cc.ac1abc"\r
+                "f160fe58.60ceb",\r
+                "c6dbecb6.3daf1",\r
+                "78728405.050dbc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7fce8758.381048",\r
+        "id": "c6dbecb6.3daf1",\r
         "type": "outcome",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 914.0039329528809,\r
-        "y": 425.0000330209732,\r
-        "z": "6e499246.1345bc",\r
+        "x": 882.0000267028809,\r
+        "y": 370.0000343322754,\r
+        "z": "1c424bc5.8e5824",\r
         "wires": [\r
             [\r
-                "c31ea383.0d2c3"\r
+                "8b2c8779.a3f058"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7db8009f.80aa9",\r
+        "id": "f160fe58.60ceb",\r
         "type": "outcome",\r
         "name": "0",\r
         "xml": "<outcome value='0'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 919.0039291381836,\r
-        "y": 372.0000320672989,\r
-        "z": "6e499246.1345bc",\r
+        "x": 887.0000228881836,\r
+        "y": 317.0000333786011,\r
+        "z": "1c424bc5.8e5824",\r
         "wires": [\r
             [\r
-                "c31ea383.0d2c3"\r
+                "8b2c8779.a3f058"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c31ea383.0d2c3",\r
+        "id": "8b2c8779.a3f058",\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": 1077.0039329528809,\r
-        "y": 385.0000330209732,\r
-        "z": "6e499246.1345bc",\r
+        "x": 1045.0000267028809,\r
+        "y": 330.0000343322754,\r
+        "z": "1c424bc5.8e5824",\r
         "wires": []\r
     },\r
     {\r
-        "id": "58a4a3cc.ac1abc",\r
+        "id": "78728405.050dbc",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 914.0039329528809,\r
-        "y": 486.0000330209732,\r
-        "z": "6e499246.1345bc",\r
+        "x": 882.0000267028809,\r
+        "y": 431.0000343322754,\r
+        "z": "1c424bc5.8e5824",\r
         "wires": [\r
             [\r
-                "d3465076.36c57"\r
+                "3894cc60.de2194"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b0e78257.0ab82",\r
+        "id": "70ed1707.f5ee78",\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": 1268.00394821167,\r
-        "y": 484.0000469684601,\r
-        "z": "6e499246.1345bc",\r
+        "x": 1236.00004196167,\r
+        "y": 429.00004827976227,\r
+        "z": "1c424bc5.8e5824",\r
         "wires": []\r
     },\r
     {\r
-        "id": "d3465076.36c57",\r
+        "id": "3894cc60.de2194",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1075.003978729248,\r
-        "y": 483.00002443790436,\r
-        "z": "6e499246.1345bc",\r
+        "x": 1043.000072479248,\r
+        "y": 428.00002574920654,\r
+        "z": "1c424bc5.8e5824",\r
         "wires": [\r
             [\r
-                "b0e78257.0ab82",\r
-                "d9692dd.614b9d"\r
+                "70ed1707.f5ee78",\r
+                "ec070549.11ed28"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d9692dd.614b9d",\r
+        "id": "ec070549.11ed28",\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": 1287.0039176940918,\r
-        "y": 537.00002348423,\r
-        "z": "6e499246.1345bc",\r
+        "x": 1255.0000114440918,\r
+        "y": 482.0000247955322,\r
+        "z": "1c424bc5.8e5824",\r
         "wires": [\r
             [\r
-                "45a4bb37.a28924"\r
+                "fcb13450.487cd8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "45a4bb37.a28924",\r
+        "id": "fcb13450.487cd8",\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": 1558.0039367675781,\r
-        "y": 538.0000606775284,\r
-        "z": "6e499246.1345bc",\r
+        "x": 1526.0000305175781,\r
+        "y": 483.00006198883057,\r
+        "z": "1c424bc5.8e5824",\r
         "wires": [\r
             [\r
-                "a0aa45d1.8fe618"\r
+                "f167edc3.b2418"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "a0aa45d1.8fe618",\r
+        "id": "f167edc3.b2418",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1771.0040607452393,\r
-        "y": 525.0000301599503,\r
-        "z": "6e499246.1345bc",\r
+        "x": 1739.0001544952393,\r
+        "y": 470.00003147125244,\r
+        "z": "1c424bc5.8e5824",\r
         "wires": [\r
             [\r
-                "e8f5881c.0d1318"\r
+                "3335b07e.93a8c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e8f5881c.0d1318",\r
+        "id": "3335b07e.93a8c",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1923.0040321350098,\r
-        "y": 527.00002348423,\r
-        "z": "6e499246.1345bc",\r
+        "x": 1891.0001258850098,\r
+        "y": 472.0000247955322,\r
+        "z": "1c424bc5.8e5824",\r
         "wires": [\r
             [\r
-                "f7c8637f.374ce",\r
-                "c9be57ad.3da878",\r
-                "26312e31.67daa2"\r
+                "3d815800.695568",\r
+                "da733ba9.b543b8",\r
+                "ab8c2e99.50d5d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "f7c8637f.374ce",\r
+        "id": "3d815800.695568",\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": 2145.0040321350098,\r
-        "y": 523.00002348423,\r
-        "z": "6e499246.1345bc",\r
+        "x": 2113.0001258850098,\r
+        "y": 468.0000247955322,\r
+        "z": "1c424bc5.8e5824",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c9be57ad.3da878",\r
+        "id": "da733ba9.b543b8",\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": 2151.0040321350098,\r
-        "y": 572.00002348423,\r
-        "z": "6e499246.1345bc",\r
+        "x": 2119.0001258850098,\r
+        "y": 517.0000247955322,\r
+        "z": "1c424bc5.8e5824",\r
         "wires": []\r
     },\r
     {\r
-        "id": "26312e31.67daa2",\r
+        "id": "ab8c2e99.50d5d",\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
+        "xml": "<call module='GENERIC-RESOURCE-API' rpc='sdwan-get-vf-module-lanport-param' mode='sync' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2179.004253387451,\r
-        "y": 620.0000292062759,\r
-        "z": "6e499246.1345bc",\r
+        "x": 2147.000347137451,\r
+        "y": 565.0000305175781,\r
+        "z": "1c424bc5.8e5824",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "158609f4.fc8936",\r
+        "id": "d56abb49.55c298",\r
         "type": "switchNode",\r
         "name": "switch tmp.vidx ",\r
         "xml": "<switch test=\"`$tmp.vidx`\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 631.0351524353027,\r
-        "y": 564.0161062479019,\r
-        "z": "6e499246.1345bc",\r
+        "x": 599.0312461853027,\r
+        "y": 509.0161075592041,\r
+        "z": "1c424bc5.8e5824",\r
         "wires": [\r
             [\r
-                "cbb03bf0.425b98"\r
+                "a2f7bc45.7d854"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cbb03bf0.425b98",\r
+        "id": "a2f7bc45.7d854",\r
         "type": "outcome",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 778.463794708252,\r
-        "y": 563.5875164270401,\r
-        "z": "6e499246.1345bc",\r
+        "x": 746.459888458252,\r
+        "y": 508.5875177383423,\r
+        "z": "1c424bc5.8e5824",\r
         "wires": [\r
             [\r
-                "6af4136a.19a86c"\r
+                "a5b6de1f.319b7"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "6af4136a.19a86c",\r
+        "id": "a5b6de1f.319b7",\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": 927.892520904541,\r
-        "y": 564.7304340600967,\r
-        "z": "6e499246.1345bc",\r
+        "x": 895.888614654541,\r
+        "y": 509.7304353713989,\r
+        "z": "1c424bc5.8e5824",\r
         "wires": []\r
     },\r
     {\r
-        "id": "7132f9a1.7bd008",\r
+        "id": "9d4a1934.79a7a8",\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": 675.3333129882812,\r
-        "y": 634.3333116769791,\r
-        "z": "6e499246.1345bc",\r
+        "x": 643.3294067382812,\r
+        "y": 579.3333129882812,\r
+        "z": "1c424bc5.8e5824",\r
         "wires": [\r
             [\r
-                "32ea7a53.265046",\r
-                "d6d3b52a.3f5ab8"\r
+                "88c55560.ea56c8",\r
+                "5f573696.518908"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "32ea7a53.265046",\r
+        "id": "88c55560.ea56c8",\r
         "type": "outcome",\r
         "name": "outcome PendingDelete",\r
         "xml": "<outcome value='PendingDelete'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 966.1665802001953,\r
-        "y": 638.444434762001,\r
-        "z": "6e499246.1345bc",\r
+        "x": 930.1627044677734,\r
+        "y": 562.4444751739502,\r
+        "z": "1c424bc5.8e5824",\r
         "wires": [\r
             [\r
-                "6b31ad53.5727b4"\r
+                "ddef1b.d5ace0e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d6d3b52a.3f5ab8",\r
+        "id": "5f573696.518908",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 933.1667175292969,\r
-        "y": 690.444487452507,\r
-        "z": "6e499246.1345bc",\r
+        "x": 914.1628684997559,\r
+        "y": 608.4445171356201,\r
+        "z": "1c424bc5.8e5824",\r
         "wires": [\r
             [\r
-                "148355e2.614e0a"\r
+                "d2e1da0b.14c268"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "148355e2.614e0a",\r
+        "id": "d2e1da0b.14c268",\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": 1092.6664848327637,\r
-        "y": 693.4444864988327,\r
-        "z": "6e499246.1345bc",\r
+        "x": 1131.6626281738281,\r
+        "y": 607.4444761276245,\r
+        "z": "1c424bc5.8e5824",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6b31ad53.5727b4",\r
+        "id": "ddef1b.d5ace0e8",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1163.4729804992676,\r
-        "y": 648.7695890665054,\r
-        "z": "6e499246.1345bc",\r
+        "x": 1144.4691066741943,\r
+        "y": 560.7696704864502,\r
+        "z": "1c424bc5.8e5824",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "13d12ad9.b40a25",\r
+        "id": "4443f52d.bb0e4c",\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": 646.4445304870605,\r
-        "y": 1081.2221623659134,\r
-        "z": "6e499246.1345bc",\r
+        "x": 614.4406242370605,\r
+        "y": 1026.2221636772156,\r
+        "z": "1c424bc5.8e5824",\r
         "wires": []\r
     },\r
     {\r
-        "id": "71b32013.3584b",\r
+        "id": "2bcb08d.42550f8",\r
         "type": "set",\r
         "name": "set prop.vnfNewidx",\r
         "xml": "<set>\n<parameter name='prop.vnfidxLen' value='`0`' />\n",\r
         "comments": "",\r
-        "x": 653.531177520752,\r
-        "y": 705.3334804773331,\r
-        "z": "6e499246.1345bc",\r
+        "x": 621.527271270752,\r
+        "y": 650.3334817886353,\r
+        "z": "1c424bc5.8e5824",\r
         "wires": []\r
     },\r
     {\r
-        "id": "50901066.93c6f",\r
+        "id": "3673a6e1.e30cca",\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": 729.5310974121094,\r
-        "y": 759.3333555459976,\r
-        "z": "6e499246.1345bc",\r
+        "x": 697.5271911621094,\r
+        "y": 704.3333568572998,\r
+        "z": "1c424bc5.8e5824",\r
         "wires": [\r
             [\r
-                "18389e8.0583e62"\r
+                "811b86b3.145198"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "379a2e2e.3a8382",\r
+        "id": "dcdd31d0.479e7",\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": 653.6324691772461,\r
-        "y": 812.1375733613968,\r
-        "z": "6e499246.1345bc",\r
+        "x": 621.6285629272461,\r
+        "y": 757.137574672699,\r
+        "z": "1c424bc5.8e5824",\r
         "wires": []\r
     },\r
     {\r
-        "id": "c59a5d45.5b06a",\r
+        "id": "48c6ddd.4092a24",\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": 694.531135559082,\r
-        "y": 859.333486199379,\r
-        "z": "6e499246.1345bc",\r
+        "x": 662.527229309082,\r
+        "y": 804.3334875106812,\r
+        "z": "1c424bc5.8e5824",\r
         "wires": []\r
     },\r
     {\r
-        "id": "18389e8.0583e62",\r
+        "id": "811b86b3.145198",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 989.5310878753662,\r
-        "y": 766.3332153558731,\r
-        "z": "6e499246.1345bc",\r
+        "x": 957.5271816253662,\r
+        "y": 711.3332166671753,\r
+        "z": "1c424bc5.8e5824",\r
         "wires": [\r
             [\r
-                "a366647e.22aaf8"\r
+                "1e6e592d.12c717"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4315ff0e.d57d4",\r
+        "id": "96d011a.ebe42f",\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='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": 728.5315055847168,\r
-        "y": 1028.5948683023453,\r
-        "z": "6e499246.1345bc",\r
+        "x": 696.5275993347168,\r
+        "y": 973.5948696136475,\r
+        "z": "1c424bc5.8e5824",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "a366647e.22aaf8",\r
+        "id": "1e6e592d.12c717",\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": 1175.5311546325684,\r
-        "y": 766.3333760499954,\r
-        "z": "6e499246.1345bc",\r
+        "x": 1143.5272483825684,\r
+        "y": 711.3333773612976,\r
+        "z": "1c424bc5.8e5824",\r
         "wires": [\r
             [\r
-                "c7c20dda.52c1b"\r
+                "33904649.f29baa"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c7c20dda.52c1b",\r
+        "id": "33904649.f29baa",\r
         "type": "outcomeFalse",\r
         "name": "false",\r
         "xml": "<outcome value='false'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1344.531162261963,\r
-        "y": 765.3332134485245,\r
-        "z": "6e499246.1345bc",\r
+        "x": 1312.527256011963,\r
+        "y": 710.3332147598267,\r
+        "z": "1c424bc5.8e5824",\r
         "wires": [\r
             [\r
-                "72fa222d.49f9ac"\r
+                "feb2eba6.9b1178"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "72fa222d.49f9ac",\r
+        "id": "feb2eba6.9b1178",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1498.5310010910034,\r
-        "y": 757.3332144021988,\r
-        "z": "6e499246.1345bc",\r
+        "x": 1466.5270948410034,\r
+        "y": 702.333215713501,\r
+        "z": "1c424bc5.8e5824",\r
         "wires": [\r
             [\r
-                "ed2c94b0.3c96e8",\r
-                "f18820dc.cc2b"\r
+                "1c71b1a3.8a840e",\r
+                "76b09d29.70bbf4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ed2c94b0.3c96e8",\r
+        "id": "1c71b1a3.8a840e",\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
+        "xml": "<set>\n<parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$prop.vnfidxLen].vf-module-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].vf-module-data.' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$lidx].vf-module-data.`' />\n",\r
         "comments": "",\r
-        "x": 1663.531096458435,\r
-        "y": 732.3333698511124,\r
-        "z": "6e499246.1345bc",\r
+        "x": 1631.527190208435,\r
+        "y": 677.3333711624146,\r
+        "z": "1c424bc5.8e5824",\r
         "wires": []\r
     },\r
     {\r
-        "id": "f18820dc.cc2b",\r
+        "id": "76b09d29.70bbf4",\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": 1685.531096458435,\r
-        "y": 788.3333336114883,\r
-        "z": "6e499246.1345bc",\r
+        "x": 1653.527190208435,\r
+        "y": 733.3333349227905,\r
+        "z": "1c424bc5.8e5824",\r
         "wires": []\r
     },\r
     {\r
-        "id": "6e5f86e6.881a38",\r
+        "id": "fb17bb23.b22de8",\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": 670.333366394043,\r
-        "y": 975.6666570901871,\r
-        "z": "6e499246.1345bc",\r
+        "x": 638.329460144043,\r
+        "y": 920.6666584014893,\r
+        "z": "1c424bc5.8e5824",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8ba40e29.5c2bb",\r
+        "id": "c43a3a93.767aa8",\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": 684.3372116088867,\r
-        "y": 909.5862270593643,\r
-        "z": "6e499246.1345bc",\r
+        "x": 652.3333053588867,\r
+        "y": 854.5862283706665,\r
+        "z": "1c424bc5.8e5824",\r
         "wires": []\r
     },\r
     {\r
-        "id": "cd89e451.16b298",\r
+        "id": "279f2432.3dd51c",\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
+        "x": 617,\r
+        "y": 259.0039075613022,\r
+        "z": "1c424bc5.8e5824",\r
         "wires": [\r
             [\r
-                "ccd2db16.3151b8"\r
+                "145975f0.e3dbaa"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ccd2db16.3151b8",\r
+        "id": "145975f0.e3dbaa",\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
+        "x": 779.0000457763672,\r
+        "y": 258.00390660762787,\r
+        "z": "1c424bc5.8e5824",\r
         "wires": [\r
             [\r
-                "2eb95e60.9609a2"\r
+                "3cec081f.179438"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2eb95e60.9609a2",\r
+        "id": "3cec081f.179438",\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
+        "x": 928.2501373291016,\r
+        "y": 255.78178441524506,\r
+        "z": "1c424bc5.8e5824",\r
         "wires": []\r
     }\r
 ]
\ No newline at end of file
index 30df6e0..7a7dba2 100644 (file)
@@ -1,6 +1,6 @@
 <service-logic\r
-    xmlns='http://www.onap.org/sdnc/svclogic'\r
-    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
+        xmlns='http://www.onap.org/sdnc/svclogic'\r
+        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
     <method rpc='sdwan-vf-operation-lanport-delete' mode='sync'>\r
         <block atomic="true">\r
             <switch test='`$service-data.vnfs.vnf_length`'>\r
@@ -61,7 +61,7 @@
                                         <set>\r
                                             <parameter name='vf-module-request-input.' value='`$ctx.vf-module-data.vf-module-request-input.`' />\r
                                         </set>\r
-                                        <call module='GENERIC-RESOURCE-API' rpc='sdwan-get-vf-module-lan-param' mode='sync' ></call>\r
+                                        <call module='GENERIC-RESOURCE-API' rpc='sdwan-get-vf-module-lanport-param' mode='sync' ></call>\r
                                     </block>\r
                                 </outcome>\r
                             </switch>\r
@@ -99,8 +99,8 @@
                         <outcome value='false'>\r
                             <block atomic="true">\r
                                 <set>\r
-                                    <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`' />\r
-                                    <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.`' />\r
+                                    <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$prop.vnfidxLen].vf-module-id' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$lidx].vf-module-id`' />\r
+                                    <parameter name='service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$prop.vnfidxLen].vf-module-data.' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$lidx].vf-module-data.`' />\r
                                 </set>\r
                                 <set>\r
                                     <parameter name='prop.vnfidxLen' value='`$prop.vnfidxLen + 1`' />\r
  + $vf-module-topology-operation-input.vf-module-information.vf-module-id\r
  + '/vf-module-data/vf-module-topology/'`"/>\r
                 <parameter name='vnf-object-path'\r
- value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'\r
                          value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'\r
  + $vf-module-topology-operation-input.service-information.service-instance-id\r
  + '/service-data/vnfs/vnf/'\r
  + $service-data.vnfs.vnf[$vnf-index].vnf-id\r
  + '/vnf-data/vnf-topology/'`"/>\r
                 <parameter name='service-object-path'\r
- value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'\r
                          value="`'restconf/config/GENERIC-RESOURCE-API:services/service/'\r
  + $vf-module-topology-operation-input.service-information.service-instance-id\r
  + '/service-data/service-topology/'`"/>\r
             </set>\r
-            <delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource='lan-port-config' \r
-        key='lan-port-config.lan-port-config-id = $vf-module-topology-operation-input.vf-module-information.vf-module-id'></delete>\r
+            <delete plugin="org.onap.ccsdk.sli.adaptors.aai.AAIService" resource='lan-port-config'\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