From: Dan Timoney <dtimoney@att.com>
Date: Fri, 19 Apr 2019 13:44:57 +0000 (+0000)
Subject: Merge "SDWAN device oper status not updated in AAI"
X-Git-Tag: 1.5.1~23
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=e96fae5a95db9d750db8669691714325d8d033a4;hp=ac7aff096f2d605657aa57ece8d2bc8426354cbb;p=sdnc%2Foam.git

Merge "SDWAN device oper status not updated in AAI"

Former-commit-id: b6f2775e642f2a0b7cfeb4162bae8a98ec0ea0ae
---

diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-vf-module-input.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-vf-module-input.json
index ebf78f4d..71818370 100644
--- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-vf-module-input.json
+++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-vf-module-input.json
@@ -1 +1,557 @@
-[{"id":"ea5c79fa.0a8cc8","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":286.25000762939453,"y":416.25000762939453,"z":"e7f16526.16fa48","wires":[["415f4f79.ce4c6","3f9465cc.1cf0ca","d5fa8c45.3e223","4b25ca9c.280804","f4dcf148.c2c8d","74fce8e4.b16128","b87e6689.a6bb68"]]},{"id":"415f4f79.ce4c6","type":"switchNode","name":"switch svc-request-id","xml":"<switch test='`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`'>\n","comments":"","outputs":1,"x":542.7619094848633,"y":349.33034229278564,"z":"e7f16526.16fa48","wires":[["569a8602.d763d8"]]},{"id":"569a8602.d763d8","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":768.476203918457,"y":349.3303461074829,"z":"e7f16526.16fa48","wires":[["83dcb0ce.53e5a"]]},{"id":"83dcb0ce.53e5a","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":919.9047698974609,"y":349.3303442001343,"z":"e7f16526.16fa48","wires":[]},{"id":"3f9465cc.1cf0ca","type":"switchNode","name":"switch svc-action","xml":"<switch test='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`'>\n","comments":"","outputs":1,"x":531.3332726614817,"y":307.9017738614764,"z":"e7f16526.16fa48","wires":[["90f99d55.c26ac"]]},{"id":"90f99d55.c26ac","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":767.0476243155344,"y":306.47317164284846,"z":"e7f16526.16fa48","wires":[["81889b61.b3bfd8"]]},{"id":"81889b61.b3bfd8","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-action is a required input\" />\n","comments":"","x":917.0475976126536,"y":306.4731811795916,"z":"e7f16526.16fa48","wires":[]},{"id":"d5fa8c45.3e223","type":"switchNode","name":"switch request-action","xml":"<switch test='`$vf-module-topology-operation-input.request-information.request-action`'>\n","comments":"","outputs":1,"x":541.3333260672434,"y":392.1874889646258,"z":"e7f16526.16fa48","wires":[["faa49149.2b86c"]]},{"id":"faa49149.2b86c","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":768.4761995588033,"y":392.1874998637609,"z":"e7f16526.16fa48","wires":[["54306d5b.2a8714"]]},{"id":"54306d5b.2a8714","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 a required input\" />\n","comments":"","x":919.9047655378072,"y":392.18749795641224,"z":"e7f16526.16fa48","wires":[]},{"id":"9652914c.1bb7e","type":"switchNode","name":"switch model-customization-id","xml":"<switch test='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid`'>\n","comments":"","outputs":1,"x":1138.7978401184082,"y":563.9496374130249,"z":"e7f16526.16fa48","wires":[["10afdd9f.c76fe2"]]},{"id":"10afdd9f.c76fe2","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":1343.7978401184082,"y":563.9496202468872,"z":"e7f16526.16fa48","wires":[["5ca4e9bd.7d2d68"]]},{"id":"5ca4e9bd.7d2d68","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-information.onap-model-information.model-customization-uuid is a required input\" />\n","comments":"","x":1495.226406097412,"y":563.9496183395386,"z":"e7f16526.16fa48","wires":[]},{"id":"5073a804.d512e8","type":"switchNode","name":"switch tenant","xml":"<switch test='`$vf-module-topology-operation-input.vf-module-request-input.tenant`'>\n","comments":"","outputs":1,"x":1084.6549186706543,"y":605.3781480789185,"z":"e7f16526.16fa48","wires":[["59c1d2fa.686d8c"]]},{"id":"59c1d2fa.686d8c","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":1342.3692359924316,"y":605.3781824111938,"z":"e7f16526.16fa48","wires":[["f3fb61d6.cc04f"]]},{"id":"f3fb61d6.cc04f","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-information.vf-module-request-input.tenant is a required input\" />\n","comments":"","x":1493.7978019714355,"y":605.3781805038452,"z":"e7f16526.16fa48","wires":[]},{"id":"85af947a.22df18","type":"comment","name":"Validation of required fields","info":"","comments":"","x":691.3332824707031,"y":263.61605644226074,"z":"e7f16526.16fa48","wires":[]},{"id":"4b25ca9c.280804","type":"switchNode","name":"switch svc-action","xml":"<switch test='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`'>\n","comments":"","outputs":1,"x":524.4880752563477,"y":606.2948093414307,"z":"e7f16526.16fa48","wires":[["46f73107.a11e3"]]},{"id":"46f73107.a11e3","type":"outcome","name":"assign","xml":"<outcome value='assign'>\n","comments":"","outputs":1,"x":684.0713768005371,"y":605.8780736923218,"z":"e7f16526.16fa48","wires":[["5f080643.137608"]]},{"id":"5f080643.137608","type":"block","name":"block : atomic","xml":"<block atomic=\"true\">","atomic":"true","outputs":1,"x":876.0713768005371,"y":605.8780736923218,"z":"e7f16526.16fa48","wires":[["9652914c.1bb7e","5073a804.d512e8","97868ae3.7d64c8"]]},{"id":"b003da9.6001328","type":"dgstart","name":"DGSTART","outputs":1,"x":203.7500098092214,"y":136.1636562347412,"z":"e7f16526.16fa48","wires":[["4513d2b4.de1b4c"]]},{"id":"4513d2b4.de1b4c","type":"service-logic","name":"GENERIC-RESOURCE-API ${project.version}","module":"GENERIC-RESOURCE-API","version":"${project.version}","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":317.03571537562766,"y":176.4017677307129,"z":"e7f16526.16fa48","wires":[["9f09d02b.74d24"]]},{"id":"9f09d02b.74d24","type":"method","name":"method validate-vf-module-input","xml":"<method rpc='validate-vf-module-input' mode='sync'>\n","comments":"","outputs":1,"x":274.095304761614,"y":217.08031368255615,"z":"e7f16526.16fa48","wires":[["ea5c79fa.0a8cc8"]]},{"id":"c6fa4eaa.296c1","type":"comment","name":"validate-vf-module-input","info":"","comments":"","x":598.0948660714284,"y":83.75,"z":"e7f16526.16fa48","wires":[]},{"id":"f4dcf148.c2c8d","type":"switchNode","name":"switch service-instance-id","xml":"<switch test='`$vf-module-topology-operation-input.service-information.service-instance-id`'>\n","comments":"","outputs":1,"x":554.3571570260183,"y":436.25001525878906,"z":"e7f16526.16fa48","wires":[["40adc00a.0182f"]]},{"id":"40adc00a.0182f","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":766.7857382638113,"y":436.2500114440918,"z":"e7f16526.16fa48","wires":[["4bc1bff5.09afa"]]},{"id":"4bc1bff5.09afa","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=\"service-information.service-instance-id is a required input\" />\n","comments":"","x":918.2143042428152,"y":436.25000953674316,"z":"e7f16526.16fa48","wires":[]},{"id":"74fce8e4.b16128","type":"switchNode","name":"switch vnf-id","xml":"<switch test='`$vf-module-topology-operation-input.vnf-information.vnf-id`'>\n","comments":"","outputs":1,"x":511.8571662902832,"y":482.7500057220459,"z":"e7f16526.16fa48","wires":[["5b2b7ba3.f8c584"]]},{"id":"5b2b7ba3.f8c584","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":767.1428756713867,"y":481.32143783569336,"z":"e7f16526.16fa48","wires":[["a3b38083.db3e6"]]},{"id":"a3b38083.db3e6","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-information.vnf-id is a required input\" />\n","comments":"","x":918.5714416503906,"y":481.3214359283447,"z":"e7f16526.16fa48","wires":[]},{"id":"97868ae3.7d64c8","type":"switchNode","name":"switch aic-cloud-region","xml":"<switch test='`$vf-module-topology-operation-input.vf-module-request-input.aic-cloud-region`'>\n","comments":"","outputs":1,"x":1114,"y":647.6548051834106,"z":"e7f16526.16fa48","wires":[["a5724b37.d9d578"]]},{"id":"a5724b37.d9d578","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":1340.7143173217773,"y":647.654839515686,"z":"e7f16526.16fa48","wires":[["e5de3e6a.52ece"]]},{"id":"e5de3e6a.52ece","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.aic-cloud-region is a required input\" />\n","comments":"","x":1492.1428833007812,"y":647.6548376083374,"z":"e7f16526.16fa48","wires":[]},{"id":"b87e6689.a6bb68","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":532.6666564941406,"y":528.7499847412109,"z":"e7f16526.16fa48","wires":[["e506a425.ee0a78"]]},{"id":"e506a425.ee0a78","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":766.9523658752441,"y":527.3214168548584,"z":"e7f16526.16fa48","wires":[["b00a0f0d.7df6c"]]},{"id":"b00a0f0d.7df6c","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-information.vf-module-id is a required input\" />\n","comments":"","x":918.380931854248,"y":527.3214149475098,"z":"e7f16526.16fa48","wires":[]},{"id":"27b56d4b.cf2242","type":"outcome","name":"changeassign","xml":"<outcome value='changeassign'>\n","comments":"","outputs":1,"x":707.9166946411133,"y":761.0000114440918,"z":"e7f16526.16fa48","wires":[["858c4aa9.75cbe8"]]},{"id":"858c4aa9.75cbe8","type":"switchNode","name":"switch model-customization-id","xml":"<switch test='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid`'>\n","comments":"","outputs":1,"x":934.5833358764648,"y":761.3333168029785,"z":"e7f16526.16fa48","wires":[["16e33b74.6a3275"]]},{"id":"16e33b74.6a3275","type":"outcome","name":"NULL","xml":"<outcome value=''>","comments":"","outputs":1,"x":1139.5833358764648,"y":761.3332996368408,"z":"e7f16526.16fa48","wires":[["8cdecc05.e04a9"]]},{"id":"8cdecc05.e04a9","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-information.onap-model-information.model-customization-uuid is a required input\" />\n","comments":"","x":1291.0119018554688,"y":761.3332977294922,"z":"e7f16526.16fa48","wires":[]},{"id":"ba0cf2a7.da9b1","type":"comment","name":"model-customization-uuid validation moved to changeassign DG","info":"","comments":"","x":765,"y":718.75,"z":"e7f16526.16fa48","wires":[]}]
\ No newline at end of file
+[
+    {
+        "id": "64530960.7a4c48",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 266.03125,
+        "y": 487.50000762939453,
+        "z": "c914996f.38af08",
+        "wires": [
+            [
+                "42eab53.cead04c",
+                "9030d08e.473eb",
+                "e2eeb7ea.c3b598",
+                "6a464fe8.f5db",
+                "1cf09f88.9f996",
+                "50ebeee1.1f03d"
+            ]
+        ]
+    },
+    {
+        "id": "42eab53.cead04c",
+        "type": "switchNode",
+        "name": "switch svc-request-id",
+        "xml": "<switch test='`$vf-module-topology-operation-input.sdnc-request-header.svc-request-id`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 522.5431518554688,
+        "y": 420.58034229278564,
+        "z": "c914996f.38af08",
+        "wires": [
+            [
+                "acac6999.f74ae8"
+            ]
+        ]
+    },
+    {
+        "id": "acac6999.f74ae8",
+        "type": "outcome",
+        "name": "NULL",
+        "xml": "<outcome value=''>",
+        "comments": "",
+        "outputs": 1,
+        "x": 748.2574462890625,
+        "y": 420.5803461074829,
+        "z": "c914996f.38af08",
+        "wires": [
+            [
+                "7a7765a6.716e9c"
+            ]
+        ]
+    },
+    {
+        "id": "7a7765a6.716e9c",
+        "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": 899.6860122680664,
+        "y": 420.5803442001343,
+        "z": "c914996f.38af08",
+        "wires": []
+    },
+    {
+        "id": "9030d08e.473eb",
+        "type": "switchNode",
+        "name": "switch svc-action",
+        "xml": "<switch test='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 511.1145150320872,
+        "y": 379.1517738614764,
+        "z": "c914996f.38af08",
+        "wires": [
+            [
+                "6c42550c.9ee7ec"
+            ]
+        ]
+    },
+    {
+        "id": "6c42550c.9ee7ec",
+        "type": "outcome",
+        "name": "NULL",
+        "xml": "<outcome value=''>",
+        "comments": "",
+        "outputs": 1,
+        "x": 746.8288666861399,
+        "y": 377.72317164284846,
+        "z": "c914996f.38af08",
+        "wires": [
+            [
+                "7bffbb0f.9e8194"
+            ]
+        ]
+    },
+    {
+        "id": "7bffbb0f.9e8194",
+        "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-action is a required input\" />\n",
+        "comments": "",
+        "x": 896.8288399832591,
+        "y": 377.7231811795916,
+        "z": "c914996f.38af08",
+        "wires": []
+    },
+    {
+        "id": "e2eeb7ea.c3b598",
+        "type": "switchNode",
+        "name": "switch request-action",
+        "xml": "<switch test='`$vf-module-topology-operation-input.request-information.request-action`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 521.1145684378489,
+        "y": 463.4374889646258,
+        "z": "c914996f.38af08",
+        "wires": [
+            [
+                "3b145144.cf0dce"
+            ]
+        ]
+    },
+    {
+        "id": "3b145144.cf0dce",
+        "type": "outcome",
+        "name": "NULL",
+        "xml": "<outcome value=''>",
+        "comments": "",
+        "outputs": 1,
+        "x": 748.2574419294087,
+        "y": 463.4374998637609,
+        "z": "c914996f.38af08",
+        "wires": [
+            [
+                "dab01406.ba8c98"
+            ]
+        ]
+    },
+    {
+        "id": "dab01406.ba8c98",
+        "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 a required input\" />\n",
+        "comments": "",
+        "x": 899.6860079084126,
+        "y": 463.43749795641224,
+        "z": "c914996f.38af08",
+        "wires": []
+    },
+    {
+        "id": "12ea91e7.8a5dee",
+        "type": "switchNode",
+        "name": "switch model-customization-id",
+        "xml": "<switch test='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1118.5790824890137,
+        "y": 635.1996374130249,
+        "z": "c914996f.38af08",
+        "wires": [
+            [
+                "7123b9f.8aa2648"
+            ]
+        ]
+    },
+    {
+        "id": "7123b9f.8aa2648",
+        "type": "outcome",
+        "name": "NULL",
+        "xml": "<outcome value=''>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1323.5790824890137,
+        "y": 635.1996202468872,
+        "z": "c914996f.38af08",
+        "wires": [
+            [
+                "56283888.4b07c8"
+            ]
+        ]
+    },
+    {
+        "id": "56283888.4b07c8",
+        "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-information.onap-model-information.model-customization-uuid is a required input\" />\n",
+        "comments": "",
+        "x": 1475.0076484680176,
+        "y": 635.1996183395386,
+        "z": "c914996f.38af08",
+        "wires": []
+    },
+    {
+        "id": "eca8ac0.d277c58",
+        "type": "switchNode",
+        "name": "switch tenant",
+        "xml": "<switch test='`$vf-module-topology-operation-input.vf-module-request-input.tenant`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1064.4361610412598,
+        "y": 676.6281480789185,
+        "z": "c914996f.38af08",
+        "wires": [
+            [
+                "17c7649f.342e3b"
+            ]
+        ]
+    },
+    {
+        "id": "17c7649f.342e3b",
+        "type": "outcome",
+        "name": "NULL",
+        "xml": "<outcome value=''>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1322.150478363037,
+        "y": 676.6281824111938,
+        "z": "c914996f.38af08",
+        "wires": [
+            [
+                "a9a7bd61.ab17c"
+            ]
+        ]
+    },
+    {
+        "id": "a9a7bd61.ab17c",
+        "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-information.vf-module-request-input.tenant is a required input\" />\n",
+        "comments": "",
+        "x": 1473.579044342041,
+        "y": 676.6281805038452,
+        "z": "c914996f.38af08",
+        "wires": []
+    },
+    {
+        "id": "37d1ad14.2a8632",
+        "type": "comment",
+        "name": "Validation of required fields",
+        "info": "",
+        "comments": "",
+        "x": 671.1145248413086,
+        "y": 334.86605644226074,
+        "z": "c914996f.38af08",
+        "wires": []
+    },
+    {
+        "id": "6a464fe8.f5db",
+        "type": "switchNode",
+        "name": "switch svc-action",
+        "xml": "<switch test='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 504.2693176269531,
+        "y": 677.5448093414307,
+        "z": "c914996f.38af08",
+        "wires": [
+            [
+                "55f87411.8977fc"
+            ]
+        ]
+    },
+    {
+        "id": "55f87411.8977fc",
+        "type": "outcome",
+        "name": "assign",
+        "xml": "<outcome value='assign'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 663.8526191711426,
+        "y": 677.1280736923218,
+        "z": "c914996f.38af08",
+        "wires": [
+            [
+                "76a30e92.c3b23"
+            ]
+        ]
+    },
+    {
+        "id": "76a30e92.c3b23",
+        "type": "block",
+        "name": "block : atomic",
+        "xml": "<block atomic=\"true\">",
+        "atomic": "true",
+        "outputs": 1,
+        "x": 855.8526191711426,
+        "y": 677.1280736923218,
+        "z": "c914996f.38af08",
+        "wires": [
+            [
+                "12ea91e7.8a5dee",
+                "eca8ac0.d277c58",
+                "75303db4.f39ac4"
+            ]
+        ]
+    },
+    {
+        "id": "412ad4c5.a2550c",
+        "type": "dgstart",
+        "name": "DGSTART",
+        "outputs": 1,
+        "x": 183.53125217982688,
+        "y": 207.4136562347412,
+        "z": "c914996f.38af08",
+        "wires": [
+            [
+                "5fecaed1.6af1f"
+            ]
+        ]
+    },
+    {
+        "id": "5fecaed1.6af1f",
+        "type": "service-logic",
+        "name": "GENERIC-RESOURCE-API ${project.version}",
+        "module": "GENERIC-RESOURCE-API",
+        "version": "${project.version}",
+        "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": 296.81695774623313,
+        "y": 247.6517677307129,
+        "z": "c914996f.38af08",
+        "wires": [
+            [
+                "ce8e825.505198"
+            ]
+        ]
+    },
+    {
+        "id": "ce8e825.505198",
+        "type": "method",
+        "name": "method validate-vf-module-input",
+        "xml": "<method rpc='validate-vf-module-input' mode='sync'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 253.87654713221946,
+        "y": 288.33031368255615,
+        "z": "c914996f.38af08",
+        "wires": [
+            [
+                "64530960.7a4c48"
+            ]
+        ]
+    },
+    {
+        "id": "d3c65d01.b09e8",
+        "type": "comment",
+        "name": "validate-vf-module-input",
+        "info": "",
+        "comments": "",
+        "x": 577.8761084420339,
+        "y": 155,
+        "z": "c914996f.38af08",
+        "wires": []
+    },
+    {
+        "id": "1cf09f88.9f996",
+        "type": "switchNode",
+        "name": "switch service-instance-id",
+        "xml": "<switch test='`$vf-module-topology-operation-input.service-information.service-instance-id`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 534.1383993966238,
+        "y": 507.50001525878906,
+        "z": "c914996f.38af08",
+        "wires": [
+            [
+                "4a5d470b.8d66d8"
+            ]
+        ]
+    },
+    {
+        "id": "4a5d470b.8d66d8",
+        "type": "outcome",
+        "name": "NULL",
+        "xml": "<outcome value=''>",
+        "comments": "",
+        "outputs": 1,
+        "x": 746.5669806344167,
+        "y": 507.5000114440918,
+        "z": "c914996f.38af08",
+        "wires": [
+            [
+                "6a814e78.eefa1"
+            ]
+        ]
+    },
+    {
+        "id": "6a814e78.eefa1",
+        "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=\"service-information.service-instance-id is a required input\" />\n",
+        "comments": "",
+        "x": 897.9955466134206,
+        "y": 507.50000953674316,
+        "z": "c914996f.38af08",
+        "wires": []
+    },
+    {
+        "id": "50ebeee1.1f03d",
+        "type": "switchNode",
+        "name": "switch vnf-id",
+        "xml": "<switch test='`$vf-module-topology-operation-input.vnf-information.vnf-id`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 491.6384086608887,
+        "y": 554.0000057220459,
+        "z": "c914996f.38af08",
+        "wires": [
+            [
+                "91be467.d997cb8"
+            ]
+        ]
+    },
+    {
+        "id": "91be467.d997cb8",
+        "type": "outcome",
+        "name": "NULL",
+        "xml": "<outcome value=''>",
+        "comments": "",
+        "outputs": 1,
+        "x": 746.9241180419922,
+        "y": 552.5714378356934,
+        "z": "c914996f.38af08",
+        "wires": [
+            [
+                "a61fec00.397b18"
+            ]
+        ]
+    },
+    {
+        "id": "a61fec00.397b18",
+        "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-information.vnf-id is a required input\" />\n",
+        "comments": "",
+        "x": 898.3526840209961,
+        "y": 552.5714359283447,
+        "z": "c914996f.38af08",
+        "wires": []
+    },
+    {
+        "id": "75303db4.f39ac4",
+        "type": "switchNode",
+        "name": "switch aic-cloud-region",
+        "xml": "<switch test='`$vf-module-topology-operation-input.vf-module-request-input.aic-cloud-region`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 1093.7812423706055,
+        "y": 718.9048051834106,
+        "z": "c914996f.38af08",
+        "wires": [
+            [
+                "ce90203b.b0afd"
+            ]
+        ]
+    },
+    {
+        "id": "ce90203b.b0afd",
+        "type": "outcome",
+        "name": "NULL",
+        "xml": "<outcome value=''>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1320.4955596923828,
+        "y": 718.904839515686,
+        "z": "c914996f.38af08",
+        "wires": [
+            [
+                "2275e534.88d4ca"
+            ]
+        ]
+    },
+    {
+        "id": "2275e534.88d4ca",
+        "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.aic-cloud-region is a required input\" />\n",
+        "comments": "",
+        "x": 1471.9241256713867,
+        "y": 718.9048376083374,
+        "z": "c914996f.38af08",
+        "wires": []
+    },
+    {
+        "id": "3d870d1c.309352",
+        "type": "outcome",
+        "name": "changeassign",
+        "xml": "<outcome value='changeassign'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 687.6979370117188,
+        "y": 832.2500114440918,
+        "z": "c914996f.38af08",
+        "wires": [
+            [
+                "fa0141f0.f9902"
+            ]
+        ]
+    },
+    {
+        "id": "fa0141f0.f9902",
+        "type": "switchNode",
+        "name": "switch model-customization-id",
+        "xml": "<switch test='`$vf-module-topology-operation-input.vf-module-information.onap-model-information.model-customization-uuid`'>\n",
+        "comments": "",
+        "outputs": 1,
+        "x": 914.3645782470703,
+        "y": 832.5833168029785,
+        "z": "c914996f.38af08",
+        "wires": [
+            [
+                "5358c72a.6a77a8"
+            ]
+        ]
+    },
+    {
+        "id": "5358c72a.6a77a8",
+        "type": "outcome",
+        "name": "NULL",
+        "xml": "<outcome value=''>",
+        "comments": "",
+        "outputs": 1,
+        "x": 1119.3645782470703,
+        "y": 832.5832996368408,
+        "z": "c914996f.38af08",
+        "wires": [
+            [
+                "80d57253.986af"
+            ]
+        ]
+    },
+    {
+        "id": "80d57253.986af",
+        "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-information.onap-model-information.model-customization-uuid is a required input\" />\n",
+        "comments": "",
+        "x": 1270.7931442260742,
+        "y": 832.5832977294922,
+        "z": "c914996f.38af08",
+        "wires": []
+    },
+    {
+        "id": "319c1dc4.f1e692",
+        "type": "comment",
+        "name": "model-customization-uuid validation moved to changeassign DG",
+        "info": "",
+        "comments": "",
+        "x": 744.7812423706055,
+        "y": 790,
+        "z": "c914996f.38af08",
+        "wires": []
+    }
+]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-get-wan-param.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-get-wan-param.json
index 30ccba9b..88915060 100644
--- a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-get-wan-param.json
+++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-get-wan-param.json
@@ -1,20 +1,20 @@
 [
     {
-        "id": "818160d.1a87aa",
+        "id": "f4e72acb.01bf58",
         "type": "dgstart",
         "name": "DGSTART",
         "outputs": 1,
-        "x": 116.01041412353516,
-        "y": 49.010414123535156,
-        "z": "83799888.3d8488",
+        "x": 130.03125,
+        "y": 54.00000190734863,
+        "z": "192759e2.8ca676",
         "wires": [
             [
-                "2c87f750.9ff0e8"
+                "a16de899.ba6ce8"
             ]
         ]
     },
     {
-        "id": "2c87f750.9ff0e8",
+        "id": "a16de899.ba6ce8",
         "type": "service-logic",
         "name": "GENERIC-RESOURCE-API ${project.version}",
         "module": "GENERIC-RESOURCE-API",
@@ -22,838 +22,838 @@
         "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": 253.01041793823242,
-        "y": 154.0104274749756,
-        "z": "83799888.3d8488",
+        "x": 267.03125381469727,
+        "y": 159.00001525878906,
+        "z": "192759e2.8ca676",
         "wires": [
             [
-                "ff163fb7.14832"
+                "452b8421.fdadac"
             ]
         ]
     },
     {
-        "id": "ff163fb7.14832",
+        "id": "452b8421.fdadac",
         "type": "method",
         "name": "sdwan-get-wan-param",
         "xml": "<method rpc='sdwan-get-wan-param' mode='sync'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 241.01053619384766,
-        "y": 242.0104103088379,
-        "z": "83799888.3d8488",
+        "x": 255.0313720703125,
+        "y": 246.99999809265137,
+        "z": "192759e2.8ca676",
         "wires": [
             [
-                "352c95ce.453cea"
+                "50910d6a.5d96b4"
             ]
         ]
     },
     {
-        "id": "352c95ce.453cea",
+        "id": "50910d6a.5d96b4",
         "type": "block",
         "name": "block : atomic",
         "xml": "<block atomic=\"true\">\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 248.01042938232422,
-        "y": 328.0104684829712,
-        "z": "83799888.3d8488",
+        "x": 262.03126525878906,
+        "y": 333.00005626678467,
+        "z": "192759e2.8ca676",
         "wires": [
             [
-                "52293f30.d5b77"
+                "8cd27d33.452ae"
             ]
         ]
     },
     {
-        "id": "52293f30.d5b77",
+        "id": "8cd27d33.452ae",
         "type": "for",
         "name": "for each sdwan-get-request-input-param",
-        "xml": "<for index=\"idx\" start=\"0\" end=\"`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param_length`\">\n\n",
+        "xml": "<for index=\"idx\" start=\"0\" end=\"`$vf-module-request-input.vf-module-input-parameters.param_length`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 284.6771926879883,
-        "y": 410.6770648956299,
-        "z": "83799888.3d8488",
+        "x": 298.6980285644531,
+        "y": 415.66665267944336,
+        "z": "192759e2.8ca676",
         "wires": [
             [
-                "e8d20d4.02e64f"
+                "b3542ade.7b14d8"
             ]
         ]
     },
     {
-        "id": "e8d20d4.02e64f",
+        "id": "b3542ade.7b14d8",
         "type": "block",
         "name": "block",
         "xml": "<block>\n",
         "atomic": "false",
         "comments": "",
         "outputs": 1,
-        "x": 549.5106964111328,
-        "y": 320.01045656204224,
-        "z": "83799888.3d8488",
+        "x": 563.5315322875977,
+        "y": 325.0000443458557,
+        "z": "192759e2.8ca676",
         "wires": [
             [
-                "2847b0ea.9ebb",
-                "d4feaef6.6438f",
-                "3e47338e.c3ab3c",
-                "91d20588.adacd8",
-                "43f318cb.2f4418",
-                "49351eca.09882",
-                "a41eaf2.439f75",
-                "9005e8e9.34f768",
-                "a55d2183.cf6a",
-                "c8c85e46.4f10f",
-                "286e48cc.e48988",
-                "383fea5a.143066",
-                "18a75045.9bb5e",
-                "60fcaabc.ca5bf4",
-                "d17b4c90.52ccd",
-                "2a13a6a0.eb644a",
-                "19ce9dfd.f8a2f2",
-                "a399cdca.37b7a"
+                "e86947af.f5b608",
+                "638cf29c.12828c",
+                "46b5c4a7.4a507c",
+                "b5fed085.d4d7c",
+                "77b16659.a09ba8",
+                "d7c2c346.bb4d6",
+                "8f7cd129.e628b",
+                "7871b91.d889348",
+                "de89e87a.10da58",
+                "769a21a2.077c4",
+                "e772d25.ba6eb3",
+                "6d16b1ef.6edda",
+                "f44a56f3.db7c08",
+                "2d9d0a07.21b996",
+                "f4e0170c.c926f8",
+                "ec6279c6.c6c888",
+                "7c9c948.6f89d6c",
+                "97c178d3.f58628"
             ]
         ]
     },
     {
-        "id": "2847b0ea.9ebb",
+        "id": "e86947af.f5b608",
         "type": "returnSuccess",
         "name": "return success",
         "xml": "<return status='success'>\n<parameter name=\"ack-final-indicator\" value=\"Y\" />\n<parameter name=\"error-code\" value=\"200\" />\n<parameter name=\"error-message\" value=\"`$error-message`\" />\n",
         "comments": "",
-        "x": 781.0111198425293,
-        "y": 804.0109233856201,
-        "z": "83799888.3d8488",
+        "x": 795.0319557189941,
+        "y": 809.0005111694336,
+        "z": "192759e2.8ca676",
         "wires": []
     },
     {
-        "id": "43f318cb.2f4418",
+        "id": "77b16659.a09ba8",
         "type": "switchNode",
         "name": "switch deviceName",
         "xml": "<switch test=\"`$vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'deviceName'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 782.0105018615723,
-        "y": 235.01046657562256,
-        "z": "83799888.3d8488",
+        "x": 796.0313377380371,
+        "y": 240.00005435943604,
+        "z": "192759e2.8ca676",
         "wires": [
             [
-                "510fde76.25775"
+                "8a272a2c.746128"
             ]
         ]
     },
     {
-        "id": "510fde76.25775",
+        "id": "8a272a2c.746128",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 984.010908126831,
-        "y": 236.01053714752197,
-        "z": "83799888.3d8488",
+        "x": 998.0317440032959,
+        "y": 241.00012493133545,
+        "z": "192759e2.8ca676",
         "wires": [
             [
-                "bacc1950.a6e0e8"
+                "2c0253a3.fcc01c"
             ]
         ]
     },
     {
-        "id": "bacc1950.a6e0e8",
+        "id": "2c0253a3.fcc01c",
         "type": "set",
         "name": "set deviceName",
         "xml": "<set>\n<parameter name='prop.wan.deviceName' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />",
         "comments": "",
-        "x": 1148.0111656188965,
-        "y": 232.6106538772583,
-        "z": "83799888.3d8488",
+        "x": 1162.0320014953613,
+        "y": 237.60024166107178,
+        "z": "192759e2.8ca676",
         "wires": []
     },
     {
-        "id": "c8c85e46.4f10f",
+        "id": "769a21a2.077c4",
         "type": "switchNode",
         "name": "switch vlanId",
         "xml": "<switch test=\"`$vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'vlanId'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 763.8506278991699,
-        "y": 465.01052474975586,
-        "z": "83799888.3d8488",
+        "x": 777.8714637756348,
+        "y": 470.00011253356934,
+        "z": "192759e2.8ca676",
         "wires": [
             [
-                "5ea3c659.f0cd28"
+                "96af6598.d7c628"
             ]
         ]
     },
     {
-        "id": "5ea3c659.f0cd28",
+        "id": "96af6598.d7c628",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 948.850715637207,
-        "y": 463.010555267334,
-        "z": "83799888.3d8488",
+        "x": 962.8715515136719,
+        "y": 468.00014305114746,
+        "z": "192759e2.8ca676",
         "wires": [
             [
-                "a7e47063.77624"
+                "835228c7.4ae758"
             ]
         ]
     },
     {
-        "id": "a7e47063.77624",
+        "id": "835228c7.4ae758",
         "type": "set",
         "name": "set vlanId",
         "xml": "<set>\n<parameter name='prop.wan.vlanId' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />",
         "comments": "",
-        "x": 1096.1846237182617,
-        "y": 460.4718141555786,
-        "z": "83799888.3d8488",
+        "x": 1110.2054595947266,
+        "y": 465.4614019393921,
+        "z": "192759e2.8ca676",
         "wires": []
     },
     {
-        "id": "3e47338e.c3ab3c",
+        "id": "46b5c4a7.4a507c",
         "type": "switchNode",
         "name": "switch name",
         "xml": "<switch test=\"`$vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'name'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 779.905574798584,
-        "y": 164.98373794555664,
-        "z": "83799888.3d8488",
+        "x": 793.9264106750488,
+        "y": 169.97332572937012,
+        "z": "192759e2.8ca676",
         "wires": [
             [
-                "69feffe1.51e2a"
+                "7b61097d.91aee8"
             ]
         ]
     },
     {
-        "id": "69feffe1.51e2a",
+        "id": "7b61097d.91aee8",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 967.9056625366211,
-        "y": 165.98376750946045,
-        "z": "83799888.3d8488",
+        "x": 981.9264984130859,
+        "y": 170.97335529327393,
+        "z": "192759e2.8ca676",
         "wires": [
             [
-                "8d991bb4.b45f18"
+                "b4967d12.d0c5f"
             ]
         ]
     },
     {
-        "id": "8d991bb4.b45f18",
+        "id": "b4967d12.d0c5f",
         "type": "set",
         "name": "set name",
         "xml": "<set>\n<parameter name='prop.wan.name' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />\n",
         "comments": "",
-        "x": 1117.905912399292,
-        "y": 160.58384323120117,
-        "z": "83799888.3d8488",
+        "x": 1131.9267482757568,
+        "y": 165.57343101501465,
+        "z": "192759e2.8ca676",
         "wires": []
     },
     {
-        "id": "9005e8e9.34f768",
+        "id": "7871b91.d889348",
         "type": "switchNode",
         "name": "switch ipAddress",
         "xml": "<switch test=\"`$vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'ipAddress'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 767.9058036804199,
-        "y": 391.38722801208496,
-        "z": "83799888.3d8488",
+        "x": 781.9266395568848,
+        "y": 396.37681579589844,
+        "z": "192759e2.8ca676",
         "wires": [
             [
-                "cf4b6fa5.dfd8b"
+                "e6c538ab.c14a08"
             ]
         ]
     },
     {
-        "id": "cf4b6fa5.dfd8b",
+        "id": "e6c538ab.c14a08",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 961.9060516357422,
-        "y": 392.3871765136719,
-        "z": "83799888.3d8488",
+        "x": 975.926887512207,
+        "y": 397.37676429748535,
+        "z": "192759e2.8ca676",
         "wires": [
             [
-                "abac1fea.19c24"
+                "4bb13cc.edc5bc4"
             ]
         ]
     },
     {
-        "id": "abac1fea.19c24",
+        "id": "4bb13cc.edc5bc4",
         "type": "set",
         "name": "set ipAddress",
         "xml": "<set>\n<parameter name='prop.wan.ipAddress' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />\n",
         "comments": "",
-        "x": 1114.2399597167969,
-        "y": 390.84843730926514,
-        "z": "83799888.3d8488",
+        "x": 1128.2607955932617,
+        "y": 395.8380250930786,
+        "z": "192759e2.8ca676",
         "wires": []
     },
     {
-        "id": "a55d2183.cf6a",
+        "id": "de89e87a.10da58",
         "type": "switchNode",
         "name": "switch providerIpAddress",
         "xml": "<switch test=\"`$vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'providerIpAddress'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 799.9059638977051,
-        "y": 426.387149810791,
-        "z": "83799888.3d8488",
+        "x": 813.9267997741699,
+        "y": 431.3767375946045,
+        "z": "192759e2.8ca676",
         "wires": [
             [
-                "b70a8774.407208"
+                "a03ed9c9.218c88"
             ]
         ]
     },
     {
-        "id": "b70a8774.407208",
+        "id": "a03ed9c9.218c88",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 975.9062156677246,
-        "y": 426.387095451355,
-        "z": "83799888.3d8488",
+        "x": 989.9270515441895,
+        "y": 431.37668323516846,
+        "z": "192759e2.8ca676",
         "wires": [
             [
-                "a3935f63.e64dc"
+                "3a45df3c.4f62e"
             ]
         ]
     },
     {
-        "id": "a3935f63.e64dc",
+        "id": "3a45df3c.4f62e",
         "type": "set",
         "name": "set providerIpAddress",
         "xml": "<set>\n<parameter name='prop.wan.providerIpAddress' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />",
         "comments": "",
-        "x": 1142.2397994995117,
-        "y": 426.84827709198,
-        "z": "83799888.3d8488",
+        "x": 1156.2606353759766,
+        "y": 431.83786487579346,
+        "z": "192759e2.8ca676",
         "wires": []
     },
     {
-        "id": "383fea5a.143066",
+        "id": "6d16b1ef.6edda",
         "type": "switchNode",
         "name": "switch inputBandwidth",
         "xml": "<switch test=\"`$vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'inputBandwidth'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 790.9057731628418,
-        "y": 538.3869562149048,
-        "z": "83799888.3d8488",
+        "x": 804.9266090393066,
+        "y": 543.3765439987183,
+        "z": "192759e2.8ca676",
         "wires": [
             [
-                "45b075bc.f36a3c"
+                "299964fe.6aa9cc"
             ]
         ]
     },
     {
-        "id": "45b075bc.f36a3c",
+        "id": "299964fe.6aa9cc",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 967.9059715270996,
-        "y": 537.3870210647583,
-        "z": "83799888.3d8488",
+        "x": 981.9268074035645,
+        "y": 542.3766088485718,
+        "z": "192759e2.8ca676",
         "wires": [
             [
-                "7f4d1606.062148"
+                "a43497c1.d28c98"
             ]
         ]
     },
     {
-        "id": "7f4d1606.062148",
+        "id": "a43497c1.d28c98",
         "type": "set",
         "name": "set inputBandwidth",
         "xml": "<set>\n<parameter name='prop.wan.inputBandwidth' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />",
         "comments": "",
-        "x": 1175.2397212982178,
-        "y": 531.8481855392456,
-        "z": "83799888.3d8488",
+        "x": 1189.2605571746826,
+        "y": 536.8377733230591,
+        "z": "192759e2.8ca676",
         "wires": []
     },
     {
-        "id": "18a75045.9bb5e",
+        "id": "f44a56f3.db7c08",
         "type": "switchNode",
         "name": "switch outputBandwidth",
         "xml": "<switch test=\"`$vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'outputBandwidth'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 796.9057731628418,
-        "y": 577.3869562149048,
-        "z": "83799888.3d8488",
+        "x": 810.9266090393066,
+        "y": 582.3765439987183,
+        "z": "192759e2.8ca676",
         "wires": [
             [
-                "2be3aa98.e7daa6"
+                "6b63ec76.cea694"
             ]
         ]
     },
     {
-        "id": "2be3aa98.e7daa6",
+        "id": "6b63ec76.cea694",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 980.905969619751,
-        "y": 577.3870649337769,
-        "z": "83799888.3d8488",
+        "x": 994.9268054962158,
+        "y": 582.3766527175903,
+        "z": "192759e2.8ca676",
         "wires": [
             [
-                "7e2e3a9b.578594"
+                "9c582c07.4759e"
             ]
         ]
     },
     {
-        "id": "7e2e3a9b.578594",
+        "id": "9c582c07.4759e",
         "type": "set",
         "name": "set outputBandwidth",
         "xml": "<set>\n<parameter name='prop.wan.outputBandwidth' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />",
         "comments": "",
-        "x": 1177.2397441864014,
-        "y": 570.8481683731079,
-        "z": "83799888.3d8488",
+        "x": 1191.2605800628662,
+        "y": 575.8377561569214,
+        "z": "192759e2.8ca676",
         "wires": []
     },
     {
-        "id": "91d20588.adacd8",
+        "id": "b5fed085.d4d7c",
         "type": "switchNode",
         "name": "switch description",
         "xml": "<switch test=\"`$vf-module-request-input.vf-module-input-parameters.param[$idx].name  == 'description'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 786.9057273864746,
-        "y": 198.387113571167,
-        "z": "83799888.3d8488",
+        "x": 800.9265632629395,
+        "y": 203.37670135498047,
+        "z": "192759e2.8ca676",
         "wires": [
             [
-                "8acddcca.d85a2"
+                "92449f78.32a97"
             ]
         ]
     },
     {
-        "id": "8acddcca.d85a2",
+        "id": "92449f78.32a97",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 978.9059715270996,
-        "y": 199.3871431350708,
-        "z": "83799888.3d8488",
+        "x": 992.9268074035645,
+        "y": 204.37673091888428,
+        "z": "192759e2.8ca676",
         "wires": [
             [
-                "f82affc6.722b5"
+                "8982915c.e8181"
             ]
         ]
     },
     {
-        "id": "f82affc6.722b5",
+        "id": "8982915c.e8181",
         "type": "set",
         "name": "set description",
         "xml": "<set>\n<parameter name='prop.wan.description' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />\n",
         "comments": "",
-        "x": 1129.239974975586,
-        "y": 198.84835243225098,
-        "z": "83799888.3d8488",
+        "x": 1143.2608108520508,
+        "y": 203.83794021606445,
+        "z": "192759e2.8ca676",
         "wires": []
     },
     {
-        "id": "a41eaf2.439f75",
+        "id": "8f7cd129.e628b",
         "type": "switchNode",
         "name": "switch portNumber",
         "xml": "<switch test=\"`$vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'portNumber'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 779.2389717102051,
-        "y": 351.0047388076782,
-        "z": "83799888.3d8488",
+        "x": 793.2598075866699,
+        "y": 355.9943265914917,
+        "z": "192759e2.8ca676",
         "wires": [
             [
-                "9190cac8.65bcb8"
+                "75d70ce6.dcc884"
             ]
         ]
     },
     {
-        "id": "9190cac8.65bcb8",
+        "id": "75d70ce6.dcc884",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 970.239143371582,
-        "y": 354.00476837158203,
-        "z": "83799888.3d8488",
+        "x": 984.2599792480469,
+        "y": 358.9943561553955,
+        "z": "192759e2.8ca676",
         "wires": [
             [
-                "bc0c9c4f.ffd6c"
+                "15c7df8.ee5e621"
             ]
         ]
     },
     {
-        "id": "bc0c9c4f.ffd6c",
+        "id": "15c7df8.ee5e621",
         "type": "set",
         "name": "set portNumber",
         "xml": "<set>\n<parameter name='prop.wan.portNumber' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />\n",
         "comments": "",
-        "x": 1124.2394714355469,
-        "y": 353.6047830581665,
-        "z": "83799888.3d8488",
+        "x": 1138.2603073120117,
+        "y": 358.59437084198,
+        "z": "192759e2.8ca676",
         "wires": []
     },
     {
-        "id": "49351eca.09882",
+        "id": "d7c2c346.bb4d6",
         "type": "switchNode",
         "name": "switch portType",
         "xml": "<switch test=\"`$vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'portType'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 780.134090423584,
-        "y": 270.97804832458496,
-        "z": "83799888.3d8488",
+        "x": 794.1549263000488,
+        "y": 275.96763610839844,
+        "z": "192759e2.8ca676",
         "wires": [
             [
-                "9c7436d2.ff2978"
+                "ca83aa38.707c38"
             ]
         ]
     },
     {
-        "id": "9c7436d2.ff2978",
+        "id": "ca83aa38.707c38",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 975.1341781616211,
-        "y": 270.97807788848877,
-        "z": "83799888.3d8488",
+        "x": 989.1550140380859,
+        "y": 275.96766567230225,
+        "z": "192759e2.8ca676",
         "wires": [
             [
-                "45817322.3ae1fc"
+                "2f419e64.d2b172"
             ]
         ]
     },
     {
-        "id": "45817322.3ae1fc",
+        "id": "2f419e64.d2b172",
         "type": "set",
         "name": "set portType",
         "xml": "<set>\n<parameter name='prop.wan.portType' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />\n",
         "comments": "",
-        "x": 1122.134506225586,
-        "y": 271.57809257507324,
-        "z": "83799888.3d8488",
+        "x": 1136.1553421020508,
+        "y": 276.5676803588867,
+        "z": "192759e2.8ca676",
         "wires": []
     },
     {
-        "id": "c9e43e20.584a3",
+        "id": "bc53deb3.66dc2",
         "type": "set",
         "name": "set transportnetworkName",
         "xml": "<set>\n<parameter name='prop.wan.transportNetworkName' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />",
         "comments": "",
-        "x": 1224.0102291107178,
-        "y": 496.39741706848145,
-        "z": "83799888.3d8488",
+        "x": 1238.0310649871826,
+        "y": 501.3870048522949,
+        "z": "192759e2.8ca676",
         "wires": []
     },
     {
-        "id": "878c2a18.4ab5f8",
+        "id": "2040cf67.854b5",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 1012.6763229370117,
-        "y": 497.93633460998535,
-        "z": "83799888.3d8488",
+        "x": 1026.6971588134766,
+        "y": 502.9259223937988,
+        "z": "192759e2.8ca676",
         "wires": [
             [
-                "c9e43e20.584a3"
+                "bc53deb3.66dc2"
             ]
         ]
     },
     {
-        "id": "286e48cc.e48988",
+        "id": "e772d25.ba6eb3",
         "type": "switchNode",
         "name": "switch transportnetworkName",
         "xml": "<switch test=\"`$vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'transportNetworkName'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 813.6761474609375,
-        "y": 501.9360647201538,
-        "z": "83799888.3d8488",
+        "x": 827.6969833374023,
+        "y": 506.9256525039673,
+        "z": "192759e2.8ca676",
         "wires": [
             [
-                "878c2a18.4ab5f8"
+                "2040cf67.854b5"
             ]
         ]
     },
     {
-        "id": "d4feaef6.6438f",
+        "id": "638cf29c.12828c",
         "type": "switchNode",
         "name": "switch id",
         "xml": "<switch test=\"`$vf-module-request-input.vf-module-input-parameters.param[$idx].name  == 'id'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 772.0097541809082,
-        "y": 132.39711570739746,
-        "z": "83799888.3d8488",
+        "x": 786.030590057373,
+        "y": 137.38670349121094,
+        "z": "192759e2.8ca676",
         "wires": [
             [
-                "c4e97c71.2edee"
+                "24f19492.f009fc"
             ]
         ]
     },
     {
-        "id": "c4e97c71.2edee",
+        "id": "24f19492.f009fc",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 973.009895324707,
-        "y": 130.3971462249756,
-        "z": "83799888.3d8488",
+        "x": 987.0307312011719,
+        "y": 135.38673400878906,
+        "z": "192759e2.8ca676",
         "wires": [
             [
-                "fa0065d4.357e68"
+                "a4b229b.62831d8"
             ]
         ]
     },
     {
-        "id": "fa0065d4.357e68",
+        "id": "a4b229b.62831d8",
         "type": "set",
         "name": "set id",
         "xml": "<set>\n<parameter name='prop.wan.id' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />\n",
         "comments": "",
-        "x": 1115.0102424621582,
-        "y": 125.99725341796875,
-        "z": "83799888.3d8488",
+        "x": 1129.031078338623,
+        "y": 130.98684120178223,
+        "z": "192759e2.8ca676",
         "wires": []
     },
     {
-        "id": "60fcaabc.ca5bf4",
+        "id": "2d9d0a07.21b996",
         "type": "switchNode",
         "name": "switch devicePortId",
         "xml": "<switch test=\"`$vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'devicePortId'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 782.0104598999023,
-        "y": 622.010443687439,
-        "z": "83799888.3d8488",
+        "x": 796.0312957763672,
+        "y": 627.0000314712524,
+        "z": "192759e2.8ca676",
         "wires": [
             [
-                "642147fe.576a98"
+                "88000960.246438"
             ]
         ]
     },
     {
-        "id": "642147fe.576a98",
+        "id": "88000960.246438",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 981.0106258392334,
-        "y": 616.0105199813843,
-        "z": "83799888.3d8488",
+        "x": 995.0314617156982,
+        "y": 621.0001077651978,
+        "z": "192759e2.8ca676",
         "wires": [
             [
-                "fd4863f3.2dd12"
+                "fabf24be.4a2ae8"
             ]
         ]
     },
     {
-        "id": "fd4863f3.2dd12",
+        "id": "fabf24be.4a2ae8",
         "type": "set",
         "name": "set devicePortId",
         "xml": "<set>\n<parameter name='prop.wan.devicePortId' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />",
         "comments": "",
-        "x": 1180.3443698883057,
-        "y": 615.4716176986694,
-        "z": "83799888.3d8488",
+        "x": 1194.3652057647705,
+        "y": 620.4612054824829,
+        "z": "192759e2.8ca676",
         "wires": []
     },
     {
-        "id": "d17b4c90.52ccd",
+        "id": "f4e0170c.c926f8",
         "type": "switchNode",
         "name": "switch wanPortId",
         "xml": "<switch test=\"`$vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'wanPortId'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 772.0104598999023,
-        "y": 658.0104455947876,
-        "z": "83799888.3d8488",
+        "x": 786.0312957763672,
+        "y": 663.0000333786011,
+        "z": "192759e2.8ca676",
         "wires": [
             [
-                "f3f82bbf.a22db8"
+                "6611a8d1.372738"
             ]
         ]
     },
     {
-        "id": "f3f82bbf.a22db8",
+        "id": "6611a8d1.372738",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 983.0106239318848,
-        "y": 651.0105228424072,
-        "z": "83799888.3d8488",
+        "x": 997.0314598083496,
+        "y": 656.0001106262207,
+        "z": "192759e2.8ca676",
         "wires": [
             [
-                "9cec917d.42e1c"
+                "148c330d.e6ff2d"
             ]
         ]
     },
     {
-        "id": "9cec917d.42e1c",
+        "id": "148c330d.e6ff2d",
         "type": "set",
         "name": "set wanPortId",
         "xml": "<set>\n<parameter name='prop.wan.wanPortId' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />",
         "comments": "",
-        "x": 1180.3443698883057,
-        "y": 655.4716176986694,
-        "z": "83799888.3d8488",
+        "x": 1194.3652057647705,
+        "y": 660.4612054824829,
+        "z": "192759e2.8ca676",
         "wires": []
     },
     {
-        "id": "e6f5b113.db834",
+        "id": "1bb7d8d3.393ca7",
         "type": "set",
         "name": "set apn",
         "xml": "<set>\n<parameter name='prop.wan.apn-name' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />\n",
         "comments": "",
-        "x": 1121.0000076293945,
-        "y": 310.01041412353516,
-        "z": "83799888.3d8488",
+        "x": 1135.0208435058594,
+        "y": 315.00000190734863,
+        "z": "192759e2.8ca676",
         "wires": []
     },
     {
-        "id": "2a13a6a0.eb644a",
+        "id": "ec6279c6.c6c888",
         "type": "switchNode",
         "name": "switch apn",
         "xml": "<switch test=\"`$vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'apn'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 770.0000076293945,
-        "y": 309.01041412353516,
-        "z": "83799888.3d8488",
+        "x": 784.0208435058594,
+        "y": 314.00000190734863,
+        "z": "192759e2.8ca676",
         "wires": [
             [
-                "cd547003.96af2"
+                "48104b80.431324"
             ]
         ]
     },
     {
-        "id": "cd547003.96af2",
+        "id": "48104b80.431324",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 965.0000953674316,
-        "y": 309.01044368743896,
-        "z": "83799888.3d8488",
+        "x": 979.0209312438965,
+        "y": 314.00003147125244,
+        "z": "192759e2.8ca676",
         "wires": [
             [
-                "e6f5b113.db834"
+                "1bb7d8d3.393ca7"
             ]
         ]
     },
     {
-        "id": "19ce9dfd.f8a2f2",
+        "id": "7c9c948.6f89d6c",
         "type": "switchNode",
         "name": "switch publicIP",
         "xml": "<switch test=\"`$vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'publicIP'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 768.0000305175781,
-        "y": 701.0104351043701,
-        "z": "83799888.3d8488",
+        "x": 782.020866394043,
+        "y": 706.0000228881836,
+        "z": "192759e2.8ca676",
         "wires": [
             [
-                "fadc805c.91335"
+                "bd2c91e6.2d3bd"
             ]
         ]
     },
     {
-        "id": "fadc805c.91335",
+        "id": "bd2c91e6.2d3bd",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 977.0002021789551,
-        "y": 696.010516166687,
-        "z": "83799888.3d8488",
+        "x": 991.0210380554199,
+        "y": 701.0001039505005,
+        "z": "192759e2.8ca676",
         "wires": [
             [
-                "bda8c6bd.b7ac88"
+                "432b35f4.5934dc"
             ]
         ]
     },
     {
-        "id": "bda8c6bd.b7ac88",
+        "id": "432b35f4.5934dc",
         "type": "set",
         "name": "set publicIP",
         "xml": "<set>\n<parameter name='prop.wan.publicIP' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />",
         "comments": "",
-        "x": 1182.3338661193848,
-        "y": 694.4716167449951,
-        "z": "83799888.3d8488",
+        "x": 1196.3547019958496,
+        "y": 699.4612045288086,
+        "z": "192759e2.8ca676",
         "wires": []
     },
     {
-        "id": "a399cdca.37b7a",
+        "id": "97c178d3.f58628",
         "type": "switchNode",
         "name": "switch IPMode",
         "xml": "<switch test=\"`$vf-module-request-input.vf-module-input-parameters.param[$idx].name == 'IPMode'`\">\n",
         "comments": "",
         "outputs": 1,
-        "x": 778.0000305175781,
-        "y": 742.0104360580444,
-        "z": "83799888.3d8488",
+        "x": 792.020866394043,
+        "y": 747.0000238418579,
+        "z": "192759e2.8ca676",
         "wires": [
             [
-                "728b6eda.0249c"
+                "12f9c78d.14c828"
             ]
         ]
     },
     {
-        "id": "728b6eda.0249c",
+        "id": "12f9c78d.14c828",
         "type": "outcomeTrue",
         "name": "true",
         "xml": "<outcome value='true'>\n",
         "comments": "",
         "outputs": 1,
-        "x": 977.0002822875977,
-        "y": 741.0105991363525,
-        "z": "83799888.3d8488",
+        "x": 991.0211181640625,
+        "y": 746.000186920166,
+        "z": "192759e2.8ca676",
         "wires": [
             [
-                "43404525.61dcfc"
+                "6609b7c6.fc8a48"
             ]
         ]
     },
     {
-        "id": "43404525.61dcfc",
+        "id": "6609b7c6.fc8a48",
         "type": "set",
         "name": "set IPMode",
         "xml": "<set>\n<parameter name='prop.wan.IPMode' value='`$vf-module-request-input.vf-module-input-parameters.param[$idx].value`' />",
         "comments": "",
-        "x": 1188.3339176177979,
-        "y": 739.471586227417,
-        "z": "83799888.3d8488",
+        "x": 1202.3547534942627,
+        "y": 744.4611740112305,
+        "z": "192759e2.8ca676",
         "wires": []
     }
 ]
\ No newline at end of file
diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-vf-module-input.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-vf-module-input.xml
old mode 100755
new mode 100644
index 82bf08ed..f21ff996
--- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-vf-module-input.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-vf-module-input.xml
@@ -48,15 +48,6 @@
                     </return>
                 </outcome>
             </switch>
-            <switch test='`$vf-module-topology-operation-input.vf-module-information.vf-module-id`'>
-                <outcome value=''>
-                    <return status='failure'>
-                        <parameter name='ack-final' value='Y'/>
-                        <parameter name="error-code" value="500" />
-                        <parameter name="error-message" value="vf-module-information.vf-module-id is a required input" />
-                    </return>
-                </outcome>
-            </switch>
             <switch test='`$vf-module-topology-operation-input.sdnc-request-header.svc-action`'>
                 <outcome value='assign'>
                     <block atomic="true">
diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-get-wan-param.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-get-wan-param.xml
index e42b3bda..30d7116b 100644
--- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-get-wan-param.xml
+++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-get-wan-param.xml
@@ -3,7 +3,7 @@
     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}'>
     <method rpc='sdwan-get-wan-param' mode='sync'>
         <block atomic="true">
-            <for index="idx" start="0" end="`$vf-module-topology-operation-input.vf-module-request-input.vf-module-input-parameters.param_length`">
+            <for index="idx" start="0" end="`$vf-module-request-input.vf-module-input-parameters.param_length`">
                 <block>
                     <switch test="`$vf-module-request-input.vf-module-input-parameters.param[$idx].name  == 'id'`">
                         <outcome value='true'>