From: prakash.e <prakash.e@huawei.com>
Date: Mon, 22 Apr 2019 06:29:04 +0000 (+0530)
Subject: SDWAN vpn vf-module-topology added null check
X-Git-Tag: 1.5.1~15
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=sdnc%2Foam.git;a=commitdiff_plain;h=06abcca9f01e4508efd5839612190f4df2713752

SDWAN vpn vf-module-topology added null check

sdwan-vf-vpn-input-parameters DG is updated by
adding NULL check for vnf-index

Change-Id: I54ec5edb8b37a87a6015a6b4f58aa858a96bad3d
Issue-ID: SDNC-659
Signed-off-by: Prakash.E <prakash.e@huawei.com>

Former-commit-id: b83410a64457c04568bac634a8f85c7274980008
---

diff --git a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_validate-sdwan-vf-vpn-input-parameters.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_validate-sdwan-vf-vpn-input-parameters.json
index b0816734..c5e1d74e 100644
--- a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_validate-sdwan-vf-vpn-input-parameters.json
+++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_validate-sdwan-vf-vpn-input-parameters.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "d157ce03.c3288",
+        "id": "565ee583.5719ac",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 129,
-        "y": 64,
-        "z": "87aefe66.c6e82",
+        "x": 120.00390625,
+        "y": 61.00390625,
+        "z": "c09ce476.40c538",
         "wires": [
             [
-                "5ddc2216.ec964c"
+                "2253fb6a.010fd4"
             ]
         ]
     },
     {
-        "id": "5ddc2216.ec964c",
+        "id": "2253fb6a.010fd4",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,1284 +22,1328 @@
         "comments": "",
         "xml": "<service-logic xmlns='http://www.onap.org/sdnc/svclogic' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'>",
         "outputs": 1,
-        "x": 374.2857131958008,
-        "y": 63.23807907104492,
-        "z": "87aefe66.c6e82",
+        "x": 365.2896194458008,
+        "y": 60.24198532104492,
+        "z": "c09ce476.40c538",
         "wires": [
             [
-                "e97f46cc.0059c8"
+                "d1afaf4b.7367a"
             ]
         ]
     },
     {
-        "id": "e97f46cc.0059c8",
+        "id": "d1afaf4b.7367a",
         "type": "method",
         "name": "validate-sdwan-vf-vpn-input-parameters",
         "xml": "<method rpc='validate-sdwan-vf-vpn-input-parameters' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 457.9166946411133,
-        "y": 198.25301837921143,
-        "z": "87aefe66.c6e82",
+        "x": 448.9206008911133,
+        "y": 195.25692462921143,
+        "z": "c09ce476.40c538",
         "wires": [
             [
-                "94a6ae40.767b3"
+                "d3d09840.859ab8"
             ]
         ]
     },
     {
-        "id": "94a6ae40.767b3",
+        "id": "d3d09840.859ab8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 741.9167022705078,
-        "y": 186.25304317474365,
-        "z": "87aefe66.c6e82",
+        "x": 732.9206085205078,
+        "y": 183.25694942474365,
+        "z": "c09ce476.40c538",
         "wires": [
             [
-                "c1b9af78.ff38c",
-                "5ab8336c.d30a1c",
-                "26ecbd16.18b922",
-                "f0d7fed2.a7f6e"
+                "8b6f9b12.95ea88",
+                "9c84b6f9.1f9628",
+                "257f53b6.ca8b0c",
+                "e33dc3b4.6bdba",
+                "fa0b83ce.07d0f"
             ]
         ]
     },
     {
-        "id": "c1b9af78.ff38c",
+        "id": "8b6f9b12.95ea88",
         "type": "switchNode",
         "name": "switch  svc-action",
         "xml": "<switch test='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1001.916633605957,
-        "y": 34.25303936004639,
-        "z": "87aefe66.c6e82",
+        "x": 992.920539855957,
+        "y": 31.256945610046387,
+        "z": "c09ce476.40c538",
         "wires": [
             [
-                "61401669.5d3bb8"
+                "c5870f3a.aab91"
             ]
         ]
     },
     {
-        "id": "61401669.5d3bb8",
+        "id": "c5870f3a.aab91",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>",
         "comments": "",
         "outputs": 1,
-        "x": 1192.6309356689453,
-        "y": 35.2530403137207,
-        "z": "87aefe66.c6e82",
+        "x": 1183.6348419189453,
+        "y": 32.2569465637207,
+        "z": "c09ce476.40c538",
         "wires": [
             [
-                "8deeb25a.a0c7a"
+                "255dc4d8.4591ac"
             ]
         ]
     },
     {
-        "id": "8deeb25a.a0c7a",
+        "id": "255dc4d8.4591ac",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"sdnc-request-header.svc-request-id is a required input\" />\n",
         "comments": "",
-        "x": 1367.0594863891602,
-        "y": 34.25303268432617,
-        "z": "87aefe66.c6e82",
+        "x": 1358.0633926391602,
+        "y": 31.256938934326172,
+        "z": "c09ce476.40c538",
         "wires": []
     },
     {
-        "id": "5ab8336c.d30a1c",
+        "id": "9c84b6f9.1f9628",
         "type": "switchNode",
         "name": "switch svc-action",
         "xml": "<switch test='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 338.9166564941406,
-        "y": 457.2530336380005,
-        "z": "87aefe66.c6e82",
+        "x": 329.9205627441406,
+        "y": 454.2569398880005,
+        "z": "c09ce476.40c538",
         "wires": [
             [
-                "dd523414.2c6af8",
-                "3ab9ebd9.cb15a4",
-                "748e648b.48faec",
-                "364e12f1.bd272e",
-                "907aa46b.591888"
+                "4da03be9.a489d4",
+                "1cd623c5.d01cfc",
+                "11a6977d.d05489",
+                "fd6aa5e0.36c518",
+                "74577ecc.ef74c"
             ]
         ]
     },
     {
-        "id": "dd523414.2c6af8",
+        "id": "4da03be9.a489d4",
         "type": "outcome",
         "name": "create",
         "xml": "<outcome value='create'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 532.5000228881836,
-        "y": 286.66667079925537,
-        "z": "87aefe66.c6e82",
+        "x": 523.5039291381836,
+        "y": 283.67057704925537,
+        "z": "c09ce476.40c538",
         "wires": [
             [
-                "b695319.fac5ed"
+                "b3001ec4.96f68"
             ]
         ]
     },
     {
-        "id": "b695319.fac5ed",
+        "id": "b3001ec4.96f68",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 693.5000228881836,
-        "y": 286.66667079925537,
-        "z": "87aefe66.c6e82",
+        "x": 684.5039291381836,
+        "y": 283.67057704925537,
+        "z": "c09ce476.40c538",
         "wires": [
             [
-                "1c93366e.75aada"
+                "8fa4b53.eb65f48"
             ]
         ]
     },
     {
-        "id": "3ab9ebd9.cb15a4",
+        "id": "1cd623c5.d01cfc",
         "type": "outcome",
         "name": "deactivate",
         "xml": "<outcome value='deactivate'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 505.4920120239258,
-        "y": 895.428539276123,
-        "z": "87aefe66.c6e82",
+        "x": 496.4959182739258,
+        "y": 892.432445526123,
+        "z": "c09ce476.40c538",
         "wires": [
             [
-                "c38c9ea7.d32c"
+                "e6bca749.2ecd58"
             ]
         ]
     },
     {
-        "id": "748e648b.48faec",
+        "id": "11a6977d.d05489",
         "type": "outcome",
         "name": "delete",
         "xml": "<outcome value='delete'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 509.20639419555664,
-        "y": 1066.1430969238281,
-        "z": "87aefe66.c6e82",
+        "x": 500.21030044555664,
+        "y": 1063.1470031738281,
+        "z": "c09ce476.40c538",
         "wires": [
             [
-                "cfdfa9d2.e72008"
+                "141627b0.510318"
             ]
         ]
     },
     {
-        "id": "364e12f1.bd272e",
+        "id": "fd6aa5e0.36c518",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 508.9682846069336,
-        "y": 1239.571382522583,
-        "z": "87aefe66.c6e82",
+        "x": 499.9721908569336,
+        "y": 1236.575288772583,
+        "z": "c09ce476.40c538",
         "wires": [
             [
-                "1c142ebe.8cdf21"
+                "1eabd7f1.a915e8"
             ]
         ]
     },
     {
-        "id": "1c142ebe.8cdf21",
+        "id": "1eabd7f1.a915e8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`$vf-module-topology-operation-input.sdnc-request-header.svc-action + ' is not a valid svc-action'`\" />\n",
         "comments": "",
-        "x": 692.5398178100586,
-        "y": 1240.190523147583,
-        "z": "87aefe66.c6e82",
+        "x": 683.5437240600586,
+        "y": 1237.194429397583,
+        "z": "c09ce476.40c538",
         "wires": []
     },
     {
-        "id": "1c93366e.75aada",
+        "id": "8fa4b53.eb65f48",
         "type": "switchNode",
         "name": "switch request-action",
         "xml": "<switch test='`$vf-module-topology-operation-input.request-information.request-action`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 894,
-        "y": 284.6666797399521,
-        "z": "87aefe66.c6e82",
+        "x": 885.00390625,
+        "y": 281.6705859899521,
+        "z": "c09ce476.40c538",
         "wires": [
             [
-                "ee1d7ddd.46ad1",
-                "3d1afbf1.1b7e64"
+                "1fcbac14.14ab84",
+                "5011e60c.42d288"
             ]
         ]
     },
     {
-        "id": "ee1d7ddd.46ad1",
+        "id": "1fcbac14.14ab84",
         "type": "other",
         "name": "Other",
         "xml": "<outcome value='Other'>",
         "comments": "",
         "outputs": 1,
-        "x": 1079.4999923706055,
-        "y": 312.66667652130127,
-        "z": "87aefe66.c6e82",
+        "x": 1070.5038986206055,
+        "y": 309.67058277130127,
+        "z": "c09ce476.40c538",
         "wires": [
             [
-                "efe7d43a.e3e608"
+                "bc3da556.5c5568"
             ]
         ]
     },
     {
-        "id": "efe7d43a.e3e608",
+        "id": "bc3da556.5c5568",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"request-information.request-action is required to be SOTN CreateVPNNetworkInstance for svc-action=create\" />\n",
         "comments": "",
-        "x": 1230.0000228881836,
-        "y": 306.66667079925537,
-        "z": "87aefe66.c6e82",
+        "x": 1221.0039291381836,
+        "y": 303.67057704925537,
+        "z": "c09ce476.40c538",
         "wires": []
     },
     {
-        "id": "2418184c.a14ab8",
+        "id": "967ffa6b.7cc5f8",
         "type": "other",
         "name": "DeleteSDWANVpnInstance",
         "xml": "<outcome value='DeleteSDWANVpnInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 945.0634078979492,
-        "y": 1062.6983680725098,
-        "z": "87aefe66.c6e82",
+        "x": 936.0673141479492,
+        "y": 1059.7022743225098,
+        "z": "c09ce476.40c538",
         "wires": [
             [
-                "8c2f423e.95a5"
+                "76f6c61a.a081c8"
             ]
         ]
     },
     {
-        "id": "ba1e9ce4.084c2",
+        "id": "1f6d106b.3f479",
         "type": "other",
         "name": "Other",
         "xml": "<outcome value='Other'>",
         "comments": "",
         "outputs": 1,
-        "x": 866.6189804077148,
-        "y": 1138.920636177063,
-        "z": "87aefe66.c6e82",
+        "x": 857.6228866577148,
+        "y": 1135.924542427063,
+        "z": "c09ce476.40c538",
         "wires": [
             [
-                "29217d6f.264c52"
+                "649057db.a16248"
             ]
         ]
     },
     {
-        "id": "29217d6f.264c52",
+        "id": "649057db.a16248",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"request-information.request-action is required to be SOTN DeleteVPNNetworkInstance for svc-action=delete\" />\n",
         "comments": "",
-        "x": 1026.9524002075195,
-        "y": 1141.0317735671997,
-        "z": "87aefe66.c6e82",
+        "x": 1017.9563064575195,
+        "y": 1138.0356798171997,
+        "z": "c09ce476.40c538",
         "wires": []
     },
     {
-        "id": "8c2f423e.95a5",
+        "id": "76f6c61a.a081c8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1174.9523086547852,
-        "y": 1068.9206190109253,
-        "z": "87aefe66.c6e82",
+        "x": 1165.9562149047852,
+        "y": 1065.9245252609253,
+        "z": "c09ce476.40c538",
         "wires": [
             [
-                "5a51c09f.0dc8a",
-                "dac4a6bf.88b598",
-                "607c6dc9.f58224",
-                "5f5b8df.a6d8d74"
+                "123885f7.86e85a",
+                "5107dc7c.bd16c4",
+                "d0483b54.f8cc78",
+                "ee1682f5.ef519"
             ]
         ]
     },
     {
-        "id": "907aa46b.591888",
+        "id": "74577ecc.ef74c",
         "type": "outcome",
         "name": "activate",
         "xml": "<outcome value='activate'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 526.4285774230957,
-        "y": 549.7143135070801,
-        "z": "87aefe66.c6e82",
+        "x": 517.4324836730957,
+        "y": 546.7182197570801,
+        "z": "c09ce476.40c538",
         "wires": [
             [
-                "eff709e7.55cc68"
+                "63a76ac2.a9ff44"
             ]
         ]
     },
     {
-        "id": "eff709e7.55cc68",
+        "id": "63a76ac2.a9ff44",
         "type": "switchNode",
         "name": "switch request-action",
         "xml": "<switch test='`$vf-module-topology-operation-input.request-information.request-action`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 709.2857437133789,
-        "y": 546.8571634292603,
-        "z": "87aefe66.c6e82",
+        "x": 700.2896499633789,
+        "y": 543.8610696792603,
+        "z": "c09ce476.40c538",
         "wires": [
             [
-                "db4e4749.ac5c28",
-                "f7339987.1e66e8"
+                "20847c6f.c84284",
+                "d8768536.d2ed78"
             ]
         ]
     },
     {
-        "id": "db4e4749.ac5c28",
+        "id": "20847c6f.c84284",
         "type": "other",
         "name": "ActivateSDWANVpnInstance",
         "xml": "<outcome value='ActivateSDWANVpnInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 962.5000228881836,
-        "y": 526.6666707992554,
-        "z": "87aefe66.c6e82",
+        "x": 953.5039291381836,
+        "y": 523.6705770492554,
+        "z": "c09ce476.40c538",
         "wires": [
             [
-                "90c3027e.ce76e"
+                "888440a5.f74eb"
             ]
         ]
     },
     {
-        "id": "f7339987.1e66e8",
+        "id": "d8768536.d2ed78",
         "type": "other",
         "name": "Other",
         "xml": "<outcome value='Other'>",
         "comments": "",
         "outputs": 1,
-        "x": 892.5000228881836,
-        "y": 566.6666707992554,
-        "z": "87aefe66.c6e82",
+        "x": 883.5039291381836,
+        "y": 563.6705770492554,
+        "z": "c09ce476.40c538",
         "wires": [
             [
-                "58df50e9.ec50f"
+                "24d41f6.7d3c7e"
             ]
         ]
     },
     {
-        "id": "58df50e9.ec50f",
+        "id": "24d41f6.7d3c7e",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"request-information.request-action is required to be SOTN ActivateVPNNetworkInstance for svc-action=activate\" />\n",
         "comments": "",
-        "x": 1050.0000228881836,
-        "y": 566.6666707992554,
-        "z": "87aefe66.c6e82",
+        "x": 1041.0039291381836,
+        "y": 563.6705770492554,
+        "z": "c09ce476.40c538",
         "wires": []
     },
     {
-        "id": "90c3027e.ce76e",
+        "id": "888440a5.f74eb",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1193.5000228881836,
-        "y": 526.6666707992554,
-        "z": "87aefe66.c6e82",
+        "x": 1184.5039291381836,
+        "y": 523.6705770492554,
+        "z": "c09ce476.40c538",
         "wires": [
             [
-                "607c6dc9.f58224",
-                "5a51c09f.0dc8a",
-                "dac4a6bf.88b598",
-                "befd23a0.20fa9"
+                "d0483b54.f8cc78",
+                "123885f7.86e85a",
+                "5107dc7c.bd16c4",
+                "33a9d2fa.2f6b4e"
             ]
         ]
     },
     {
-        "id": "7d17bd6a.99ffe4",
+        "id": "9770e43b.dbcf68",
         "type": "other",
         "name": "DeactivateSDWANVpnInstance",
         "xml": "<outcome value='DeactivateSDWANVpnInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 948.9206390380859,
-        "y": 897.1429328918457,
-        "z": "87aefe66.c6e82",
+        "x": 939.9245452880859,
+        "y": 894.1468391418457,
+        "z": "c09ce476.40c538",
         "wires": [
             [
-                "ae97c0e.69b144"
+                "41ce9967.86f308"
             ]
         ]
     },
     {
-        "id": "754fd131.c0e1d",
+        "id": "672e2ef2.4ddd3",
         "type": "other",
         "name": "Other",
         "xml": "<outcome value='Other'>",
         "comments": "",
         "outputs": 1,
-        "x": 863.9206314086914,
-        "y": 966.1429405212402,
-        "z": "87aefe66.c6e82",
+        "x": 854.9245376586914,
+        "y": 963.1468467712402,
+        "z": "c09ce476.40c538",
         "wires": [
             [
-                "e5085bda.bb5f08"
+                "25186dab.68a632"
             ]
         ]
     },
     {
-        "id": "e5085bda.bb5f08",
+        "id": "25186dab.68a632",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"request-information.request-action is required to be SOTN DeactivateVPNNetworkInstance for svc-action=deactivate\" />\n",
         "comments": "",
-        "x": 1044.9206466674805,
-        "y": 967.1429405212402,
-        "z": "87aefe66.c6e82",
+        "x": 1035.9245529174805,
+        "y": 964.1468467712402,
+        "z": "c09ce476.40c538",
         "wires": []
     },
     {
-        "id": "c38c9ea7.d32c",
+        "id": "e6bca749.2ecd58",
         "type": "switchNode",
         "name": "switch request-action",
         "xml": "<switch test='`$vf-module-topology-operation-input.request-information.request-action`'>",
         "comments": "",
         "outputs": 1,
-        "x": 685.7776947021484,
-        "y": 899.6188039779663,
-        "z": "87aefe66.c6e82",
+        "x": 676.7816009521484,
+        "y": 896.6227102279663,
+        "z": "c09ce476.40c538",
         "wires": [
             [
-                "7d17bd6a.99ffe4",
-                "754fd131.c0e1d"
+                "9770e43b.dbcf68",
+                "672e2ef2.4ddd3"
             ]
         ]
     },
     {
-        "id": "cfdfa9d2.e72008",
+        "id": "141627b0.510318",
         "type": "switchNode",
         "name": "switch request-action",
         "xml": "<switch test='`$vf-module-topology-operation-input.request-information.request-action`'>",
         "comments": "",
         "outputs": 1,
-        "x": 689.5554962158203,
-        "y": 1065.9523208141327,
-        "z": "87aefe66.c6e82",
+        "x": 680.5594024658203,
+        "y": 1062.9562270641327,
+        "z": "c09ce476.40c538",
         "wires": [
             [
-                "2418184c.a14ab8",
-                "ba1e9ce4.084c2"
+                "967ffa6b.7cc5f8",
+                "1f6d106b.3f479"
             ]
         ]
     },
     {
-        "id": "ae97c0e.69b144",
+        "id": "41ce9967.86f308",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1208.888786315918,
-        "y": 899.9523277282715,
-        "z": "87aefe66.c6e82",
+        "x": 1199.892692565918,
+        "y": 896.9562339782715,
+        "z": "c09ce476.40c538",
         "wires": [
             [
-                "5a51c09f.0dc8a",
-                "dac4a6bf.88b598",
-                "607c6dc9.f58224",
-                "2fee238f.bd0b7c"
+                "123885f7.86e85a",
+                "5107dc7c.bd16c4",
+                "d0483b54.f8cc78",
+                "f43dfee.04573"
             ]
         ]
     },
     {
-        "id": "3d1afbf1.1b7e64",
+        "id": "5011e60c.42d288",
         "type": "other",
         "name": "CreateSDWANVpnInstance",
         "xml": "<outcome value='CreateSDWANVpnInstance'>",
         "comments": "",
         "outputs": 1,
-        "x": 1178.499984741211,
-        "y": 265.6666679382324,
-        "z": "87aefe66.c6e82",
+        "x": 1169.503890991211,
+        "y": 262.6705741882324,
+        "z": "c09ce476.40c538",
         "wires": [
             [
-                "13930049.ada58"
+                "11c5bc01.23d164"
             ]
         ]
     },
     {
-        "id": "13930049.ada58",
+        "id": "11c5bc01.23d164",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1413.49995803833,
-        "y": 264.6666679382324,
-        "z": "87aefe66.c6e82",
+        "x": 1404.50386428833,
+        "y": 261.6705741882324,
+        "z": "c09ce476.40c538",
         "wires": [
             [
-                "3daca227.0cf10e"
+                "9a240db8.46ca9"
             ]
         ]
     },
     {
-        "id": "3daca227.0cf10e",
+        "id": "9a240db8.46ca9",
         "type": "for",
         "name": "for loop i - vpn vf input parameters",
         "xml": "<for index=\"i\" start=\"0\" end=\"`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param_length`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 1644.000015258789,
-        "y": 265.6666679382324,
-        "z": "87aefe66.c6e82",
+        "x": 1635.003921508789,
+        "y": 262.6705741882324,
+        "z": "c09ce476.40c538",
         "wires": [
             [
-                "3ad26c2a.a0e034"
+                "36e8517a.dc61de"
             ]
         ]
     },
     {
-        "id": "3ad26c2a.a0e034",
+        "id": "36e8517a.dc61de",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 1852.5000228881836,
-        "y": 266.66667079925537,
-        "z": "87aefe66.c6e82",
+        "x": 1843.5039291381836,
+        "y": 263.67057704925537,
+        "z": "c09ce476.40c538",
         "wires": [
             [
-                "163fb823.6cab78",
-                "f1bf47ba.b34c38",
-                "c40dcf.883f423"
+                "5087b54.83db64c",
+                "58b5e6d.d150018",
+                "8cba0d18.e596b"
             ]
         ]
     },
     {
-        "id": "163fb823.6cab78",
+        "id": "5087b54.83db64c",
         "type": "set",
         "name": "clear tmp-data",
         "xml": "<set>\n<parameter name='tmp.name' value='' />\n<parameter name='tmp.value' value='' />\n",
         "comments": "",
-        "x": 2035.5000228881836,
-        "y": 226.66667079925537,
-        "z": "87aefe66.c6e82",
+        "x": 2026.5039291381836,
+        "y": 223.67057704925537,
+        "z": "c09ce476.40c538",
         "wires": []
     },
     {
-        "id": "f1bf47ba.b34c38",
+        "id": "58b5e6d.d150018",
         "type": "set",
         "name": "set tmp-data",
         "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",
         "comments": "",
-        "x": 2030.0000228881836,
-        "y": 266.66667079925537,
-        "z": "87aefe66.c6e82",
+        "x": 2021.0039291381836,
+        "y": 263.67057704925537,
+        "z": "c09ce476.40c538",
         "wires": []
     },
     {
-        "id": "c40dcf.883f423",
+        "id": "8cba0d18.e596b",
         "type": "switchNode",
         "name": "switch name",
         "xml": "<switch test=\"`$tmp.name`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 2030.0000228881836,
-        "y": 306.66667079925537,
-        "z": "87aefe66.c6e82",
+        "x": 2021.0039291381836,
+        "y": 303.67057704925537,
+        "z": "c09ce476.40c538",
         "wires": [
             [
-                "1fcdbe0d.6c0992",
-                "9406085a.835ae8",
-                "bf4803e4.f6139"
+                "dfc6f3da.96897",
+                "63a216c3.211888",
+                "efdb7bab.2e3c18"
             ]
         ]
     },
     {
-        "id": "4dd6857a.0d98dc",
+        "id": "b6ee6080.0801",
         "type": "switchNode",
         "name": "switch value",
         "xml": "<switch test=\"`$tmp.value`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 2490.0001907348633,
-        "y": 258.66669142246246,
-        "z": "87aefe66.c6e82",
+        "x": 2481.0040969848633,
+        "y": 255.67059767246246,
+        "z": "c09ce476.40c538",
         "wires": [
             [
-                "e0ccccd6.2db1b"
+                "b264801c.4e11d"
             ]
         ]
     },
     {
-        "id": "bf4803e4.f6139",
+        "id": "efdb7bab.2e3c18",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>",
         "comments": "",
         "outputs": 1,
-        "x": 2249.500358581543,
-        "y": 324.66667902469635,
-        "z": "87aefe66.c6e82",
+        "x": 2240.504264831543,
+        "y": 321.67058527469635,
+        "z": "c09ce476.40c538",
         "wires": [
             [
-                "a6c05aa9.168a48"
+                "dd26b908.49f638"
             ]
         ]
     },
     {
-        "id": "a6c05aa9.168a48",
+        "id": "dd26b908.49f638",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param[' + $i + ']' + '.name is a required input'`\" />\n",
         "comments": "",
-        "x": 2424.5003623962402,
-        "y": 323.66667902469635,
-        "z": "87aefe66.c6e82",
+        "x": 2415.5042686462402,
+        "y": 320.67058527469635,
+        "z": "c09ce476.40c538",
         "wires": []
     },
     {
-        "id": "1fcdbe0d.6c0992",
+        "id": "dfc6f3da.96897",
         "type": "other",
         "name": "name",
         "xml": "<outcome value='name'>",
         "comments": "",
         "outputs": 1,
-        "x": 2249.500358581543,
-        "y": 208.66667330265045,
-        "z": "87aefe66.c6e82",
+        "x": 2240.504264831543,
+        "y": 205.67057955265045,
+        "z": "c09ce476.40c538",
         "wires": [
             [
-                "4dd6857a.0d98dc"
+                "b6ee6080.0801"
             ]
         ]
     },
     {
-        "id": "9406085a.835ae8",
+        "id": "63a216c3.211888",
         "type": "other",
         "name": "topology",
         "xml": "<outcome value='topology'>",
         "comments": "",
         "outputs": 1,
-        "x": 2261.500114440918,
-        "y": 262.333335518837,
-        "z": "87aefe66.c6e82",
+        "x": 2252.504020690918,
+        "y": 259.337241768837,
+        "z": "c09ce476.40c538",
         "wires": [
             [
-                "4dd6857a.0d98dc"
+                "b6ee6080.0801"
             ]
         ]
     },
     {
-        "id": "e0ccccd6.2db1b",
+        "id": "b264801c.4e11d",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>",
         "comments": "",
         "outputs": 1,
-        "x": 2633.5001907348633,
-        "y": 258.66669142246246,
-        "z": "87aefe66.c6e82",
+        "x": 2624.5040969848633,
+        "y": 255.67059767246246,
+        "z": "c09ce476.40c538",
         "wires": [
             [
-                "641a1c22.3dabc4"
+                "c8480c33.559c3"
             ]
         ]
     },
     {
-        "id": "641a1c22.3dabc4",
+        "id": "c8480c33.559c3",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'vf-module-request-input.vf-module-input-parameters.param '+ $tmp.name +' is a required input'`\" />\n",
         "comments": "",
-        "x": 2791.5001907348633,
-        "y": 258.66669142246246,
-        "z": "87aefe66.c6e82",
+        "x": 2782.5040969848633,
+        "y": 255.67059767246246,
+        "z": "c09ce476.40c538",
         "wires": []
     },
     {
-        "id": "607c6dc9.f58224",
+        "id": "d0483b54.f8cc78",
         "type": "switchNode",
         "name": "switch service-data.vf-modules.vf-module_length",
         "xml": "<switch test='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1485.3889541625977,
-        "y": 565.9999761581421,
-        "z": "87aefe66.c6e82",
+        "x": 1476.3928604125977,
+        "y": 563.0038824081421,
+        "z": "c09ce476.40c538",
         "wires": [
             [
-                "9d62d332.6bdf1",
-                "5cba95a3.c5c61c"
+                "413b50b3.359c7",
+                "d0f5593e.7ab558"
             ]
         ]
     },
     {
-        "id": "9d62d332.6bdf1",
+        "id": "413b50b3.359c7",
         "type": "other",
         "name": "outcome Null",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1754.0000228881836,
-        "y": 545.666711807251,
-        "z": "87aefe66.c6e82",
+        "x": 1745.0039291381836,
+        "y": 542.670618057251,
+        "z": "c09ce476.40c538",
         "wires": [
             [
-                "55bf1151.ede2f"
+                "eebfb40.22c4e5"
             ]
         ]
     },
     {
-        "id": "55bf1151.ede2f",
+        "id": "eebfb40.22c4e5",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"vf-module-topology-operation-input.vf-module-request-input.vf-module-id not found in service-data\" />\n",
         "comments": "",
-        "x": 1930.0000228881836,
-        "y": 546.6666707992554,
-        "z": "87aefe66.c6e82",
+        "x": 1921.0039291381836,
+        "y": 543.6705770492554,
+        "z": "c09ce476.40c538",
         "wires": []
     },
     {
-        "id": "5cba95a3.c5c61c",
+        "id": "d0f5593e.7ab558",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1732.5000228881836,
-        "y": 586.6666707992554,
-        "z": "87aefe66.c6e82",
+        "x": 1723.5039291381836,
+        "y": 583.6705770492554,
+        "z": "c09ce476.40c538",
         "wires": [
             [
-                "b3715a78.6bb228"
+                "8025be.3d50da4"
             ]
         ]
     },
     {
-        "id": "b3715a78.6bb228",
+        "id": "8025be.3d50da4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1893.5000228881836,
-        "y": 586.6666707992554,
-        "z": "87aefe66.c6e82",
+        "x": 1884.5039291381836,
+        "y": 583.6705770492554,
+        "z": "c09ce476.40c538",
         "wires": [
             [
-                "c872064f.ab0aa8",
-                "16b4cc33.475d44"
+                "33b03a7.98f32c6",
+                "2d7d1dbe.8a6fa2"
             ]
         ]
     },
     {
-        "id": "c872064f.ab0aa8",
+        "id": "33b03a7.98f32c6",
         "type": "for",
         "name": "for nidx..service-data.vf-modules.vf-module[]",
         "xml": "<for index='nidx' start='0' end='`$service-data.vnfs.vnf[$vnf-index].vnf-data.vf-modules.vf-module_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 2156.0000228881836,
-        "y": 566.6666707992554,
-        "z": "87aefe66.c6e82",
+        "x": 2147.0039291381836,
+        "y": 563.6705770492554,
+        "z": "c09ce476.40c538",
         "wires": [
             [
-                "88526fe7.19ca5"
+                "c9190995.7b4398"
             ]
         ]
     },
     {
-        "id": "88526fe7.19ca5",
+        "id": "c9190995.7b4398",
         "type": "switchNode",
         "name": "switch vf-module-id found",
         "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",
         "comments": "",
         "outputs": 1,
-        "x": 2442.0000228881836,
-        "y": 566.6666707992554,
-        "z": "87aefe66.c6e82",
+        "x": 2433.0039291381836,
+        "y": 563.6705770492554,
+        "z": "c09ce476.40c538",
         "wires": [
             [
-                "100a52a1.442c1d"
+                "6869b345.2f4eec"
             ]
         ]
     },
     {
-        "id": "100a52a1.442c1d",
+        "id": "6869b345.2f4eec",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2612.5000228881836,
-        "y": 566.6666707992554,
-        "z": "87aefe66.c6e82",
+        "x": 2603.5039291381836,
+        "y": 563.6705770492554,
+        "z": "c09ce476.40c538",
         "wires": [
             [
-                "8d9c0c99.1bdcb"
+                "434bc2ee.14a91c"
             ]
         ]
     },
     {
-        "id": "7051b5d0.a337bc",
+        "id": "d8b2b2f3.abfe5",
         "type": "set",
         "name": "set tmp.vidx and ctx.network-data",
         "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",
         "comments": "",
-        "x": 3013.50008392334,
-        "y": 563.6667140722275,
-        "z": "87aefe66.c6e82",
+        "x": 3004.50399017334,
+        "y": 560.6706203222275,
+        "z": "c09ce476.40c538",
         "wires": []
     },
     {
-        "id": "683dee11.6434b",
+        "id": "91c3f042.9f8f6",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"vf-module-topology-operation-input.vf-module-request-input.vf-module-id not found in service-data\" />\n",
         "comments": "",
-        "x": 2370.0000228881836,
-        "y": 606.6666707992554,
-        "z": "87aefe66.c6e82",
+        "x": 2361.0039291381836,
+        "y": 603.6705770492554,
+        "z": "c09ce476.40c538",
         "wires": []
     },
     {
-        "id": "67a62d00.2d4ff4",
+        "id": "62656256.c5a38c",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 2232.5000228881836,
-        "y": 606.6666707992554,
-        "z": "87aefe66.c6e82",
+        "x": 2223.5039291381836,
+        "y": 603.6705770492554,
+        "z": "c09ce476.40c538",
         "wires": [
             [
-                "683dee11.6434b"
+                "91c3f042.9f8f6"
             ]
         ]
     },
     {
-        "id": "16b4cc33.475d44",
+        "id": "2d7d1dbe.8a6fa2",
         "type": "switchNode",
         "name": "switch tmp.vidx ",
         "xml": "<switch test=\"`$tmp.vidx`\">\n\n",
         "comments": "",
         "outputs": 1,
-        "x": 2078.5000228881836,
-        "y": 606.6666707992554,
-        "z": "87aefe66.c6e82",
+        "x": 2069.5039291381836,
+        "y": 603.6705770492554,
+        "z": "c09ce476.40c538",
         "wires": [
             [
-                "67a62d00.2d4ff4"
+                "62656256.c5a38c"
             ]
         ]
     },
     {
-        "id": "befd23a0.20fa9",
+        "id": "33a9d2fa.2f6b4e",
         "type": "switchNode",
         "name": "switch network-level-oper-status",
         "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",
         "comments": "",
         "outputs": 1,
-        "x": 1457.6667098999023,
-        "y": 645.5555486679077,
-        "z": "87aefe66.c6e82",
+        "x": 1448.6706161499023,
+        "y": 642.5594549179077,
+        "z": "c09ce476.40c538",
         "wires": [
             [
-                "f546c4ba.29b768",
-                "ad8d6fcc.bfcca"
+                "1058ce1e.07c3a2",
+                "647164c.65ef89c"
             ]
         ]
     },
     {
-        "id": "f546c4ba.29b768",
+        "id": "1058ce1e.07c3a2",
         "type": "outcome",
         "name": "outcome Created",
         "xml": "<outcome value='Created'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1754.5001258850098,
-        "y": 645.5555467605591,
-        "z": "87aefe66.c6e82",
+        "x": 1745.5040321350098,
+        "y": 642.5594530105591,
+        "z": "c09ce476.40c538",
         "wires": [
             [
-                "72634f47.0cc42"
+                "d822f664.efe8c8"
             ]
         ]
     },
     {
-        "id": "ad8d6fcc.bfcca",
+        "id": "647164c.65ef89c",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1722.5001258850098,
-        "y": 685.5555467605591,
-        "z": "87aefe66.c6e82",
+        "x": 1713.5040321350098,
+        "y": 682.5594530105591,
+        "z": "c09ce476.40c538",
         "wires": [
             [
-                "28f836e1.3e6b7a"
+                "6947f2ff.46fb4c"
             ]
         ]
     },
     {
-        "id": "28f836e1.3e6b7a",
+        "id": "6947f2ff.46fb4c",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'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",
         "comments": "",
-        "x": 1880.0001258850098,
-        "y": 685.5555467605591,
-        "z": "87aefe66.c6e82",
+        "x": 1871.0040321350098,
+        "y": 682.5594530105591,
+        "z": "c09ce476.40c538",
         "wires": []
     },
     {
-        "id": "dac4a6bf.88b598",
+        "id": "5107dc7c.bd16c4",
         "type": "switchNode",
         "name": "switch vf-module-id",
         "xml": "<switch test=\"`$vf-module-topology-operation-input.vf-module-information.vf-module-id`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 1404.5000228881836,
-        "y": 506.66667079925537,
-        "z": "87aefe66.c6e82",
+        "x": 1395.5039291381836,
+        "y": 503.67057704925537,
+        "z": "c09ce476.40c538",
         "wires": [
             [
-                "a7ac2cab.79df8"
+                "2868a76.8aeaf58"
             ]
         ]
     },
     {
-        "id": "a7ac2cab.79df8",
+        "id": "2868a76.8aeaf58",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>",
         "comments": "",
         "outputs": 1,
-        "x": 1632.5000228881836,
-        "y": 506.66667079925537,
-        "z": "87aefe66.c6e82",
+        "x": 1623.5039291381836,
+        "y": 503.67057704925537,
+        "z": "c09ce476.40c538",
         "wires": [
             [
-                "b2c9eb9f.8ff438"
+                "ebf2eb70.fb3688"
             ]
         ]
     },
     {
-        "id": "b2c9eb9f.8ff438",
+        "id": "ebf2eb70.fb3688",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"network-request-input.network-input-parameters.name is a required input\" />\n",
         "comments": "",
-        "x": 1770.0000228881836,
-        "y": 506.66667079925537,
-        "z": "87aefe66.c6e82",
+        "x": 1761.0039291381836,
+        "y": 503.67057704925537,
+        "z": "c09ce476.40c538",
         "wires": []
     },
     {
-        "id": "5a51c09f.0dc8a",
+        "id": "123885f7.86e85a",
         "type": "execute",
         "name": "execute requiredParameters",
         "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",
         "comments": "",
         "outputs": 1,
-        "x": 1439.0000228881836,
-        "y": 466.66667079925537,
-        "z": "87aefe66.c6e82",
+        "x": 1430.0039291381836,
+        "y": 463.67057704925537,
+        "z": "c09ce476.40c538",
         "wires": [
             []
         ]
     },
     {
-        "id": "2fee238f.bd0b7c",
+        "id": "f43dfee.04573",
         "type": "switchNode",
         "name": "switch network-level-oper-status",
         "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",
         "comments": "",
         "outputs": 1,
-        "x": 1481.8332214355469,
-        "y": 895.555570602417,
-        "z": "87aefe66.c6e82",
+        "x": 1472.8371276855469,
+        "y": 892.559476852417,
+        "z": "c09ce476.40c538",
         "wires": [
             [
-                "cdf8dd70.c0108",
-                "2de75da0.b5bd52"
+                "f3a65bdd.c67898",
+                "d0952c59.11171"
             ]
         ]
     },
     {
-        "id": "cdf8dd70.c0108",
+        "id": "f3a65bdd.c67898",
         "type": "outcome",
         "name": "outcome Active",
         "xml": "<outcome value='Active'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1759.166648864746,
-        "y": 869.9999837875366,
-        "z": "87aefe66.c6e82",
+        "x": 1750.170555114746,
+        "y": 867.0038900375366,
+        "z": "c09ce476.40c538",
         "wires": [
             [
-                "e027e573.24bd48"
+                "25ff4eac.6201f2"
             ]
         ]
     },
     {
-        "id": "2de75da0.b5bd52",
+        "id": "d0952c59.11171",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1729.166648864746,
-        "y": 909.9999837875366,
-        "z": "87aefe66.c6e82",
+        "x": 1720.170555114746,
+        "y": 907.0038900375366,
+        "z": "c09ce476.40c538",
         "wires": [
             [
-                "4744b74f.6f4a88"
+                "446d50cf.78007"
             ]
         ]
     },
     {
-        "id": "4744b74f.6f4a88",
+        "id": "446d50cf.78007",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'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    ",
         "comments": "",
-        "x": 1895.166648864746,
-        "y": 911.9999837875366,
-        "z": "87aefe66.c6e82",
+        "x": 1886.170555114746,
+        "y": 909.0038900375366,
+        "z": "c09ce476.40c538",
         "wires": []
     },
     {
-        "id": "5f5b8df.a6d8d74",
+        "id": "ee1682f5.ef519",
         "type": "switchNode",
         "name": "switch network-level-oper-status",
         "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",
         "comments": "",
         "outputs": 1,
-        "x": 1474.7221908569336,
-        "y": 1066.6666097640991,
-        "z": "87aefe66.c6e82",
+        "x": 1465.7260971069336,
+        "y": 1063.6705160140991,
+        "z": "c09ce476.40c538",
         "wires": [
             [
-                "e0e44b44.c9e6c8",
-                "fa9a403f.1ce7e"
+                "cb2a1ac2.d811d8",
+                "425f06cf.84b998"
             ]
         ]
     },
     {
-        "id": "e0e44b44.c9e6c8",
+        "id": "cb2a1ac2.d811d8",
         "type": "outcome",
         "name": "outcome PendingDelete",
         "xml": "<outcome value='PendingDelete'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1774.7222518920898,
-        "y": 1034.444405555725,
-        "z": "87aefe66.c6e82",
+        "x": 1765.7261581420898,
+        "y": 1031.448311805725,
+        "z": "c09ce476.40c538",
         "wires": [
             [
-                "21ef3568.35bd5a"
+                "bcccebbc.df0278"
             ]
         ]
     },
     {
-        "id": "fa9a403f.1ce7e",
+        "id": "425f06cf.84b998",
         "type": "other",
         "name": "other",
         "xml": "<outcome value='Other'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1718.055564880371,
-        "y": 1081.1110677719116,
-        "z": "87aefe66.c6e82",
+        "x": 1709.059471130371,
+        "y": 1078.1149740219116,
+        "z": "c09ce476.40c538",
         "wires": [
             [
-                "2bc6f464.461d3c"
+                "a8198043.31984"
             ]
         ]
     },
     {
-        "id": "2bc6f464.461d3c",
+        "id": "a8198043.31984",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"`'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",
         "comments": "",
-        "x": 1884.055564880371,
-        "y": 1083.1110677719116,
-        "z": "87aefe66.c6e82",
+        "x": 1875.059471130371,
+        "y": 1080.1149740219116,
+        "z": "c09ce476.40c538",
         "wires": []
     },
     {
-        "id": "72634f47.0cc42",
+        "id": "d822f664.efe8c8",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1946.5001029968262,
-        "y": 646.6666488647461,
-        "z": "87aefe66.c6e82",
+        "x": 1937.5040092468262,
+        "y": 643.6705551147461,
+        "z": "c09ce476.40c538",
         "wires": [
             []
         ]
     },
     {
-        "id": "e027e573.24bd48",
+        "id": "25ff4eac.6201f2",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1959.1665267944336,
-        "y": 868.1481161117554,
-        "z": "87aefe66.c6e82",
+        "x": 1950.1704330444336,
+        "y": 865.1520223617554,
+        "z": "c09ce476.40c538",
         "wires": [
             []
         ]
     },
     {
-        "id": "21ef3568.35bd5a",
+        "id": "bcccebbc.df0278",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 1990.277732849121,
-        "y": 1034.8147420883179,
-        "z": "87aefe66.c6e82",
+        "x": 1981.281639099121,
+        "y": 1031.8186483383179,
+        "z": "c09ce476.40c538",
         "wires": [
             []
         ]
     },
     {
-        "id": "8d9c0c99.1bdcb",
+        "id": "434bc2ee.14a91c",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">",
         "atomic": "true",
         "outputs": 1,
-        "x": 2762.666534423828,
-        "y": 563.0000190734863,
-        "z": "87aefe66.c6e82",
+        "x": 2753.670440673828,
+        "y": 560.0039253234863,
+        "z": "c09ce476.40c538",
         "wires": [
             [
-                "7051b5d0.a337bc"
+                "d8b2b2f3.abfe5"
             ]
         ]
     },
     {
-        "id": "26ecbd16.18b922",
+        "id": "257f53b6.ca8b0c",
         "type": "switchNode",
         "name": "switch vnf_length",
         "xml": "<switch test='`$service-data.vnfs.vnf_length`'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 977.0065307617188,
-        "y": 110.24849605560303,
-        "z": "87aefe66.c6e82",
+        "x": 968.0104370117188,
+        "y": 107.25240230560303,
+        "z": "c09ce476.40c538",
         "wires": [
             [
-                "a795521a.23d6f"
+                "ad7c2596.e39388"
             ]
         ]
     },
     {
-        "id": "a795521a.23d6f",
+        "id": "ad7c2596.e39388",
         "type": "outcome",
         "name": "NULL",
         "xml": "<outcome value=''>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1157.0065116882324,
-        "y": 109.24848556518555,
-        "z": "87aefe66.c6e82",
+        "x": 1148.0104179382324,
+        "y": 106.25239181518555,
+        "z": "c09ce476.40c538",
         "wires": [
             [
-                "3e0e877f.b04338"
+                "94667639.3621e8"
             ]
         ]
     },
     {
-        "id": "3e0e877f.b04338",
+        "id": "94667639.3621e8",
         "type": "returnFailure",
         "name": "return failure",
         "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"vnf entry not found in service-data\" />\n",
         "comments": "",
-        "x": 1306.4352378845215,
-        "y": 110.39140319824219,
-        "z": "87aefe66.c6e82",
+        "x": 1297.4391441345215,
+        "y": 107.39530944824219,
+        "z": "c09ce476.40c538",
         "wires": []
     },
     {
-        "id": "f0d7fed2.a7f6e",
+        "id": "e33dc3b4.6bdba",
         "type": "for",
         "name": "for each vnf",
         "xml": "<for index='idx' start='0' end='`$service-data.vnfs.vnf_length`' >\n",
         "comments": "",
         "outputs": 1,
-        "x": 957.0379104614258,
-        "y": 172.51763439178467,
-        "z": "87aefe66.c6e82",
+        "x": 948.0418167114258,
+        "y": 169.52154064178467,
+        "z": "c09ce476.40c538",
         "wires": [
             [
-                "c781186.35a6de8"
+                "30c7b890.07a568"
             ]
         ]
     },
     {
-        "id": "c781186.35a6de8",
+        "id": "30c7b890.07a568",
         "type": "switchNode",
         "name": "switch this vnf-id == input vnf-id",
         "xml": "<switch test=\"`$service-data.vnfs.vnf[$idx].vnf-id == $vf-module-topology-operation-input.vnf-information.vnf-id`\">    \n",
         "comments": "",
         "outputs": 1,
-        "x": 1195.0065269470215,
-        "y": 172.2484917640686,
-        "z": "87aefe66.c6e82",
+        "x": 1186.0104331970215,
+        "y": 169.2523980140686,
+        "z": "c09ce476.40c538",
         "wires": [
             [
-                "3c97bff.ca0c74"
+                "659e2d6d.62e114"
             ]
         ]
     },
     {
-        "id": "3c97bff.ca0c74",
+        "id": "659e2d6d.62e114",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1410.0065116882324,
-        "y": 170.24848556518555,
-        "z": "87aefe66.c6e82",
+        "x": 1401.0104179382324,
+        "y": 167.25239181518555,
+        "z": "c09ce476.40c538",
         "wires": [
             [
-                "daf74faa.b14cc"
+                "79ae665a.7603a8"
             ]
         ]
     },
     {
-        "id": "daf74faa.b14cc",
+        "id": "79ae665a.7603a8",
         "type": "set",
         "name": "set vnf-index",
         "xml": "<set>\n<parameter name='vnf-index' value='`$idx`' />\n",
         "comments": "",
-        "x": 1574.0065116882324,
-        "y": 165.24848556518555,
-        "z": "87aefe66.c6e82",
+        "x": 1565.0104179382324,
+        "y": 162.25239181518555,
+        "z": "c09ce476.40c538",
         "wires": []
+    },
+    {
+        "id": "d950638a.e6fd1",
+        "type": "returnFailure",
+        "name": "return failure",
+        "xml": "<return status='failure'>\n\t<parameter name='ack-final' value='Y'/>\n\t<parameter name=\"error-code\" value=\"500\" />\n    <parameter name=\"error-message\" value=\"vnf id not found in service-data\" />\n",
+        "comments": "",
+        "x": 1270.00390625,
+        "y": 215.00390625,
+        "z": "c09ce476.40c538",
+        "wires": []
+    },
+    {
+        "id": "c45b00c9.864fa",
+        "type": "other",
+        "name": "Null",
+        "xml": "<outcome value=''>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1120.7538146972656,
+        "y": 217.2260284423828,
+        "z": "c09ce476.40c538",
+        "wires": [
+            [
+                "d950638a.e6fd1"
+            ]
+        ]
+    },
+    {
+        "id": "fa0b83ce.07d0f",
+        "type": "switchNode",
+        "name": "switch vnf-index",
+        "xml": "<switch test='`$vnf-index`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 958.7537689208984,
+        "y": 218.22602939605713,
+        "z": "c09ce476.40c538",
+        "wires": [
+            [
+                "c45b00c9.864fa"
+            ]
+        ]
     }
 ]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_validate-sdwan-vf-vpn-input-parameters.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_validate-sdwan-vf-vpn-input-parameters.xml
index 29b26cd9..60492b5b 100644
--- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_validate-sdwan-vf-vpn-input-parameters.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_validate-sdwan-vf-vpn-input-parameters.xml
@@ -30,6 +30,15 @@
                     </outcome>
                 </switch>
             </for>
+            <switch test='`$vnf-index`'>
+                <outcome value=''>
+                    <return status='failure'>
+                        <parameter name='ack-final' value='Y'/>
+                        <parameter name="error-code" value="500" />
+                        <parameter name="error-message" value="vnf id not found in service-data" />
+                    </return>
+                </outcome>
+            </switch>
             <switch test='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`'>
                 <outcome value='create'>
                     <block atomic="true">