From 7f70731621bcd7cdb4f4157eba0d66b3638f1519 Mon Sep 17 00:00:00 2001 From: "Cheung, Pat" Date: Thu, 4 Oct 2018 18:35:55 +0000 Subject: self-serve dg patch inclues new self-serve forking logic, added silentFailure to for loops, not to set cap name to INPUT for generate-name Change-Id: Idd3deb016533dc70611d60dd289f4c4bc40d3136 Issue-ID: CCSDK-604 Signed-off-by: Cheung, Pat Former-commit-id: 7209c246e382048781f166c2b3eeab24be7e9815 --- .../GENERIC-RESOURCE-API_validate-vnf-input.json | 540 +-------------------- 1 file changed, 1 insertion(+), 539 deletions(-) (limited to 'platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-vnf-input.json') diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-vnf-input.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-vnf-input.json index f1dbe061..86c905b6 100644 --- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-vnf-input.json +++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-vnf-input.json @@ -1,539 +1 @@ -[ - { - "id": "4d9dbde4.447a44", - "type": "block", - "name": "block : atomic", - "xml": "", - "atomic": "true", - "outputs": 1, - "x": 201, - "y": 454.50000422341486, - "z": "3f03c20b.438afe", - "wires": [ - [ - "3551e870.dc3378", - "d59a7a0.dd15288", - "412f00f8.42659", - "ad77ccd2.f78fd", - "1d62a81d.049808" - ] - ] - }, - { - "id": "3551e870.dc3378", - "type": "switchNode", - "name": "switch svc-request-id", - "xml": "\n", - "comments": "", - "outputs": 1, - "x": 483.7619094848633, - "y": 337.58034229278564, - "z": "3f03c20b.438afe", - "wires": [ - [ - "3219fe8b.8416b2" - ] - ] - }, - { - "id": "3219fe8b.8416b2", - "type": "outcome", - "name": "NULL", - "xml": "", - "comments": "", - "outputs": 1, - "x": 709.476203918457, - "y": 337.5803461074829, - "z": "3f03c20b.438afe", - "wires": [ - [ - "c609015.faf" - ] - ] - }, - { - "id": "c609015.faf", - "type": "returnFailure", - "name": "return failure", - "xml": "\n\t\n\t\n \n", - "comments": "", - "x": 860.9047698974609, - "y": 337.5803442001343, - "z": "3f03c20b.438afe", - "wires": [ - - ] - }, - { - "id": "d59a7a0.dd15288", - "type": "switchNode", - "name": "switch svc-action", - "xml": "\n", - "comments": "", - "outputs": 1, - "x": 472.3332726614817, - "y": 296.1517738614764, - "z": "3f03c20b.438afe", - "wires": [ - [ - "fd07c834.04e118" - ] - ] - }, - { - "id": "fd07c834.04e118", - "type": "outcome", - "name": "NULL", - "xml": "", - "comments": "", - "outputs": 1, - "x": 708.0476243155344, - "y": 294.72317164284846, - "z": "3f03c20b.438afe", - "wires": [ - [ - "bb67988a.7a4878" - ] - ] - }, - { - "id": "bb67988a.7a4878", - "type": "returnFailure", - "name": "return failure", - "xml": "\n\t\n\t\n \n", - "comments": "", - "x": 858.0475976126536, - "y": 294.7231811795916, - "z": "3f03c20b.438afe", - "wires": [ - - ] - }, - { - "id": "412f00f8.42659", - "type": "switchNode", - "name": "switch request-action", - "xml": "\n", - "comments": "", - "outputs": 1, - "x": 482.33332606724343, - "y": 380.4374889646258, - "z": "3f03c20b.438afe", - "wires": [ - [ - "57d0c765.6697d8" - ] - ] - }, - { - "id": "57d0c765.6697d8", - "type": "outcome", - "name": "NULL", - "xml": "", - "comments": "", - "outputs": 1, - "x": 709.4761995588033, - "y": 380.4374998637609, - "z": "3f03c20b.438afe", - "wires": [ - [ - "17e90205.19889e" - ] - ] - }, - { - "id": "17e90205.19889e", - "type": "returnFailure", - "name": "return failure", - "xml": "\n\t\n\t\n \n", - "comments": "", - "x": 860.9047655378072, - "y": 380.43749795641224, - "z": "3f03c20b.438afe", - "wires": [ - - ] - }, - { - "id": "e4e9da07.86ee68", - "type": "switchNode", - "name": "switch model-customization-id", - "xml": "\n", - "comments": "", - "outputs": 1, - "x": 1071.7978477478027, - "y": 482.8662624359131, - "z": "3f03c20b.438afe", - "wires": [ - [ - "358dc8c9.934178" - ] - ] - }, - { - "id": "358dc8c9.934178", - "type": "outcome", - "name": "NULL", - "xml": "", - "comments": "", - "outputs": 1, - "x": 1276.7978477478027, - "y": 482.8662452697754, - "z": "3f03c20b.438afe", - "wires": [ - [ - "37f4df0b.c43d6" - ] - ] - }, - { - "id": "37f4df0b.c43d6", - "type": "returnFailure", - "name": "return failure", - "xml": "\n\t\n\t\n \n", - "comments": "", - "x": 1428.2264137268066, - "y": 482.86624336242676, - "z": "3f03c20b.438afe", - "wires": [ - - ] - }, - { - "id": "4c722c64.354684", - "type": "switchNode", - "name": "switch tenant", - "xml": "\n", - "comments": "", - "outputs": 1, - "x": 1017.6549263000488, - "y": 524.2947731018066, - "z": "3f03c20b.438afe", - "wires": [ - [ - "d918b63c.d3c5b8" - ] - ] - }, - { - "id": "d918b63c.d3c5b8", - "type": "outcome", - "name": "NULL", - "xml": "", - "comments": "", - "outputs": 1, - "x": 1275.3692436218262, - "y": 524.294807434082, - "z": "3f03c20b.438afe", - "wires": [ - [ - "de9de378.d9dcb" - ] - ] - }, - { - "id": "de9de378.d9dcb", - "type": "returnFailure", - "name": "return failure", - "xml": "\n\t\n\t\n \n", - "comments": "", - "x": 1426.79780960083, - "y": 524.2948055267334, - "z": "3f03c20b.438afe", - "wires": [ - - ] - }, - { - "id": "113afb8b.5ba534", - "type": "comment", - "name": "Validation of required fields", - "info": "", - "comments": "", - "x": 632.3332824707031, - "y": 251.86605644226074, - "z": "3f03c20b.438afe", - "wires": [ - - ] - }, - { - "id": "ad77ccd2.f78fd", - "type": "switchNode", - "name": "switch svc-action", - "xml": "\n", - "comments": "", - "outputs": 1, - "x": 472.57139587402344, - "y": 571.7947673797607, - "z": "3f03c20b.438afe", - "wires": [ - [ - "831a3f94.d6468", - "5be38d11.63b4f4" - ] - ] - }, - { - "id": "831a3f94.d6468", - "type": "outcome", - "name": "assign", - "xml": "\n", - "comments": "", - "outputs": 1, - "x": 643.4047393798828, - "y": 525.1280879974365, - "z": "3f03c20b.438afe", - "wires": [ - [ - "dd8a1fea.b5bd6" - ] - ] - }, - { - "id": "dd8a1fea.b5bd6", - "type": "block", - "name": "block : atomic", - "xml": "", - "atomic": "true", - "outputs": 1, - "x": 840.0713500976562, - "y": 525.1280879974365, - "z": "3f03c20b.438afe", - "wires": [ - [ - "e4e9da07.86ee68", - "4c722c64.354684", - "3a3018b1.645408" - ] - ] - }, - { - "id": "3ccd71b7.e4583e", - "type": "dgstart", - "name": "DGSTART", - "outputs": 1, - "x": 144.7500098092214, - "y": 124.41365623474121, - "z": "3f03c20b.438afe", - "wires": [ - [ - "871c79a8.0f3e48" - ] - ] - }, - { - "id": "871c79a8.0f3e48", - "type": "service-logic", - "name": "GENERIC-RESOURCE-API ${project.version}", - "module": "GENERIC-RESOURCE-API", - "version": "${project.version}", - "comments": "", - "xml": "", - "outputs": 1, - "x": 258.03571537562766, - "y": 164.6517677307129, - "z": "3f03c20b.438afe", - "wires": [ - [ - "4b0e51f7.20b38" - ] - ] - }, - { - "id": "4b0e51f7.20b38", - "type": "method", - "name": "method validate-vnf-input", - "xml": "\n", - "comments": "", - "outputs": 1, - "x": 193.42863682338157, - "y": 205.66365242004395, - "z": "3f03c20b.438afe", - "wires": [ - [ - "4d9dbde4.447a44" - ] - ] - }, - { - "id": "79e58f6f.3ef1e", - "type": "comment", - "name": "validate-vnf-input", - "info": "", - "comments": "", - "x": 539.0948660714284, - "y": 72, - "z": "3f03c20b.438afe", - "wires": [ - - ] - }, - { - "id": "1d62a81d.049808", - "type": "switchNode", - "name": "switch service-instance-id", - "xml": "\n", - "comments": "", - "outputs": 1, - "x": 495.3571570260183, - "y": 424.50001525878906, - "z": "3f03c20b.438afe", - "wires": [ - [ - "6a29ec68.3b9074" - ] - ] - }, - { - "id": "6a29ec68.3b9074", - "type": "outcome", - "name": "NULL", - "xml": "", - "comments": "", - "outputs": 1, - "x": 707.7857382638113, - "y": 424.5000114440918, - "z": "3f03c20b.438afe", - "wires": [ - [ - "8d2c582.ae31aa8" - ] - ] - }, - { - "id": "8d2c582.ae31aa8", - "type": "returnFailure", - "name": "return failure", - "xml": "\n\t\n\t\n \n", - "comments": "", - "x": 859.2143042428152, - "y": 424.50000953674316, - "z": "3f03c20b.438afe", - "wires": [ - - ] - }, - { - "id": "3a3018b1.645408", - "type": "switchNode", - "name": "switch aic-cloud-region", - "xml": "\n", - "comments": "", - "outputs": 1, - "x": 1047.0000076293945, - "y": 566.5714302062988, - "z": "3f03c20b.438afe", - "wires": [ - [ - "6edfb4d4.a66b5c" - ] - ] - }, - { - "id": "6edfb4d4.a66b5c", - "type": "outcome", - "name": "NULL", - "xml": "", - "comments": "", - "outputs": 1, - "x": 1273.7143249511719, - "y": 566.5714645385742, - "z": "3f03c20b.438afe", - "wires": [ - [ - "e6cdd965.41bc18" - ] - ] - }, - { - "id": "e6cdd965.41bc18", - "type": "returnFailure", - "name": "return failure", - "xml": "\n\t\n\t\n \n", - "comments": "", - "x": 1425.1428909301758, - "y": 566.5714626312256, - "z": "3f03c20b.438afe", - "wires": [ - - ] - }, - { - "id": "87424be6.6788e8", - "type": "switchNode", - "name": "switch model-customization-id", - "xml": "\n", - "comments": "", - "outputs": 1, - "x": 1071.4761352539062, - "y": 612.7618942260742, - "z": "3f03c20b.438afe", - "wires": [ - [ - "8d44461a.f88fd8" - ] - ] - }, - { - "id": "8d44461a.f88fd8", - "type": "outcome", - "name": "NULL", - "xml": "", - "comments": "", - "outputs": 1, - "x": 1276.4761352539062, - "y": 612.7618770599365, - "z": "3f03c20b.438afe", - "wires": [ - [ - "50f4ef71.66b2d" - ] - ] - }, - { - "id": "50f4ef71.66b2d", - "type": "returnFailure", - "name": "return failure", - "xml": "\n\t\n\t\n \n", - "comments": "", - "x": 1427.9047012329102, - "y": 612.7618751525879, - "z": "3f03c20b.438afe", - "wires": [ - - ] - }, - { - "id": "5be38d11.63b4f4", - "type": "outcome", - "name": "changeassign", - "xml": "\n", - "comments": "", - "outputs": 1, - "x": 661.4163551330566, - "y": 612.6904535293579, - "z": "3f03c20b.438afe", - "wires": [ - [ - "a7282aba.0b4bc8" - ] - ] - }, - { - "id": "a7282aba.0b4bc8", - "type": "block", - "name": "block : atomic", - "xml": "", - "atomic": "true", - "outputs": 1, - "x": 841.4163436889648, - "y": 612.6904201507568, - "z": "3f03c20b.438afe", - "wires": [ - [ - "87424be6.6788e8" - ] - ] - } -] +[{"id":"582b5aa0.7eeaf4","type":"block","name":"block : atomic","xml":"","atomic":"true","outputs":1,"x":260,"y":410.2500066757202,"z":"348b9f74.369c5","wires":[["bd96033d.8336e","7fd8cb2f.5fa374","38370c7c.c4f0d4","d5c4e5aa.7d5948","1bbaae3f.e0d542","aa17e02a.1771"]]},{"id":"bd96033d.8336e","type":"switchNode","name":"switch svc-request-id","xml":"\n","comments":"","outputs":1,"x":517.7619094848633,"y":368.08034229278564,"z":"348b9f74.369c5","wires":[["2f85d56c.ed707a"]]},{"id":"2f85d56c.ed707a","type":"outcome","name":"NULL","xml":"","comments":"","outputs":1,"x":743.476203918457,"y":368.0803461074829,"z":"348b9f74.369c5","wires":[["372f23ad.72c64c"]]},{"id":"372f23ad.72c64c","type":"returnFailure","name":"return failure","xml":"\n\t\n\t\n \n","comments":"","x":894.9047698974609,"y":368.0803442001343,"z":"348b9f74.369c5","wires":[]},{"id":"7fd8cb2f.5fa374","type":"switchNode","name":"switch svc-action","xml":"\n","comments":"","outputs":1,"x":506.3332726614817,"y":326.6517738614764,"z":"348b9f74.369c5","wires":[["bd1aeb1f.a739c8"]]},{"id":"bd1aeb1f.a739c8","type":"outcome","name":"NULL","xml":"","comments":"","outputs":1,"x":742.0476243155344,"y":325.22317164284846,"z":"348b9f74.369c5","wires":[["afc00ae4.9d9d18"]]},{"id":"afc00ae4.9d9d18","type":"returnFailure","name":"return failure","xml":"\n\t\n\t\n \n","comments":"","x":892.0475976126536,"y":325.2231811795916,"z":"348b9f74.369c5","wires":[]},{"id":"38370c7c.c4f0d4","type":"switchNode","name":"switch request-action","xml":"\n","comments":"","outputs":1,"x":516.3333260672434,"y":410.9374889646258,"z":"348b9f74.369c5","wires":[["be233ca5.19ebe"]]},{"id":"be233ca5.19ebe","type":"outcome","name":"NULL","xml":"","comments":"","outputs":1,"x":743.4761995588033,"y":410.9374998637609,"z":"348b9f74.369c5","wires":[["32cbb07.e56b45"]]},{"id":"32cbb07.e56b45","type":"returnFailure","name":"return failure","xml":"\n\t\n\t\n \n","comments":"","x":894.9047655378072,"y":410.93749795641224,"z":"348b9f74.369c5","wires":[]},{"id":"68df33c4.fea8fc","type":"switchNode","name":"switch model-customization-id","xml":"\n","comments":"","outputs":1,"x":1134.7978477478027,"y":558.3662624359131,"z":"348b9f74.369c5","wires":[["10cb7b10.f12585"]]},{"id":"10cb7b10.f12585","type":"outcome","name":"NULL","xml":"","comments":"","outputs":1,"x":1339.7978477478027,"y":558.3662452697754,"z":"348b9f74.369c5","wires":[["f4a32f1c.bd90b"]]},{"id":"f4a32f1c.bd90b","type":"returnFailure","name":"return failure","xml":"\n\t\n\t\n \n","comments":"","x":1491.2264137268066,"y":558.3662433624268,"z":"348b9f74.369c5","wires":[]},{"id":"fe896fef.dd825","type":"switchNode","name":"switch tenant","xml":"\n","comments":"","outputs":1,"x":1080.6549263000488,"y":599.7947731018066,"z":"348b9f74.369c5","wires":[["74a78b37.2da984"]]},{"id":"74a78b37.2da984","type":"outcome","name":"NULL","xml":"","comments":"","outputs":1,"x":1338.3692436218262,"y":599.794807434082,"z":"348b9f74.369c5","wires":[["dd5d5cef.7e70f"]]},{"id":"dd5d5cef.7e70f","type":"returnFailure","name":"return failure","xml":"\n\t\n\t\n \n","comments":"","x":1489.79780960083,"y":599.7948055267334,"z":"348b9f74.369c5","wires":[]},{"id":"dbb5229b.87433","type":"comment","name":"Validation of required fields","info":"","comments":"","x":666.3332824707031,"y":282.36605644226074,"z":"348b9f74.369c5","wires":[]},{"id":"d5c4e5aa.7d5948","type":"switchNode","name":"switch svc-action","xml":"\n","comments":"","outputs":1,"x":500.32141876220703,"y":600.0447483062744,"z":"348b9f74.369c5","wires":[["24b1818b.56cbbe"]]},{"id":"24b1818b.56cbbe","type":"outcome","name":"assign","xml":"\n","comments":"","outputs":1,"x":677.4047393798828,"y":599.6280879974365,"z":"348b9f74.369c5","wires":[["a750cf34.02893"]]},{"id":"a750cf34.02893","type":"block","name":"block : atomic","xml":"","atomic":"true","outputs":1,"x":874.0713500976562,"y":599.6280879974365,"z":"348b9f74.369c5","wires":[["68df33c4.fea8fc","fe896fef.dd825","26f7b426.cb378c"]]},{"id":"980060b2.05cd2","type":"dgstart","name":"DGSTART","outputs":1,"x":178.7500098092214,"y":154.9136562347412,"z":"348b9f74.369c5","wires":[["16c74c85.6dd223"]]},{"id":"16c74c85.6dd223","type":"service-logic","name":"GENERIC-RESOURCE-API ${project.version}","module":"GENERIC-RESOURCE-API","version":"${project.version}","comments":"","xml":"","outputs":1,"x":292.03571537562766,"y":195.1517677307129,"z":"348b9f74.369c5","wires":[["323a6f66.9143"]]},{"id":"323a6f66.9143","type":"method","name":"method validate-vnf-input","xml":"\n","comments":"","outputs":1,"x":227.42863682338157,"y":236.16365242004395,"z":"348b9f74.369c5","wires":[["582b5aa0.7eeaf4"]]},{"id":"b04d7cd7.867c8","type":"comment","name":"validate-vnf-input","info":"","comments":"","x":573.0948660714284,"y":102.5,"z":"348b9f74.369c5","wires":[]},{"id":"1bbaae3f.e0d542","type":"switchNode","name":"switch service-instance-id","xml":"\n","comments":"","outputs":1,"x":529.3571570260183,"y":455.00001525878906,"z":"348b9f74.369c5","wires":[["7c1a77b8.6014f8"]]},{"id":"7c1a77b8.6014f8","type":"outcome","name":"NULL","xml":"","comments":"","outputs":1,"x":741.7857382638113,"y":455.0000114440918,"z":"348b9f74.369c5","wires":[["3c78fe4d.85e032"]]},{"id":"3c78fe4d.85e032","type":"returnFailure","name":"return failure","xml":"\n\t\n\t\n \n","comments":"","x":893.2143042428152,"y":455.00000953674316,"z":"348b9f74.369c5","wires":[]},{"id":"aa17e02a.1771","type":"switchNode","name":"switch vnf-id","xml":"\n","comments":"","outputs":1,"x":486.8571662902832,"y":498.5000057220459,"z":"348b9f74.369c5","wires":[["fee9192a.df3c38"]]},{"id":"fee9192a.df3c38","type":"outcome","name":"NULL","xml":"","comments":"","outputs":1,"x":742.1428756713867,"y":497.07143783569336,"z":"348b9f74.369c5","wires":[["34c1ea3e.84a8a6"]]},{"id":"34c1ea3e.84a8a6","type":"returnFailure","name":"return failure","xml":"\n\t\n\t\n \n","comments":"","x":893.5714416503906,"y":497.0714359283447,"z":"348b9f74.369c5","wires":[]},{"id":"26f7b426.cb378c","type":"switchNode","name":"switch aic-cloud-region","xml":"\n","comments":"","outputs":1,"x":1110.0000076293945,"y":642.0714302062988,"z":"348b9f74.369c5","wires":[["59831b6.e59aee4"]]},{"id":"59831b6.e59aee4","type":"outcome","name":"NULL","xml":"","comments":"","outputs":1,"x":1336.7143249511719,"y":642.0714645385742,"z":"348b9f74.369c5","wires":[["b0aeb3a5.71fc5"]]},{"id":"b0aeb3a5.71fc5","type":"returnFailure","name":"return failure","xml":"\n\t\n\t\n \n","comments":"","x":1488.1428909301758,"y":642.0714626312256,"z":"348b9f74.369c5","wires":[]},{"id":"18880cde.db6723","type":"switchNode","name":"switch model-customization-id","xml":"\n","comments":"","outputs":1,"x":1105.4761505126953,"y":757.2619113922119,"z":"348b9f74.369c5","wires":[["9cbd6868.f694f8"]]},{"id":"9cbd6868.f694f8","type":"outcome","name":"NULL","xml":"","comments":"","outputs":1,"x":1310.4761505126953,"y":757.2618942260742,"z":"348b9f74.369c5","wires":[["5efeb3c6.10dcbc"]]},{"id":"5efeb3c6.10dcbc","type":"returnFailure","name":"return failure","xml":"\n\t\n\t\n \n","comments":"","x":1461.9047164916992,"y":757.2618923187256,"z":"348b9f74.369c5","wires":[]},{"id":"8fbbcbd5.fd98c8","type":"outcome","name":"changeassign","xml":"\n","comments":"","outputs":1,"x":695.4163703918457,"y":757.1904706954956,"z":"348b9f74.369c5","wires":[["b11b3301.491e"]]},{"id":"b11b3301.491e","type":"block","name":"block : atomic","xml":"","atomic":"true","outputs":1,"x":875.4163589477539,"y":757.1904373168945,"z":"348b9f74.369c5","wires":[["18880cde.db6723"]]},{"id":"bdabc15d.2497b","type":"comment","name":"model-customization-uuid validation moved to changeassign DG","info":"","comments":"","x":755,"y":722.5000104904175,"z":"348b9f74.369c5","wires":[]}] \ No newline at end of file -- cgit 1.2.3-korg