aboutsummaryrefslogtreecommitdiffstats
path: root/platform-logic/generic-resource-api/src/main
diff options
context:
space:
mode:
authorshashikanth.vh <shashikanth.vh@huawei.com>2019-04-17 16:13:21 +0530
committershashikanth.vh <shashikanth.vh@huawei.com>2019-04-17 16:13:29 +0530
commitd8f615d61224c4d76646f7e1be01746a462b902b (patch)
tree7bc07f98edb5dd7fd80f124d57e887cdbb5c4445 /platform-logic/generic-resource-api/src/main
parent3bf2950cb32ae29638c196aa82459ac29590d88e (diff)
vf module id validation removed from DG
GRA provider code is modified to return vf module id if present in the input request otherwise vf module id (Generated in DG)will be returned from the response object. In validate-vf-module-input DG vf-id validation check is deleted. Change-Id: I389d2d42a939c60481cd7690ccb98b3f820974e4 Issue-ID: SDNC-653 Signed-off-by: shashikanth.vh <shashikanth.vh@huawei.com> Former-commit-id: 5560feac3ab5cb6a0c749648878be3bf273fdfcf
Diffstat (limited to 'platform-logic/generic-resource-api/src/main')
-rw-r--r--platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-vf-module-input.json558
-rw-r--r--[-rwxr-xr-x]platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-vf-module-input.xml9
2 files changed, 557 insertions, 10 deletions
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/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
index 82bf08ed..f21ff996 100755..100644
--- 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">