From d1e6d41cce7c5a894536b2b88da760236b60a17d Mon Sep 17 00:00:00 2001 From: "shashikanth.vh" Date: Thu, 15 Nov 2018 17:48:12 +0530 Subject: removed vnf-id validation check in DG 1.vnf-information.vnf-id validation check should not be mandatory in validate-vnf-input DG, its removed. 2. added execute node to read generic-resource-api-dg.properties in esr-thirdparty-sdnc-discovery DG. Change-Id: Iea920004cdd548e16b4223cf57008fc00dbb1cb2 Issue-ID: SDNC-523 Signed-off-by: shashikanth.vh Former-commit-id: 4f1d05b32513c4bbca760233948541cfb983cfb3 --- .../GENERIC-RESOURCE-API_validate-vnf-input.json | 530 ++++++++++++++++++++- .../GENERIC-RESOURCE-API_validate-vnf-input.xml | 11 +- 2 files changed, 530 insertions(+), 11 deletions(-) (limited to 'platform-logic/generic-resource-api') 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 86c905b6..9ef063ea 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 +1,529 @@ -[{"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 +[ + { + "id": "76c41400.105bfc", + "type": "block", + "name": "block : atomic", + "xml": "", + "atomic": "true", + "outputs": 1, + "x": 215.03125, + "y": 380.7500047683716, + "z": "62d88521.de373c", + "wires": [ + [ + "2a2419b1.808286", + "63aa7131.36521", + "eac281c.1de128", + "e567acf8.fa2ee", + "b96ae981.783b38" + ] + ] + }, + { + "id": "2a2419b1.808286", + "type": "switchNode", + "name": "switch svc-request-id", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 472.7931594848633, + "y": 338.580340385437, + "z": "62d88521.de373c", + "wires": [ + [ + "b04eadfc.363d6" + ] + ] + }, + { + "id": "b04eadfc.363d6", + "type": "outcome", + "name": "NULL", + "xml": "", + "comments": "", + "outputs": 1, + "x": 698.507453918457, + "y": 338.5803442001343, + "z": "62d88521.de373c", + "wires": [ + [ + "7a089ce3.3d6db4" + ] + ] + }, + { + "id": "7a089ce3.3d6db4", + "type": "returnFailure", + "name": "return failure", + "xml": "\n\t\n\t\n \n", + "comments": "", + "x": 849.9360198974609, + "y": 338.58034229278564, + "z": "62d88521.de373c", + "wires": [] + }, + { + "id": "63aa7131.36521", + "type": "switchNode", + "name": "switch svc-action", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 461.3645226614817, + "y": 297.15177195412775, + "z": "62d88521.de373c", + "wires": [ + [ + "9a54011a.7a533" + ] + ] + }, + { + "id": "9a54011a.7a533", + "type": "outcome", + "name": "NULL", + "xml": "", + "comments": "", + "outputs": 1, + "x": 697.0788743155344, + "y": 295.7231697354998, + "z": "62d88521.de373c", + "wires": [ + [ + "ae9fbdb1.99d76" + ] + ] + }, + { + "id": "ae9fbdb1.99d76", + "type": "returnFailure", + "name": "return failure", + "xml": "\n\t\n\t\n \n", + "comments": "", + "x": 847.0788476126536, + "y": 295.723179272243, + "z": "62d88521.de373c", + "wires": [] + }, + { + "id": "eac281c.1de128", + "type": "switchNode", + "name": "switch request-action", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 471.36457606724343, + "y": 381.43748705727717, + "z": "62d88521.de373c", + "wires": [ + [ + "723ab622.079618" + ] + ] + }, + { + "id": "723ab622.079618", + "type": "outcome", + "name": "NULL", + "xml": "", + "comments": "", + "outputs": 1, + "x": 698.5074495588033, + "y": 381.43749795641224, + "z": "62d88521.de373c", + "wires": [ + [ + "af6a2199.40114" + ] + ] + }, + { + "id": "af6a2199.40114", + "type": "returnFailure", + "name": "return failure", + "xml": "\n\t\n\t\n \n", + "comments": "", + "x": 849.9360155378072, + "y": 381.4374960490636, + "z": "62d88521.de373c", + "wires": [] + }, + { + "id": "cb0aa11e.ba442", + "type": "switchNode", + "name": "switch model-customization-id", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 1089.8290977478027, + "y": 528.8662605285645, + "z": "62d88521.de373c", + "wires": [ + [ + "f7d46398.5727f" + ] + ] + }, + { + "id": "f7d46398.5727f", + "type": "outcome", + "name": "NULL", + "xml": "", + "comments": "", + "outputs": 1, + "x": 1294.8290977478027, + "y": 528.8662433624268, + "z": "62d88521.de373c", + "wires": [ + [ + "4203f831.9a99a8" + ] + ] + }, + { + "id": "4203f831.9a99a8", + "type": "returnFailure", + "name": "return failure", + "xml": "\n\t\n\t\n \n", + "comments": "", + "x": 1446.2576637268066, + "y": 528.8662414550781, + "z": "62d88521.de373c", + "wires": [] + }, + { + "id": "3314ab19.e03fa4", + "type": "switchNode", + "name": "switch tenant", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 1035.6861763000488, + "y": 570.294771194458, + "z": "62d88521.de373c", + "wires": [ + [ + "8f23daeb.368758" + ] + ] + }, + { + "id": "8f23daeb.368758", + "type": "outcome", + "name": "NULL", + "xml": "", + "comments": "", + "outputs": 1, + "x": 1293.4004936218262, + "y": 570.2948055267334, + "z": "62d88521.de373c", + "wires": [ + [ + "d455e65.3d8f318" + ] + ] + }, + { + "id": "d455e65.3d8f318", + "type": "returnFailure", + "name": "return failure", + "xml": "\n\t\n\t\n \n", + "comments": "", + "x": 1444.82905960083, + "y": 570.2948036193848, + "z": "62d88521.de373c", + "wires": [] + }, + { + "id": "b6a4138f.58b28", + "type": "comment", + "name": "Validation of required fields", + "info": "", + "comments": "", + "x": 621.3645324707031, + "y": 252.8660545349121, + "z": "62d88521.de373c", + "wires": [] + }, + { + "id": "e567acf8.fa2ee", + "type": "switchNode", + "name": "switch svc-action", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 455.35266876220703, + "y": 570.5447463989258, + "z": "62d88521.de373c", + "wires": [ + [ + "99eee3d5.45a48" + ] + ] + }, + { + "id": "99eee3d5.45a48", + "type": "outcome", + "name": "assign", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 632.4359893798828, + "y": 570.1280860900879, + "z": "62d88521.de373c", + "wires": [ + [ + "74f6768d.61c458" + ] + ] + }, + { + "id": "74f6768d.61c458", + "type": "block", + "name": "block : atomic", + "xml": "", + "atomic": "true", + "outputs": 1, + "x": 829.1026000976562, + "y": 570.1280860900879, + "z": "62d88521.de373c", + "wires": [ + [ + "cb0aa11e.ba442", + "3314ab19.e03fa4", + "14a1f7ee.4225a8" + ] + ] + }, + { + "id": "75d1af24.b59b7", + "type": "dgstart", + "name": "DGSTART", + "outputs": 1, + "x": 133.7812598092214, + "y": 125.41365432739258, + "z": "62d88521.de373c", + "wires": [ + [ + "7a2246ee.79a8f8" + ] + ] + }, + { + "id": "7a2246ee.79a8f8", + "type": "service-logic", + "name": "GENERIC-RESOURCE-API ${project.version}", + "module": "GENERIC-RESOURCE-API", + "version": "${project.version}", + "comments": "", + "xml": "", + "outputs": 1, + "x": 247.06696537562766, + "y": 165.65176582336426, + "z": "62d88521.de373c", + "wires": [ + [ + "58cd5caf.4f7f64" + ] + ] + }, + { + "id": "58cd5caf.4f7f64", + "type": "method", + "name": "method validate-vnf-input", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 182.45988682338157, + "y": 206.6636505126953, + "z": "62d88521.de373c", + "wires": [ + [ + "76c41400.105bfc" + ] + ] + }, + { + "id": "4fd47656.8c48d8", + "type": "comment", + "name": "validate-vnf-input", + "info": "", + "comments": "", + "x": 528.1261160714284, + "y": 72.99999809265137, + "z": "62d88521.de373c", + "wires": [] + }, + { + "id": "b96ae981.783b38", + "type": "switchNode", + "name": "switch service-instance-id", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 484.3884070260183, + "y": 425.50001335144043, + "z": "62d88521.de373c", + "wires": [ + [ + "222c65be.19adaa" + ] + ] + }, + { + "id": "222c65be.19adaa", + "type": "outcome", + "name": "NULL", + "xml": "", + "comments": "", + "outputs": 1, + "x": 696.8169882638113, + "y": 425.50000953674316, + "z": "62d88521.de373c", + "wires": [ + [ + "419149d7.f3c9e8" + ] + ] + }, + { + "id": "419149d7.f3c9e8", + "type": "returnFailure", + "name": "return failure", + "xml": "\n\t\n\t\n \n", + "comments": "", + "x": 848.2455542428152, + "y": 425.50000762939453, + "z": "62d88521.de373c", + "wires": [] + }, + { + "id": "14a1f7ee.4225a8", + "type": "switchNode", + "name": "switch aic-cloud-region", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 1065.0312576293945, + "y": 612.5714282989502, + "z": "62d88521.de373c", + "wires": [ + [ + "34b6bd95.7d9342" + ] + ] + }, + { + "id": "34b6bd95.7d9342", + "type": "outcome", + "name": "NULL", + "xml": "", + "comments": "", + "outputs": 1, + "x": 1291.7455749511719, + "y": 612.5714626312256, + "z": "62d88521.de373c", + "wires": [ + [ + "2a60eee3.33bf02" + ] + ] + }, + { + "id": "2a60eee3.33bf02", + "type": "returnFailure", + "name": "return failure", + "xml": "\n\t\n\t\n \n", + "comments": "", + "x": 1443.1741409301758, + "y": 612.571460723877, + "z": "62d88521.de373c", + "wires": [] + }, + { + "id": "786596f7.351798", + "type": "switchNode", + "name": "switch model-customization-id", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 1060.5074005126953, + "y": 727.7619094848633, + "z": "62d88521.de373c", + "wires": [ + [ + "47670feb.a0d52" + ] + ] + }, + { + "id": "47670feb.a0d52", + "type": "outcome", + "name": "NULL", + "xml": "", + "comments": "", + "outputs": 1, + "x": 1265.5074005126953, + "y": 727.7618923187256, + "z": "62d88521.de373c", + "wires": [ + [ + "57c8f1dd.5353b" + ] + ] + }, + { + "id": "57c8f1dd.5353b", + "type": "returnFailure", + "name": "return failure", + "xml": "\n\t\n\t\n \n", + "comments": "", + "x": 1416.9359664916992, + "y": 727.761890411377, + "z": "62d88521.de373c", + "wires": [] + }, + { + "id": "cfe766b3.3ac5a8", + "type": "outcome", + "name": "changeassign", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 650.4476203918457, + "y": 727.690468788147, + "z": "62d88521.de373c", + "wires": [ + [ + "43346cb0.8ff874" + ] + ] + }, + { + "id": "43346cb0.8ff874", + "type": "block", + "name": "block : atomic", + "xml": "", + "atomic": "true", + "outputs": 1, + "x": 830.4476089477539, + "y": 727.6904354095459, + "z": "62d88521.de373c", + "wires": [ + [ + "786596f7.351798" + ] + ] + }, + { + "id": "75147ce8.6bd644", + "type": "comment", + "name": "model-customization-uuid validation moved to changeassign DG", + "info": "", + "comments": "", + "x": 710.03125, + "y": 693.0000085830688, + "z": "62d88521.de373c", + "wires": [] + } +] diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-vnf-input.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-vnf-input.xml index bb60391c..6de5257f 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-vnf-input.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-vnf-input.xml @@ -39,15 +39,6 @@ - - - - - - - - - @@ -83,4 +74,4 @@ - \ No newline at end of file + -- cgit 1.2.3-korg