context-parameter returned to caller DG is not correct 25/85325/1
authorprakash.e <prakash.e@huawei.com>
Mon, 15 Apr 2019 14:03:39 +0000 (19:33 +0530)
committerprakash.e <prakash.e@huawei.com>
Mon, 15 Apr 2019 14:03:55 +0000 (19:33 +0530)
parameter tmp.vidx is used in vpn-activate DG,
updated validate-vpn DG by returning tmp.vidx
inplace of tmp.nidx

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

platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_validate-sdwan-vf-vpn-input-parameters.json
platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_validate-sdwan-vf-vpn-input-parameters.xml

index 8a5d8f9..b081673 100644 (file)
@@ -1,20 +1,20 @@
 [\r
     {\r
-        "id": "3eca748a.ef817c",\r
+        "id": "d157ce03.c3288",\r
         "type": "dgstart",\r
         "name": "DGSTART",\r
         "outputs": 1,\r
-        "x": 123,\r
-        "y": 75,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 129,\r
+        "y": 64,\r
+        "z": "87aefe66.c6e82",\r
         "wires": [\r
             [\r
-                "350fb0d5.88723"\r
+                "5ddc2216.ec964c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "350fb0d5.88723",\r
+        "id": "5ddc2216.ec964c",\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": 368.2857131958008,\r
-        "y": 74.23807907104492,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 374.2857131958008,\r
+        "y": 63.23807907104492,\r
+        "z": "87aefe66.c6e82",\r
         "wires": [\r
             [\r
-                "7fecfee8.d291b"\r
+                "e97f46cc.0059c8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7fecfee8.d291b",\r
+        "id": "e97f46cc.0059c8",\r
         "type": "method",\r
         "name": "validate-sdwan-vf-vpn-input-parameters",\r
         "xml": "<method rpc='validate-sdwan-vf-vpn-input-parameters' mode='sync'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 451.9166946411133,\r
-        "y": 209.25301837921143,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 457.9166946411133,\r
+        "y": 198.25301837921143,\r
+        "z": "87aefe66.c6e82",\r
         "wires": [\r
             [\r
-                "8f6f1f8b.897a9"\r
+                "94a6ae40.767b3"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "8f6f1f8b.897a9",\r
+        "id": "94a6ae40.767b3",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 735.9167022705078,\r
-        "y": 197.25304317474365,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 741.9167022705078,\r
+        "y": 186.25304317474365,\r
+        "z": "87aefe66.c6e82",\r
         "wires": [\r
             [\r
-                "634b7128.2e84d",\r
-                "adb8eda0.ca986",\r
-                "bc20a4d8.66ea78",\r
-                "376a189c.5eea28"\r
+                "c1b9af78.ff38c",\r
+                "5ab8336c.d30a1c",\r
+                "26ecbd16.18b922",\r
+                "f0d7fed2.a7f6e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "634b7128.2e84d",\r
+        "id": "c1b9af78.ff38c",\r
         "type": "switchNode",\r
         "name": "switch  svc-action",\r
         "xml": "<switch test='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 995.916633605957,\r
-        "y": 45.25303936004639,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 1001.916633605957,\r
+        "y": 34.25303936004639,\r
+        "z": "87aefe66.c6e82",\r
         "wires": [\r
             [\r
-                "183ac3e9.257bcc"\r
+                "61401669.5d3bb8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "183ac3e9.257bcc",\r
+        "id": "61401669.5d3bb8",\r
         "type": "outcome",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1186.6309356689453,\r
-        "y": 46.2530403137207,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 1192.6309356689453,\r
+        "y": 35.2530403137207,\r
+        "z": "87aefe66.c6e82",\r
         "wires": [\r
             [\r
-                "65be383e.39b058"\r
+                "8deeb25a.a0c7a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "65be383e.39b058",\r
+        "id": "8deeb25a.a0c7a",\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=\"sdnc-request-header.svc-request-id is a required input\" />\n",\r
         "comments": "",\r
-        "x": 1361.0594863891602,\r
-        "y": 45.25303268432617,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 1367.0594863891602,\r
+        "y": 34.25303268432617,\r
+        "z": "87aefe66.c6e82",\r
         "wires": []\r
     },\r
     {\r
-        "id": "adb8eda0.ca986",\r
+        "id": "5ab8336c.d30a1c",\r
         "type": "switchNode",\r
         "name": "switch svc-action",\r
         "xml": "<switch test='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 332.9166564941406,\r
-        "y": 468.2530336380005,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 338.9166564941406,\r
+        "y": 457.2530336380005,\r
+        "z": "87aefe66.c6e82",\r
         "wires": [\r
             [\r
-                "83c4de98.01196",\r
-                "ce7e74f7.3c86c8",\r
-                "147fd5d9.68de3a",\r
-                "1561519f.abda0e",\r
-                "d7c5bf00.510dc"\r
+                "dd523414.2c6af8",\r
+                "3ab9ebd9.cb15a4",\r
+                "748e648b.48faec",\r
+                "364e12f1.bd272e",\r
+                "907aa46b.591888"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "83c4de98.01196",\r
+        "id": "dd523414.2c6af8",\r
         "type": "outcome",\r
         "name": "create",\r
         "xml": "<outcome value='create'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 526.5000228881836,\r
-        "y": 297.66667079925537,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 532.5000228881836,\r
+        "y": 286.66667079925537,\r
+        "z": "87aefe66.c6e82",\r
         "wires": [\r
             [\r
-                "363f7231.506cbe"\r
+                "b695319.fac5ed"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "363f7231.506cbe",\r
+        "id": "b695319.fac5ed",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 687.5000228881836,\r
-        "y": 297.66667079925537,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 693.5000228881836,\r
+        "y": 286.66667079925537,\r
+        "z": "87aefe66.c6e82",\r
         "wires": [\r
             [\r
-                "46be34f.5b2c7cc"\r
+                "1c93366e.75aada"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ce7e74f7.3c86c8",\r
+        "id": "3ab9ebd9.cb15a4",\r
         "type": "outcome",\r
         "name": "deactivate",\r
         "xml": "<outcome value='deactivate'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 499.4920120239258,\r
-        "y": 906.428539276123,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 505.4920120239258,\r
+        "y": 895.428539276123,\r
+        "z": "87aefe66.c6e82",\r
         "wires": [\r
             [\r
-                "aec7db3f.798358"\r
+                "c38c9ea7.d32c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "147fd5d9.68de3a",\r
+        "id": "748e648b.48faec",\r
         "type": "outcome",\r
         "name": "delete",\r
         "xml": "<outcome value='delete'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 503.20639419555664,\r
-        "y": 1077.1430969238281,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 509.20639419555664,\r
+        "y": 1066.1430969238281,\r
+        "z": "87aefe66.c6e82",\r
         "wires": [\r
             [\r
-                "c7708172.24701"\r
+                "cfdfa9d2.e72008"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1561519f.abda0e",\r
+        "id": "364e12f1.bd272e",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 502.9682846069336,\r
-        "y": 1250.571382522583,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 508.9682846069336,\r
+        "y": 1239.571382522583,\r
+        "z": "87aefe66.c6e82",\r
         "wires": [\r
             [\r
-                "b6252f6e.c1321"\r
+                "1c142ebe.8cdf21"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b6252f6e.c1321",\r
+        "id": "1c142ebe.8cdf21",\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=\"`$vf-module-topology-operation-input.sdnc-request-header.svc-action + ' is not a valid svc-action'`\" />\n",\r
         "comments": "",\r
-        "x": 686.5398178100586,\r
-        "y": 1251.190523147583,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 692.5398178100586,\r
+        "y": 1240.190523147583,\r
+        "z": "87aefe66.c6e82",\r
         "wires": []\r
     },\r
     {\r
-        "id": "46be34f.5b2c7cc",\r
+        "id": "1c93366e.75aada",\r
         "type": "switchNode",\r
         "name": "switch request-action",\r
         "xml": "<switch test='`$vf-module-topology-operation-input.request-information.request-action`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 888,\r
-        "y": 295.6666797399521,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 894,\r
+        "y": 284.6666797399521,\r
+        "z": "87aefe66.c6e82",\r
         "wires": [\r
             [\r
-                "3528f63.34e230a",\r
-                "82048a2c.348118"\r
+                "ee1d7ddd.46ad1",\r
+                "3d1afbf1.1b7e64"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3528f63.34e230a",\r
+        "id": "ee1d7ddd.46ad1",\r
         "type": "other",\r
         "name": "Other",\r
         "xml": "<outcome value='Other'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1073.4999923706055,\r
-        "y": 323.66667652130127,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 1079.4999923706055,\r
+        "y": 312.66667652130127,\r
+        "z": "87aefe66.c6e82",\r
         "wires": [\r
             [\r
-                "3198409.3ebdec"\r
+                "efe7d43a.e3e608"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3198409.3ebdec",\r
+        "id": "efe7d43a.e3e608",\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=\"request-information.request-action is required to be SOTN CreateVPNNetworkInstance for svc-action=create\" />\n",\r
         "comments": "",\r
-        "x": 1224.0000228881836,\r
-        "y": 317.66667079925537,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 1230.0000228881836,\r
+        "y": 306.66667079925537,\r
+        "z": "87aefe66.c6e82",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ee1459dc.d090c8",\r
+        "id": "2418184c.a14ab8",\r
         "type": "other",\r
         "name": "DeleteSDWANVpnInstance",\r
         "xml": "<outcome value='DeleteSDWANVpnInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 945.0634384155273,\r
-        "y": 1073.698395729065,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 945.0634078979492,\r
+        "y": 1062.6983680725098,\r
+        "z": "87aefe66.c6e82",\r
         "wires": [\r
             [\r
-                "773b0668.3dfda8"\r
+                "8c2f423e.95a5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "640b4312.a9c5ac",\r
+        "id": "ba1e9ce4.084c2",\r
         "type": "other",\r
         "name": "Other",\r
         "xml": "<outcome value='Other'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 860.6189804077148,\r
-        "y": 1149.920636177063,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 866.6189804077148,\r
+        "y": 1138.920636177063,\r
+        "z": "87aefe66.c6e82",\r
         "wires": [\r
             [\r
-                "20eafb56.ca5e14"\r
+                "29217d6f.264c52"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "20eafb56.ca5e14",\r
+        "id": "29217d6f.264c52",\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=\"request-information.request-action is required to be SOTN DeleteVPNNetworkInstance for svc-action=delete\" />\n",\r
         "comments": "",\r
-        "x": 1020.9524002075195,\r
-        "y": 1152.0317735671997,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 1026.9524002075195,\r
+        "y": 1141.0317735671997,\r
+        "z": "87aefe66.c6e82",\r
         "wires": []\r
     },\r
     {\r
-        "id": "773b0668.3dfda8",\r
+        "id": "8c2f423e.95a5",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1168.9523086547852,\r
-        "y": 1079.9206190109253,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 1174.9523086547852,\r
+        "y": 1068.9206190109253,\r
+        "z": "87aefe66.c6e82",\r
         "wires": [\r
             [\r
-                "30507c3b.465aa4",\r
-                "b4bebf6c.2b4fa",\r
-                "b3df3a7b.216bd8",\r
-                "eb92e3d.8a6ff2"\r
+                "5a51c09f.0dc8a",\r
+                "dac4a6bf.88b598",\r
+                "607c6dc9.f58224",\r
+                "5f5b8df.a6d8d74"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d7c5bf00.510dc",\r
+        "id": "907aa46b.591888",\r
         "type": "outcome",\r
         "name": "activate",\r
         "xml": "<outcome value='activate'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 520.4285774230957,\r
-        "y": 560.7143135070801,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 526.4285774230957,\r
+        "y": 549.7143135070801,\r
+        "z": "87aefe66.c6e82",\r
         "wires": [\r
             [\r
-                "aa89a015.4408d"\r
+                "eff709e7.55cc68"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "aa89a015.4408d",\r
+        "id": "eff709e7.55cc68",\r
         "type": "switchNode",\r
         "name": "switch request-action",\r
         "xml": "<switch test='`$vf-module-topology-operation-input.request-information.request-action`'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 703.2857437133789,\r
-        "y": 557.8571634292603,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 709.2857437133789,\r
+        "y": 546.8571634292603,\r
+        "z": "87aefe66.c6e82",\r
         "wires": [\r
             [\r
-                "c1f6d379.b3eef",\r
-                "89075fc5.672ae"\r
+                "db4e4749.ac5c28",\r
+                "f7339987.1e66e8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c1f6d379.b3eef",\r
+        "id": "db4e4749.ac5c28",\r
         "type": "other",\r
         "name": "ActivateSDWANVpnInstance",\r
         "xml": "<outcome value='ActivateSDWANVpnInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 956.5000228881836,\r
-        "y": 537.6666707992554,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 962.5000228881836,\r
+        "y": 526.6666707992554,\r
+        "z": "87aefe66.c6e82",\r
         "wires": [\r
             [\r
-                "ce665d03.3901d"\r
+                "90c3027e.ce76e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "89075fc5.672ae",\r
+        "id": "f7339987.1e66e8",\r
         "type": "other",\r
         "name": "Other",\r
         "xml": "<outcome value='Other'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 886.5000228881836,\r
-        "y": 577.6666707992554,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 892.5000228881836,\r
+        "y": 566.6666707992554,\r
+        "z": "87aefe66.c6e82",\r
         "wires": [\r
             [\r
-                "c6e2911c.5f916"\r
+                "58df50e9.ec50f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c6e2911c.5f916",\r
+        "id": "58df50e9.ec50f",\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=\"request-information.request-action is required to be SOTN ActivateVPNNetworkInstance for svc-action=activate\" />\n",\r
         "comments": "",\r
-        "x": 1044.0000228881836,\r
-        "y": 577.6666707992554,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 1050.0000228881836,\r
+        "y": 566.6666707992554,\r
+        "z": "87aefe66.c6e82",\r
         "wires": []\r
     },\r
     {\r
-        "id": "ce665d03.3901d",\r
+        "id": "90c3027e.ce76e",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1187.5000228881836,\r
-        "y": 537.6666707992554,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 1193.5000228881836,\r
+        "y": 526.6666707992554,\r
+        "z": "87aefe66.c6e82",\r
         "wires": [\r
             [\r
-                "b3df3a7b.216bd8",\r
-                "30507c3b.465aa4",\r
-                "b4bebf6c.2b4fa",\r
-                "57bd5824.2497c8"\r
+                "607c6dc9.f58224",\r
+                "5a51c09f.0dc8a",\r
+                "dac4a6bf.88b598",\r
+                "befd23a0.20fa9"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c598159a.7423c8",\r
+        "id": "7d17bd6a.99ffe4",\r
         "type": "other",\r
         "name": "DeactivateSDWANVpnInstance",\r
         "xml": "<outcome value='DeactivateSDWANVpnInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 942.9206390380859,\r
-        "y": 908.1429328918457,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 948.9206390380859,\r
+        "y": 897.1429328918457,\r
+        "z": "87aefe66.c6e82",\r
         "wires": [\r
             [\r
-                "50af0272.e02a9c"\r
+                "ae97c0e.69b144"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "e01173d7.fe6b9",\r
+        "id": "754fd131.c0e1d",\r
         "type": "other",\r
         "name": "Other",\r
         "xml": "<outcome value='Other'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 857.9206314086914,\r
-        "y": 977.1429405212402,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 863.9206314086914,\r
+        "y": 966.1429405212402,\r
+        "z": "87aefe66.c6e82",\r
         "wires": [\r
             [\r
-                "d14295e9.c68018"\r
+                "e5085bda.bb5f08"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d14295e9.c68018",\r
+        "id": "e5085bda.bb5f08",\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=\"request-information.request-action is required to be SOTN DeactivateVPNNetworkInstance for svc-action=deactivate\" />\n",\r
         "comments": "",\r
-        "x": 1038.9206466674805,\r
-        "y": 978.1429405212402,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 1044.9206466674805,\r
+        "y": 967.1429405212402,\r
+        "z": "87aefe66.c6e82",\r
         "wires": []\r
     },\r
     {\r
-        "id": "aec7db3f.798358",\r
+        "id": "c38c9ea7.d32c",\r
         "type": "switchNode",\r
         "name": "switch request-action",\r
         "xml": "<switch test='`$vf-module-topology-operation-input.request-information.request-action`'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 679.7776947021484,\r
-        "y": 910.6188039779663,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 685.7776947021484,\r
+        "y": 899.6188039779663,\r
+        "z": "87aefe66.c6e82",\r
         "wires": [\r
             [\r
-                "c598159a.7423c8",\r
-                "e01173d7.fe6b9"\r
+                "7d17bd6a.99ffe4",\r
+                "754fd131.c0e1d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "c7708172.24701",\r
+        "id": "cfdfa9d2.e72008",\r
         "type": "switchNode",\r
         "name": "switch request-action",\r
         "xml": "<switch test='`$vf-module-topology-operation-input.request-information.request-action`'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 683.5554962158203,\r
-        "y": 1076.9523208141327,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 689.5554962158203,\r
+        "y": 1065.9523208141327,\r
+        "z": "87aefe66.c6e82",\r
         "wires": [\r
             [\r
-                "ee1459dc.d090c8",\r
-                "640b4312.a9c5ac"\r
+                "2418184c.a14ab8",\r
+                "ba1e9ce4.084c2"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "50af0272.e02a9c",\r
+        "id": "ae97c0e.69b144",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1202.888786315918,\r
-        "y": 910.9523277282715,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 1208.888786315918,\r
+        "y": 899.9523277282715,\r
+        "z": "87aefe66.c6e82",\r
         "wires": [\r
             [\r
-                "30507c3b.465aa4",\r
-                "b4bebf6c.2b4fa",\r
-                "b3df3a7b.216bd8",\r
-                "c2db488a.b105a8"\r
+                "5a51c09f.0dc8a",\r
+                "dac4a6bf.88b598",\r
+                "607c6dc9.f58224",\r
+                "2fee238f.bd0b7c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "82048a2c.348118",\r
+        "id": "3d1afbf1.1b7e64",\r
         "type": "other",\r
         "name": "CreateSDWANVpnInstance",\r
         "xml": "<outcome value='CreateSDWANVpnInstance'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1172.499984741211,\r
-        "y": 276.6666679382324,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 1178.499984741211,\r
+        "y": 265.6666679382324,\r
+        "z": "87aefe66.c6e82",\r
         "wires": [\r
             [\r
-                "7a0b5551.c75d9c"\r
+                "13930049.ada58"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7a0b5551.c75d9c",\r
+        "id": "13930049.ada58",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1407.49995803833,\r
-        "y": 275.6666679382324,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 1413.49995803833,\r
+        "y": 264.6666679382324,\r
+        "z": "87aefe66.c6e82",\r
         "wires": [\r
             [\r
-                "3f52a78f.7ab728"\r
+                "3daca227.0cf10e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3f52a78f.7ab728",\r
+        "id": "3daca227.0cf10e",\r
         "type": "for",\r
         "name": "for loop i - vpn vf input parameters",\r
         "xml": "<for index=\"i\" start=\"0\" end=\"`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param_length`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1638.000015258789,\r
-        "y": 276.6666679382324,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 1644.000015258789,\r
+        "y": 265.6666679382324,\r
+        "z": "87aefe66.c6e82",\r
         "wires": [\r
             [\r
-                "d37b6b2c.71fb38"\r
+                "3ad26c2a.a0e034"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d37b6b2c.71fb38",\r
+        "id": "3ad26c2a.a0e034",\r
         "type": "block",\r
         "name": "block",\r
         "xml": "<block>\n",\r
         "atomic": "false",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1846.5000228881836,\r
-        "y": 277.66667079925537,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 1852.5000228881836,\r
+        "y": 266.66667079925537,\r
+        "z": "87aefe66.c6e82",\r
         "wires": [\r
             [\r
-                "9ec108e6.32a3b8",\r
-                "a16aa1da.005f3",\r
-                "3a20c40b.dcc4cc"\r
+                "163fb823.6cab78",\r
+                "f1bf47ba.b34c38",\r
+                "c40dcf.883f423"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9ec108e6.32a3b8",\r
+        "id": "163fb823.6cab78",\r
         "type": "set",\r
         "name": "clear tmp-data",\r
         "xml": "<set>\n<parameter name='tmp.name' value='' />\n<parameter name='tmp.value' value='' />\n",\r
         "comments": "",\r
-        "x": 2029.5000228881836,\r
-        "y": 237.66667079925537,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 2035.5000228881836,\r
+        "y": 226.66667079925537,\r
+        "z": "87aefe66.c6e82",\r
         "wires": []\r
     },\r
     {\r
-        "id": "a16aa1da.005f3",\r
+        "id": "f1bf47ba.b34c38",\r
         "type": "set",\r
         "name": "set tmp-data",\r
         "xml": "<set>\n<parameter name='tmp.name' value=\"`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$i].name`\"/>\n<parameter name='tmp.value' value=\"`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[$i].value`\"/>\n",\r
         "comments": "",\r
-        "x": 2024.0000228881836,\r
-        "y": 277.66667079925537,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 2030.0000228881836,\r
+        "y": 266.66667079925537,\r
+        "z": "87aefe66.c6e82",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3a20c40b.dcc4cc",\r
+        "id": "c40dcf.883f423",\r
         "type": "switchNode",\r
         "name": "switch name",\r
         "xml": "<switch test=\"`$tmp.name`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2024.0000228881836,\r
-        "y": 317.66667079925537,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 2030.0000228881836,\r
+        "y": 306.66667079925537,\r
+        "z": "87aefe66.c6e82",\r
         "wires": [\r
             [\r
-                "3280408b.66ab3",\r
-                "63ad3611.30c718",\r
-                "2eab978e.1492a8"\r
+                "1fcdbe0d.6c0992",\r
+                "9406085a.835ae8",\r
+                "bf4803e4.f6139"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d22ab892.eef718",\r
+        "id": "4dd6857a.0d98dc",\r
         "type": "switchNode",\r
         "name": "switch value",\r
         "xml": "<switch test=\"`$tmp.value`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2484.0001907348633,\r
-        "y": 269.66669142246246,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 2490.0001907348633,\r
+        "y": 258.66669142246246,\r
+        "z": "87aefe66.c6e82",\r
         "wires": [\r
             [\r
-                "b07f67fa.6ab208"\r
+                "e0ccccd6.2db1b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2eab978e.1492a8",\r
+        "id": "bf4803e4.f6139",\r
         "type": "outcome",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2243.500358581543,\r
-        "y": 335.66667902469635,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 2249.500358581543,\r
+        "y": 324.66667902469635,\r
+        "z": "87aefe66.c6e82",\r
         "wires": [\r
             [\r
-                "5967794c.72e8b8"\r
+                "a6c05aa9.168a48"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "5967794c.72e8b8",\r
+        "id": "a6c05aa9.168a48",\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=\"`'vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[' + $i + ']' + '.name is a required input'`\" />\n",\r
         "comments": "",\r
-        "x": 2418.5003623962402,\r
-        "y": 334.66667902469635,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 2424.5003623962402,\r
+        "y": 323.66667902469635,\r
+        "z": "87aefe66.c6e82",\r
         "wires": []\r
     },\r
     {\r
-        "id": "3280408b.66ab3",\r
+        "id": "1fcdbe0d.6c0992",\r
         "type": "other",\r
         "name": "name",\r
         "xml": "<outcome value='name'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2243.500358581543,\r
-        "y": 219.66667330265045,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 2249.500358581543,\r
+        "y": 208.66667330265045,\r
+        "z": "87aefe66.c6e82",\r
         "wires": [\r
             [\r
-                "d22ab892.eef718"\r
+                "4dd6857a.0d98dc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "63ad3611.30c718",\r
+        "id": "9406085a.835ae8",\r
         "type": "other",\r
         "name": "topology",\r
         "xml": "<outcome value='topology'>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2255.500114440918,\r
-        "y": 273.333335518837,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 2261.500114440918,\r
+        "y": 262.333335518837,\r
+        "z": "87aefe66.c6e82",\r
         "wires": [\r
             [\r
-                "d22ab892.eef718"\r
+                "4dd6857a.0d98dc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b07f67fa.6ab208",\r
+        "id": "e0ccccd6.2db1b",\r
         "type": "outcome",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2627.5001907348633,\r
-        "y": 269.66669142246246,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 2633.5001907348633,\r
+        "y": 258.66669142246246,\r
+        "z": "87aefe66.c6e82",\r
         "wires": [\r
             [\r
-                "3ecabf5c.8d652"\r
+                "641a1c22.3dabc4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3ecabf5c.8d652",\r
+        "id": "641a1c22.3dabc4",\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=\"`'vf-module-request-input.vf-module-input-parameters.param '+ $tmp.name +' is a required input'`\" />\n",\r
         "comments": "",\r
-        "x": 2785.5001907348633,\r
-        "y": 269.66669142246246,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 2791.5001907348633,\r
+        "y": 258.66669142246246,\r
+        "z": "87aefe66.c6e82",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b3df3a7b.216bd8",\r
+        "id": "607c6dc9.f58224",\r
         "type": "switchNode",\r
         "name": "switch service-data.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": 1479.3889541625977,\r
-        "y": 576.9999761581421,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 1485.3889541625977,\r
+        "y": 565.9999761581421,\r
+        "z": "87aefe66.c6e82",\r
         "wires": [\r
             [\r
-                "37913775.d258a8",\r
-                "8c9e338f.0d83c"\r
+                "9d62d332.6bdf1",\r
+                "5cba95a3.c5c61c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "37913775.d258a8",\r
+        "id": "9d62d332.6bdf1",\r
         "type": "other",\r
         "name": "outcome Null",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1748.0000228881836,\r
-        "y": 556.666711807251,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 1754.0000228881836,\r
+        "y": 545.666711807251,\r
+        "z": "87aefe66.c6e82",\r
         "wires": [\r
             [\r
-                "7c4231f0.9cbb7"\r
+                "55bf1151.ede2f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "7c4231f0.9cbb7",\r
+        "id": "55bf1151.ede2f",\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=\"vf-module-topology-operation-input.vf-module-request-input.vf-module-id not found in service-data\" />\n",\r
         "comments": "",\r
-        "x": 1924.0000228881836,\r
-        "y": 557.6666707992554,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 1930.0000228881836,\r
+        "y": 546.6666707992554,\r
+        "z": "87aefe66.c6e82",\r
         "wires": []\r
     },\r
     {\r
-        "id": "8c9e338f.0d83c",\r
+        "id": "5cba95a3.c5c61c",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1726.5000228881836,\r
-        "y": 597.6666707992554,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 1732.5000228881836,\r
+        "y": 586.6666707992554,\r
+        "z": "87aefe66.c6e82",\r
         "wires": [\r
             [\r
-                "b6f61e8c.9dd35"\r
+                "b3715a78.6bb228"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b6f61e8c.9dd35",\r
+        "id": "b3715a78.6bb228",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1887.5000228881836,\r
-        "y": 597.6666707992554,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 1893.5000228881836,\r
+        "y": 586.6666707992554,\r
+        "z": "87aefe66.c6e82",\r
         "wires": [\r
             [\r
-                "9317c153.6ccad",\r
-                "bdedbaa4.65e588"\r
+                "c872064f.ab0aa8",\r
+                "16b4cc33.475d44"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9317c153.6ccad",\r
+        "id": "c872064f.ab0aa8",\r
         "type": "for",\r
         "name": "for nidx..service-data.vf-modules.vf-module[]",\r
         "xml": "<for index='nidx' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`' >\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2150.0000228881836,\r
-        "y": 577.6666707992554,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 2156.0000228881836,\r
+        "y": 566.6666707992554,\r
+        "z": "87aefe66.c6e82",\r
         "wires": [\r
             [\r
-                "1fade275.78b10e"\r
+                "88526fe7.19ca5"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "1fade275.78b10e",\r
+        "id": "88526fe7.19ca5",\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[$nidx].vf-module-id == $vf-module-topology-operation-input.vf-module-information.vf-module-id`\">\n    \n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2436.0000228881836,\r
-        "y": 577.6666707992554,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 2442.0000228881836,\r
+        "y": 566.6666707992554,\r
+        "z": "87aefe66.c6e82",\r
         "wires": [\r
             [\r
-                "99a1d82a.9dd8c8"\r
+                "100a52a1.442c1d"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "99a1d82a.9dd8c8",\r
+        "id": "100a52a1.442c1d",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2606.5000228881836,\r
-        "y": 577.6666707992554,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 2612.5000228881836,\r
+        "y": 566.6666707992554,\r
+        "z": "87aefe66.c6e82",\r
         "wires": [\r
             [\r
-                "39ae6a67.1c8296"\r
+                "8d9c0c99.1bdcb"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "70e3cfee.6e895",\r
+        "id": "7051b5d0.a337bc",\r
         "type": "set",\r
-        "name": "set tmp.nidx and ctx.network-data",\r
-        "xml": "<set>\n<parameter name='tmp.nidx' value='`$nidx`' />\n<parameter name='ctx.vf-module-data.' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$nidx].vf-module-data.`' />\n",\r
+        "name": "set tmp.vidx and ctx.network-data",\r
+        "xml": "<set>\n<parameter name='tmp.vidx' value='`$nidx`' />\n<parameter name='ctx.vf-module-data.' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$nidx].vf-module-data.`' />\n",\r
         "comments": "",\r
-        "x": 3007.50008392334,\r
-        "y": 574.6667140722275,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 3013.50008392334,\r
+        "y": 563.6667140722275,\r
+        "z": "87aefe66.c6e82",\r
         "wires": []\r
     },\r
     {\r
-        "id": "1412cffb.8d463",\r
+        "id": "683dee11.6434b",\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=\"vf-module-topology-operation-input.vf-module-request-input.vf-module-id not found in service-data\" />\n",\r
         "comments": "",\r
-        "x": 2364.0000228881836,\r
-        "y": 617.6666707992554,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 2370.0000228881836,\r
+        "y": 606.6666707992554,\r
+        "z": "87aefe66.c6e82",\r
         "wires": []\r
     },\r
     {\r
-        "id": "fbeeeb3e.43c3b8",\r
+        "id": "67a62d00.2d4ff4",\r
         "type": "outcome",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2226.5000228881836,\r
-        "y": 617.6666707992554,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 2232.5000228881836,\r
+        "y": 606.6666707992554,\r
+        "z": "87aefe66.c6e82",\r
         "wires": [\r
             [\r
-                "1412cffb.8d463"\r
+                "683dee11.6434b"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bdedbaa4.65e588",\r
+        "id": "16b4cc33.475d44",\r
         "type": "switchNode",\r
-        "name": "switch tmp.nidx ",\r
-        "xml": "<switch test=\"`$tmp.nidx`\">\n\n",\r
+        "name": "switch tmp.vidx ",\r
+        "xml": "<switch test=\"`$tmp.vidx`\">\n\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 2072.5000228881836,\r
-        "y": 617.6666707992554,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 2078.5000228881836,\r
+        "y": 606.6666707992554,\r
+        "z": "87aefe66.c6e82",\r
         "wires": [\r
             [\r
-                "fbeeeb3e.43c3b8"\r
+                "67a62d00.2d4ff4"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "57bd5824.2497c8",\r
+        "id": "befd23a0.20fa9",\r
         "type": "switchNode",\r
         "name": "switch network-level-oper-status",\r
-        "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.vf-module-level-oper-status.order-status`'>\n",\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": 1451.6667098999023,\r
-        "y": 656.5555486679077,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 1457.6667098999023,\r
+        "y": 645.5555486679077,\r
+        "z": "87aefe66.c6e82",\r
         "wires": [\r
             [\r
-                "719dd138.28ef4",\r
-                "2dca8a18.a65586"\r
+                "f546c4ba.29b768",\r
+                "ad8d6fcc.bfcca"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "719dd138.28ef4",\r
+        "id": "f546c4ba.29b768",\r
         "type": "outcome",\r
         "name": "outcome Created",\r
         "xml": "<outcome value='Created'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1748.5001258850098,\r
-        "y": 656.5555467605591,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 1754.5001258850098,\r
+        "y": 645.5555467605591,\r
+        "z": "87aefe66.c6e82",\r
         "wires": [\r
             [\r
-                "94e9cf1a.6c399"\r
+                "72634f47.0cc42"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2dca8a18.a65586",\r
+        "id": "ad8d6fcc.bfcca",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1716.5001258850098,\r
-        "y": 696.5555467605591,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 1722.5001258850098,\r
+        "y": 685.5555467605591,\r
+        "z": "87aefe66.c6e82",\r
         "wires": [\r
             [\r
-                "2c8432e2.7a0b8e"\r
+                "28f836e1.3e6b7a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2c8432e2.7a0b8e",\r
+        "id": "28f836e1.3e6b7a",\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=\"`'vf-module is not in appropriate state for activate. Current state is ' + $service-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.vf-module-level-oper-status.order-status`\" />\n",\r
         "comments": "",\r
-        "x": 1874.0001258850098,\r
-        "y": 696.5555467605591,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 1880.0001258850098,\r
+        "y": 685.5555467605591,\r
+        "z": "87aefe66.c6e82",\r
         "wires": []\r
     },\r
     {\r
-        "id": "b4bebf6c.2b4fa",\r
+        "id": "dac4a6bf.88b598",\r
         "type": "switchNode",\r
         "name": "switch vf-module-id",\r
         "xml": "<switch test=\"`$vf-module-topology-operation-input.vf-module-information.vf-module-id`\">\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1398.5000228881836,\r
-        "y": 517.6666707992554,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 1404.5000228881836,\r
+        "y": 506.66667079925537,\r
+        "z": "87aefe66.c6e82",\r
         "wires": [\r
             [\r
-                "9ad9b806.2c19b8"\r
+                "a7ac2cab.79df8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "9ad9b806.2c19b8",\r
+        "id": "a7ac2cab.79df8",\r
         "type": "outcome",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1626.5000228881836,\r
-        "y": 517.6666707992554,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 1632.5000228881836,\r
+        "y": 506.66667079925537,\r
+        "z": "87aefe66.c6e82",\r
         "wires": [\r
             [\r
-                "b7b28733.f37c08"\r
+                "b2c9eb9f.8ff438"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "b7b28733.f37c08",\r
+        "id": "b2c9eb9f.8ff438",\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=\"network-request-input.network-input-parameters.name is a required input\" />\n",\r
         "comments": "",\r
-        "x": 1764.0000228881836,\r
-        "y": 517.6666707992554,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 1770.0000228881836,\r
+        "y": 506.66667079925537,\r
+        "z": "87aefe66.c6e82",\r
         "wires": []\r
     },\r
     {\r
-        "id": "30507c3b.465aa4",\r
+        "id": "5a51c09f.0dc8a",\r
         "type": "execute",\r
         "name": "execute requiredParameters",\r
         "xml": "<execute plugin='org.onap.ccsdk.sli.core.slipluginutils.SliPluginUtils' method='requiredParameters' >\n<parameter name=\"vf-module-topology-operation-input.vf-module-information.vf-module-id\" value=\"$vf-module-topology-operation-input.vf-module-information.vf-module-id\"/>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1433.0000228881836,\r
-        "y": 477.66667079925537,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 1439.0000228881836,\r
+        "y": 466.66667079925537,\r
+        "z": "87aefe66.c6e82",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "c2db488a.b105a8",\r
+        "id": "2fee238f.bd0b7c",\r
         "type": "switchNode",\r
         "name": "switch network-level-oper-status",\r
-        "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.vf-module-level-oper-status.order-status`'>\n",\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": 1479.8332748413086,\r
-        "y": 906.5555257797241,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 1481.8332214355469,\r
+        "y": 895.555570602417,\r
+        "z": "87aefe66.c6e82",\r
         "wires": [\r
             [\r
-                "cf4b307b.b1b04",\r
-                "acc49742.fd0df8"\r
+                "cdf8dd70.c0108",\r
+                "2de75da0.b5bd52"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "cf4b307b.b1b04",\r
+        "id": "cdf8dd70.c0108",\r
         "type": "outcome",\r
         "name": "outcome Active",\r
         "xml": "<outcome value='Active'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1753.166648864746,\r
-        "y": 880.9999837875366,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 1759.166648864746,\r
+        "y": 869.9999837875366,\r
+        "z": "87aefe66.c6e82",\r
         "wires": [\r
             [\r
-                "e31a54a2.3ff1f8"\r
+                "e027e573.24bd48"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "acc49742.fd0df8",\r
+        "id": "2de75da0.b5bd52",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1723.166648864746,\r
-        "y": 920.9999837875366,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 1729.166648864746,\r
+        "y": 909.9999837875366,\r
+        "z": "87aefe66.c6e82",\r
         "wires": [\r
             [\r
-                "bc3125bf.c135a8"\r
+                "4744b74f.6f4a88"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bc3125bf.c135a8",\r
+        "id": "4744b74f.6f4a88",\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=\"`'vf-module is not in appropriate state for deactivate. Current state is ' + $service-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.vf-module-level-oper-status.order-status`\" />\n    ",\r
         "comments": "",\r
-        "x": 1889.166648864746,\r
-        "y": 922.9999837875366,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 1895.166648864746,\r
+        "y": 911.9999837875366,\r
+        "z": "87aefe66.c6e82",\r
         "wires": []\r
     },\r
     {\r
-        "id": "eb92e3d.8a6ff2",\r
+        "id": "5f5b8df.a6d8d74",\r
         "type": "switchNode",\r
         "name": "switch network-level-oper-status",\r
-        "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.vf-module-level-oper-status.order-status`'>\n",\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": 1468.7221908569336,\r
-        "y": 1077.6666097640991,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 1474.7221908569336,\r
+        "y": 1066.6666097640991,\r
+        "z": "87aefe66.c6e82",\r
         "wires": [\r
             [\r
-                "4005e1e5.db606",\r
-                "3f0b16e4.30f1ca"\r
+                "e0e44b44.c9e6c8",\r
+                "fa9a403f.1ce7e"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "4005e1e5.db606",\r
+        "id": "e0e44b44.c9e6c8",\r
         "type": "outcome",\r
         "name": "outcome PendingDelete",\r
         "xml": "<outcome value='PendingDelete'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1768.7222518920898,\r
-        "y": 1045.444405555725,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 1774.7222518920898,\r
+        "y": 1034.444405555725,\r
+        "z": "87aefe66.c6e82",\r
         "wires": [\r
             [\r
-                "e99f233c.ef676"\r
+                "21ef3568.35bd5a"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "3f0b16e4.30f1ca",\r
+        "id": "fa9a403f.1ce7e",\r
         "type": "other",\r
         "name": "other",\r
         "xml": "<outcome value='Other'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1712.055564880371,\r
-        "y": 1092.1110677719116,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 1718.055564880371,\r
+        "y": 1081.1110677719116,\r
+        "z": "87aefe66.c6e82",\r
         "wires": [\r
             [\r
-                "26e244b4.b2362c"\r
+                "2bc6f464.461d3c"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "26e244b4.b2362c",\r
+        "id": "2bc6f464.461d3c",\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=\"`'vf-module is not in appropriate state for delete. Current state is ' + $service-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.vf-module-level-oper-status.order-status`\" />\n",\r
         "comments": "",\r
-        "x": 1878.055564880371,\r
-        "y": 1094.1110677719116,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 1884.055564880371,\r
+        "y": 1083.1110677719116,\r
+        "z": "87aefe66.c6e82",\r
         "wires": []\r
     },\r
     {\r
-        "id": "94e9cf1a.6c399",\r
+        "id": "72634f47.0cc42",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1940.5001029968262,\r
-        "y": 657.6666488647461,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 1946.5001029968262,\r
+        "y": 646.6666488647461,\r
+        "z": "87aefe66.c6e82",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "e31a54a2.3ff1f8",\r
+        "id": "e027e573.24bd48",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1953.1665267944336,\r
-        "y": 879.1481161117554,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 1959.1665267944336,\r
+        "y": 868.1481161117554,\r
+        "z": "87aefe66.c6e82",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "e99f233c.ef676",\r
+        "id": "21ef3568.35bd5a",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 1984.277732849121,\r
-        "y": 1045.8147420883179,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 1990.277732849121,\r
+        "y": 1034.8147420883179,\r
+        "z": "87aefe66.c6e82",\r
         "wires": [\r
             []\r
         ]\r
     },\r
     {\r
-        "id": "39ae6a67.1c8296",\r
+        "id": "8d9c0c99.1bdcb",\r
         "type": "block",\r
         "name": "block : atomic",\r
         "xml": "<block atomic=\"true\">",\r
         "atomic": "true",\r
         "outputs": 1,\r
-        "x": 2756.666534423828,\r
-        "y": 574.0000190734863,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 2762.666534423828,\r
+        "y": 563.0000190734863,\r
+        "z": "87aefe66.c6e82",\r
         "wires": [\r
             [\r
-                "70e3cfee.6e895"\r
+                "7051b5d0.a337bc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "bc20a4d8.66ea78",\r
+        "id": "26ecbd16.18b922",\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": 971.0065307617188,\r
-        "y": 121.24849605560303,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 977.0065307617188,\r
+        "y": 110.24849605560303,\r
+        "z": "87aefe66.c6e82",\r
         "wires": [\r
             [\r
-                "ae64d058.26533"\r
+                "a795521a.23d6f"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "ae64d058.26533",\r
+        "id": "a795521a.23d6f",\r
         "type": "outcome",\r
         "name": "NULL",\r
         "xml": "<outcome value=''>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1151.0065116882324,\r
-        "y": 120.24848556518555,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 1157.0065116882324,\r
+        "y": 109.24848556518555,\r
+        "z": "87aefe66.c6e82",\r
         "wires": [\r
             [\r
-                "d4c5df8d.2e7e3"\r
+                "3e0e877f.b04338"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "d4c5df8d.2e7e3",\r
+        "id": "3e0e877f.b04338",\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 entry not found in service-data\" />\n",\r
         "comments": "",\r
-        "x": 1300.4352378845215,\r
-        "y": 121.39140319824219,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 1306.4352378845215,\r
+        "y": 110.39140319824219,\r
+        "z": "87aefe66.c6e82",\r
         "wires": []\r
     },\r
     {\r
-        "id": "376a189c.5eea28",\r
+        "id": "f0d7fed2.a7f6e",\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": 951.0379104614258,\r
-        "y": 183.51763439178467,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 957.0379104614258,\r
+        "y": 172.51763439178467,\r
+        "z": "87aefe66.c6e82",\r
         "wires": [\r
             [\r
-                "891fced5.d7d06"\r
+                "c781186.35a6de8"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "891fced5.d7d06",\r
+        "id": "c781186.35a6de8",\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": 1189.0065269470215,\r
-        "y": 183.2484917640686,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 1195.0065269470215,\r
+        "y": 172.2484917640686,\r
+        "z": "87aefe66.c6e82",\r
         "wires": [\r
             [\r
-                "2828372d.9354b8"\r
+                "3c97bff.ca0c74"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "2828372d.9354b8",\r
+        "id": "3c97bff.ca0c74",\r
         "type": "outcomeTrue",\r
         "name": "true",\r
         "xml": "<outcome value='true'>\n",\r
         "comments": "",\r
         "outputs": 1,\r
-        "x": 1404.0065116882324,\r
-        "y": 181.24848556518555,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 1410.0065116882324,\r
+        "y": 170.24848556518555,\r
+        "z": "87aefe66.c6e82",\r
         "wires": [\r
             [\r
-                "56c573f0.8eef8c"\r
+                "daf74faa.b14cc"\r
             ]\r
         ]\r
     },\r
     {\r
-        "id": "56c573f0.8eef8c",\r
+        "id": "daf74faa.b14cc",\r
         "type": "set",\r
         "name": "set vnf-index",\r
         "xml": "<set>\n<parameter name='vnf-index' value='`$idx`' />\n",\r
         "comments": "",\r
-        "x": 1568.0065116882324,\r
-        "y": 176.24848556518555,\r
-        "z": "619b2b0c.b0ac74",\r
+        "x": 1574.0065116882324,\r
+        "y": 165.24848556518555,\r
+        "z": "87aefe66.c6e82",\r
         "wires": []\r
     }\r
 ]
\ No newline at end of file
index de558b8..29b26cd 100644 (file)
                                                     <outcome value='true'>\r
                                                         <block atomic="true">\r
                                                             <set>\r
-                                                                <parameter name='tmp.nidx' value='`$nidx`' />\r
+                                                                <parameter name='tmp.vidx' value='`$nidx`' />\r
                                                                 <parameter name='ctx.vf-module-data.' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$nidx].vf-module-data.`' />\r
                                                             </set>\r
                                                         </block>\r
                                                     </outcome>\r
                                                 </switch>\r
                                             </for>\r
-                                            <switch test="`$tmp.nidx`">\r
+                                            <switch test="`$tmp.vidx`">\r
                                                 <outcome value=''>\r
                                                     <return status='failure'>\r
                                                         <parameter name='ack-final' value='Y'/>\r
                                         </block>\r
                                     </outcome>\r
                                 </switch>\r
-                                <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.vf-module-level-oper-status.order-status`'>\r
+                                <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`'>\r
                                     <outcome value='Created'>\r
                                         <block atomic="true"></block>\r
                                     </outcome>\r
                                                     <outcome value='true'>\r
                                                         <block atomic="true">\r
                                                             <set>\r
-                                                                <parameter name='tmp.nidx' value='`$nidx`' />\r
+                                                                <parameter name='tmp.vidx' value='`$nidx`' />\r
                                                                 <parameter name='ctx.vf-module-data.' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$nidx].vf-module-data.`' />\r
                                                             </set>\r
                                                         </block>\r
                                                     </outcome>\r
                                                 </switch>\r
                                             </for>\r
-                                            <switch test="`$tmp.nidx`">\r
+                                            <switch test="`$tmp.vidx`">\r
                                                 <outcome value=''>\r
                                                     <return status='failure'>\r
                                                         <parameter name='ack-final' value='Y'/>\r
                                         </block>\r
                                     </outcome>\r
                                 </switch>\r
-                                <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.vf-module-level-oper-status.order-status`'>\r
+                                <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`'>\r
                                     <outcome value='Active'>\r
                                         <block atomic="true"></block>\r
                                     </outcome>\r
                                                     <outcome value='true'>\r
                                                         <block atomic="true">\r
                                                             <set>\r
-                                                                <parameter name='tmp.nidx' value='`$nidx`' />\r
+                                                                <parameter name='tmp.vidx' value='`$nidx`' />\r
                                                                 <parameter name='ctx.vf-module-data.' value='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$nidx].vf-module-data.`' />\r
                                                             </set>\r
                                                         </block>\r
                                                     </outcome>\r
                                                 </switch>\r
                                             </for>\r
-                                            <switch test="`$tmp.nidx`">\r
+                                            <switch test="`$tmp.vidx`">\r
                                                 <outcome value=''>\r
                                                     <return status='failure'>\r
                                                         <parameter name='ack-final' value='Y'/>\r
                                         </block>\r
                                     </outcome>\r
                                 </switch>\r
-                                <switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module[$tmp.nidx].vf-module-data.vf-module-level-oper-status.order-status`'>\r
+                                <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`'>\r
                                     <outcome value='PendingDelete'>\r
                                         <block atomic="true"></block>\r
                                     </outcome>\r