From 3b7cffe94e2f20e24797fc23c4eebd5e63b8b8f6 Mon Sep 17 00:00:00 2001 From: "ramu.n" Date: Thu, 12 Oct 2017 20:26:05 +0530 Subject: Update underlay DGs for VoLTE use case *query 'pnf' from AAI using pe1_id *get esr-thirdparty-sdnc.thirdparty-sdnc-id from pnf.relationship-data *query 'esr-thirdparty-sdnc' from AAI using thirdparty-sdnc-id Change-Id: Ic80c29f306e17d5c5401f723ee86f3641f833778 Issue-Id: SDNC-111 Signed-off-by: Ramu N Former-commit-id: 5ec247ae0f98a5c4d732978db5159bdd9273cdfa --- ...URCE-API_network-topology-operation-create.json | 159 ++++-- ...URCE-API_network-topology-operation-delete.json | 571 +++++++++++++-------- ...URCE-API_validate-network-input-parameters.json | 6 +- ...OURCE-API_network-topology-operation-create.xml | 94 ++-- ...OURCE-API_network-topology-operation-delete.xml | 49 +- ...OURCE-API_validate-network-input-parameters.xml | 6 +- 6 files changed, 573 insertions(+), 312 deletions(-) (limited to 'platform-logic/generic-resource-api/src/main') diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation-create.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation-create.json index c2d67a4b..c2241024 100644 --- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation-create.json +++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation-create.json @@ -60,7 +60,6 @@ "z": "afcbb687.85236", "wires": [ [ - "e2f31eb5.a183e", "ade3e35c.b5b59", "7c2f72f7.87d2ac", "8d5aeff7.32c67", @@ -76,7 +75,8 @@ "aec2b21c.351b48", "fd85e187.c7dde", "4308a2c5.6e7bac", - "8381990.da591e8" + "8381990.da591e8", + "ced212e0.c44f6" ] ] }, @@ -84,7 +84,7 @@ "id": "f1c4e62c.acf5f", "type": "execute", "name": "execute RestApiCallNode Create IPWAN L3VPN", - "xml": "\n\n\n\n\n\n\n", + "xml": "\n\n\n\n\n\n\n", "comments": "", "outputs": 1, "x": 1167.0001831054688, @@ -98,10 +98,10 @@ "id": "e2f31eb5.a183e", "type": "set", "name": "set controller data", - "xml": "\n\n\n\n\n", + "xml": "\n\n\n\n\n", "comments": "", - "x": 790.0000610351562, - "y": 281.9999694824219, + "x": 1266.0000610351562, + "y": 271.9999694824219, "z": "afcbb687.85236", "wires": [] }, @@ -112,8 +112,8 @@ "xml": "\n", "comments": "", "outputs": 1, - "x": 850.6666259765625, - "y": 403.6666259765625, + "x": 807.6666259765625, + "y": 187.6666259765625, "z": "afcbb687.85236", "wires": [ [ @@ -199,8 +199,8 @@ "xml": "\n\n", "comments": "", "outputs": 1, - "x": 832.5, - "y": 220.99996948242188, + "x": 823.5, + "y": 337.9999694824219, "z": "afcbb687.85236", "wires": [ [ @@ -217,12 +217,12 @@ "xml": "\n", "comments": "", "outputs": 1, - "x": 1157.5, - "y": 151.99996948242188, + "x": 1068.5, + "y": 283.9999694824219, "z": "afcbb687.85236", "wires": [ [ - "9cd190ea.6976c8" + "e2f31eb5.a183e" ] ] }, @@ -233,8 +233,8 @@ "xml": "\n", "comments": "", "outputs": 1, - "x": 1160.990966796875, - "y": 199.57400512695312, + "x": 1071.990966796875, + "y": 331.5740051269531, "z": "afcbb687.85236", "wires": [ [ @@ -249,8 +249,8 @@ "xml": "\n", "comments": "", "outputs": 1, - "x": 1156.323974609375, - "y": 240.90731811523438, + "x": 1067.323974609375, + "y": 372.9073181152344, "z": "afcbb687.85236", "wires": [ [ @@ -264,8 +264,8 @@ "name": "return failure", "xml": "\n\t\n\t\n \n\t\n\t\n \n\n\n\n\n\n\n", + "xml": "\n\n\n\n\n\n\n", "comments": "", "outputs": 1, "x": 1174, @@ -1748,7 +1734,7 @@ "id": "660c6e65.05f44", "type": "execute", "name": "execute RestApiCallNode IPWAN VRF Config", - "xml": "\n\n\n\n\n\n\n", + "xml": "\n\n\n\n\n\n\n", "comments": "", "outputs": 1, "x": 1172, @@ -1994,5 +1980,104 @@ "y": 1404, "z": "afcbb687.85236", "wires": [] + }, + { + "id": "ced212e0.c44f6", + "type": "get-resource", + "name": "get-resource pnf", + "xml": "\n\n", + "comments": "", + "outputs": 1, + "x": 801, + "y": 258, + "z": "afcbb687.85236", + "wires": [ + [ + "eadbe688.b2511", + "3cc9c2b7.cfb8de", + "8d496330.30d8c8" + ] + ] + }, + { + "id": "eadbe688.b2511", + "type": "success", + "name": "success", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 1123, + "y": 148, + "z": "afcbb687.85236", + "wires": [ + [ + "3db9a787.d2e218" + ] + ] + }, + { + "id": "3cc9c2b7.cfb8de", + "type": "not-found", + "name": "not-found", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 1126.490966796875, + "y": 195.57403564453125, + "z": "afcbb687.85236", + "wires": [ + [ + "f2ff3e53.95d6c" + ] + ] + }, + { + "id": "8d496330.30d8c8", + "type": "other", + "name": "other", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 1121.823974609375, + "y": 236.9073486328125, + "z": "afcbb687.85236", + "wires": [ + [ + "dbc59ca.25a126" + ] + ] + }, + { + "id": "f2ff3e53.95d6c", + "type": "returnFailure", + "name": "return failure", + "xml": "\n\t\n\t\n \n\t\n\t\n \n", + "comments": "", + "x": 1327, + "y": 135, + "z": "afcbb687.85236", + "wires": [] } ] diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation-delete.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation-delete.json index fd3f15cc..0560640f 100644 --- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation-delete.json +++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation-delete.json @@ -1,20 +1,20 @@ [ { - "id": "827d7697.e161a8", + "id": "5b1da5a1.42a48c", "type": "dgstart", "name": "DGSTART", "outputs": 1, - "x": 93, - "y": 84, - "z": "2b9e11cc.456d3e", + "x": 84, + "y": 118.11099243164062, + "z": "cb78d918.7fc128", "wires": [ [ - "6fb89758.08cae8" + "93750cf9.1f2d78" ] ] }, { - "id": "6fb89758.08cae8", + "id": "93750cf9.1f2d78", "type": "service-logic", "name": "GENERIC-RESOURCE-API ${project.version}", "module": "GENERIC-RESOURCE-API", @@ -22,600 +22,729 @@ "comments": "", "xml": "", "outputs": 1, - "x": 305.00000381469727, - "y": 156.0000171661377, - "z": "2b9e11cc.456d3e", + "x": 296.00000381469727, + "y": 190.11100959777832, + "z": "cb78d918.7fc128", "wires": [ [ - "c0e8cad3.da0c8" + "86c0b848.b39ba" ] ] }, { - "id": "c0e8cad3.da0c8", + "id": "86c0b848.b39ba", "type": "method", "name": "method network-topology-operation-delete", "xml": "\n", "comments": "", "outputs": 1, - "x": 293.0001220703125, - "y": 244, - "z": "2b9e11cc.456d3e", + "x": 284.0001220703125, + "y": 278.1109924316406, + "z": "cb78d918.7fc128", "wires": [ [ - "a6f45139.fa877" + "77e3cc35.7d7cd4" ] ] }, { - "id": "a6f45139.fa877", + "id": "77e3cc35.7d7cd4", "type": "block", "name": "block : atomic", "xml": "\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 569.0000305175781, - "y": 252.00001335144043, - "z": "2b9e11cc.456d3e", + "x": 560.0000305175781, + "y": 286.11100578308105, + "z": "cb78d918.7fc128", "wires": [ [ - "30175b96.175abc", - "ecfd60c5.b2e578", - "cfff2d7f.0d80f8", - "dc355ee1.94a83", - "6101a41d.088144", - "d633fa40.e632f", - "c7fcf65d.3267e", - "a8af32f0.52f9a" + "be2e1456.227648", + "a1897ab9.0fe448", + "b9226511.aff8f8", + "bac94eb6.f12e88", + "d9cb698f.15b1f", + "4f7bc968.61f5a", + "af92894.71fa378", + "4a75daf.1521ba4" ] ] }, { - "id": "30175b96.175abc", + "id": "be2e1456.227648", "type": "call", "name": "call GENERIC-RESOURCE-API:validate-network-input-parameters", "xml": "\n", "comments": "", "outputs": 1, - "x": 890, - "y": 35, - "z": "2b9e11cc.456d3e", + "x": 881, + "y": 69.11099243164062, + "z": "cb78d918.7fc128", "wires": [ [] ] }, { - "id": "ecfd60c5.b2e578", + "id": "a1897ab9.0fe448", "type": "get-resource", "name": "get-resource esr-thirdparty-sdnc", "xml": "\n\n", "comments": "", "outputs": 1, - "x": 847, - "y": 378, - "z": "2b9e11cc.456d3e", + "x": 825, + "y": 514.1109619140625, + "z": "cb78d918.7fc128", "wires": [ [ - "f7a8fca4.b3ad", - "aa0ec94f.00fa6", - "1ecf0d2.4909473" + "75e7b934.cb3dd8", + "796a59b1.8d0548", + "5c8d6866.b859a" ] ] }, { - "id": "f7a8fca4.b3ad", + "id": "75e7b934.cb3dd8", "type": "success", "name": "success", "xml": "\n", "comments": "", "outputs": 1, - "x": 1163, - "y": 322, - "z": "2b9e11cc.456d3e", + "x": 1063, + "y": 470.1109924316406, + "z": "cb78d918.7fc128", "wires": [ [ - "f83a9763.b4b58" + "cf00d60e.b98ae8" ] ] }, { - "id": "aa0ec94f.00fa6", + "id": "796a59b1.8d0548", "type": "not-found", "name": "not-found", "xml": "\n", "comments": "", "outputs": 1, - "x": 1166.490966796875, - "y": 369.57403564453125, - "z": "2b9e11cc.456d3e", + "x": 1067.490966796875, + "y": 511.68505859375, + "z": "cb78d918.7fc128", "wires": [ [ - "b04696c4.58fe88" + "b91067cd.af8e68" ] ] }, { - "id": "1ecf0d2.4909473", + "id": "5c8d6866.b859a", "type": "other", "name": "other", "xml": "\n", "comments": "", "outputs": 1, - "x": 1161.823974609375, - "y": 410.9073486328125, - "z": "2b9e11cc.456d3e", + "x": 1060.823974609375, + "y": 563.018310546875, + "z": "cb78d918.7fc128", "wires": [ [ - "479ab3c0.7b5764" + "977f0d12.35997" ] ] }, { - "id": "b04696c4.58fe88", + "id": "b91067cd.af8e68", "type": "returnFailure", "name": "return failure", "xml": "\n\t\n\t\n \n\n", "comments": "", - "x": 1343.0623779296875, - "y": 357.8597717285156, - "z": "2b9e11cc.456d3e", + "x": 1243.0623779296875, + "y": 509.97076416015625, + "z": "cb78d918.7fc128", "wires": [] }, { - "id": "479ab3c0.7b5764", + "id": "977f0d12.35997", "type": "returnFailure", "name": "return failure", "xml": "\n\t\n\t\n \n\n", "comments": "", - "x": 1349.5965309143066, - "y": 406.3465414047241, - "z": "2b9e11cc.456d3e", + "x": 1221.5965576171875, + "y": 561.45751953125, + "z": "cb78d918.7fc128", "wires": [] }, { - "id": "f83a9763.b4b58", - "type": "block", - "name": "block : atomic", - "xml": "", - "atomic": "true", - "outputs": 1, - "x": 1341.205322265625, - "y": 314.57403564453125, - "z": "2b9e11cc.456d3e", - "wires": [ - [] - ] - }, - { - "id": "cfff2d7f.0d80f8", + "id": "b9226511.aff8f8", "type": "for", "name": "for each network-input-parameters", "xml": "\n", "comments": "", "outputs": 1, - "x": 852, - "y": 213, - "z": "2b9e11cc.456d3e", + "x": 843, + "y": 247.11099243164062, + "z": "cb78d918.7fc128", "wires": [ [ - "8482cde8.2496f8" + "1203f51d.6f9be3" ] ] }, { - "id": "8482cde8.2496f8", + "id": "1203f51d.6f9be3", "type": "block", "name": "block", "xml": "\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1133.8333740234375, - "y": 191.33334350585938, - "z": "2b9e11cc.456d3e", + "x": 1124.8333740234375, + "y": 225.4443359375, + "z": "cb78d918.7fc128", "wires": [ [ - "f44089bc.f2b86", - "bd431753.a4c8f" + "f23590e3.3d3e", + "9c473946.08b4", + "634e4197.82f778" ] ] }, { - "id": "f44089bc.f2b86", + "id": "f23590e3.3d3e", "type": "switchNode", "name": "switch name", "xml": "\n", "comments": "", "outputs": 1, - "x": 1342, - "y": 152, - "z": "2b9e11cc.456d3e", + "x": 1333, + "y": 186.11099243164062, + "z": "cb78d918.7fc128", "wires": [ [ - "a1e5b819.cd782" + "722e293e.27d6a8" ] ] }, { - "id": "a1e5b819.cd782", + "id": "722e293e.27d6a8", "type": "outcomeTrue", "name": "true", "xml": "\n", "comments": "", "outputs": 1, - "x": 1529, - "y": 152, - "z": "2b9e11cc.456d3e", + "x": 1520, + "y": 186.11099243164062, + "z": "cb78d918.7fc128", "wires": [ [ - "8d993f14.d7c67" + "ed3016dc.763f5" ] ] }, { - "id": "8d993f14.d7c67", + "id": "ed3016dc.763f5", "type": "set", "name": "set name", "xml": "\n\n", "comments": "", - "x": 1697, - "y": 152.60000610351562, - "z": "2b9e11cc.456d3e", + "x": 1688, + "y": 186.71099853515625, + "z": "cb78d918.7fc128", "wires": [] }, { - "id": "bd431753.a4c8f", + "id": "9c473946.08b4", "type": "switchNode", "name": "switch service-type", "xml": "\n", "comments": "", "outputs": 1, - "x": 1345.9999389648438, - "y": 213.5999755859375, - "z": "2b9e11cc.456d3e", + "x": 1338, + "y": 240.71096801757812, + "z": "cb78d918.7fc128", "wires": [ [ - "264d1797.9d01f8" + "406e37de.0fb498" ] ] }, { - "id": "264d1797.9d01f8", + "id": "406e37de.0fb498", "type": "outcomeTrue", "name": "true", "xml": "\n", "comments": "", "outputs": 1, - "x": 1530.9999389648438, - "y": 211.5999755859375, - "z": "2b9e11cc.456d3e", + "x": 1521.9999389648438, + "y": 245.71096801757812, + "z": "cb78d918.7fc128", "wires": [ [ - "b160eb3c.cbb848" + "3e9c73.d1f31b8e" ] ] }, { - "id": "b160eb3c.cbb848", + "id": "3e9c73.d1f31b8e", "type": "set", "name": "set service-type", "xml": "\n\n", "comments": "", - "x": 1699.9999389648438, - "y": 209.5999755859375, - "z": "2b9e11cc.456d3e", + "x": 1690.9999389648438, + "y": 243.71096801757812, + "z": "cb78d918.7fc128", "wires": [] }, { - "id": "dc355ee1.94a83", + "id": "cf00d60e.b98ae8", "type": "set", "name": "set controller data", - "xml": "\n\n\n\n\n", + "xml": "\n\n\n\n\n", "comments": "", - "x": 812, - "y": 489, - "z": "2b9e11cc.456d3e", + "x": 1249, + "y": 467.1109619140625, + "z": "cb78d918.7fc128", "wires": [] }, { - "id": "cb586993.f0a33", + "id": "91ceb00c.aa0fd", "type": "execute", "name": "execute REST DELETE VPN", - "xml": "\n\n\n\n\n\n\n", + "xml": "\n\n\n", "comments": "", "outputs": 1, - "x": 1043, - "y": 568, - "z": "2b9e11cc.456d3e", + "x": 1034, + "y": 602.1109924316406, + "z": "cb78d918.7fc128", "wires": [ [ - "cb586993.f0a33" + "91ceb00c.aa0fd" ] ] }, { - "id": "d633fa40.e632f", + "id": "d9cb698f.15b1f", "type": "switchNode", "name": "switch service-data.networks.network_length", "xml": "\n", "comments": "", "outputs": 1, - "x": 832, - "y": 108, - "z": "2b9e11cc.456d3e", + "x": 823, + "y": 142.11099243164062, + "z": "cb78d918.7fc128", "wires": [ [ - "cd115f81.9765", - "8c843586.ed486" + "652472f9.d0128c", + "2b9737f2.ff2e58" ] ] }, { - "id": "cd115f81.9765", + "id": "652472f9.d0128c", "type": "other", "name": "outcome Null", "xml": "\n", "comments": "", "outputs": 1, - "x": 1277, - "y": 34.00006103515625, - "z": "2b9e11cc.456d3e", + "x": 1268, + "y": 68.11105346679688, + "z": "cb78d918.7fc128", "wires": [ [ - "9468f013.3839a8" + "56dffac.74ce404" ] ] }, { - "id": "9468f013.3839a8", + "id": "56dffac.74ce404", "type": "returnFailure", "name": "return failure", "xml": "\n\t\n\t\n \n", "comments": "", - "x": 1467.7774658203125, - "y": 20.889007568359375, - "z": "2b9e11cc.456d3e", + "x": 1458.7774658203125, + "y": 55, + "z": "cb78d918.7fc128", "wires": [] }, { - "id": "8c843586.ed486", + "id": "2b9737f2.ff2e58", "type": "other", "name": "other", "xml": "\n", "comments": "", "outputs": 1, - "x": 1161.0003662109375, - "y": 99.00007629394531, - "z": "2b9e11cc.456d3e", + "x": 1152.0003662109375, + "y": 133.11106872558594, + "z": "cb78d918.7fc128", "wires": [ [ - "c38355cb.b91f58" + "5d39d6e3.de1a58" ] ] }, { - "id": "c38355cb.b91f58", + "id": "5d39d6e3.de1a58", "type": "block", "name": "block : atomic", "xml": "", "atomic": "true", "outputs": 1, - "x": 1332.2698974609375, - "y": 82.55461120605469, - "z": "2b9e11cc.456d3e", + "x": 1323.2698974609375, + "y": 116.66560363769531, + "z": "cb78d918.7fc128", "wires": [ [ - "da8d2eef.9ecfc8", - "2abc9e2a.3b6932" + "2ac08a71.09b5de", + "9c86a373.825778" ] ] }, { - "id": "da8d2eef.9ecfc8", + "id": "2ac08a71.09b5de", "type": "for", "name": "for nidx..service-data.networks.network[]", "xml": "\n", "comments": "", "outputs": 1, - "x": 1630.285888671875, - "y": 63.428619384765625, - "z": "2b9e11cc.456d3e", + "x": 1621.285888671875, + "y": 97.53961181640625, + "z": "cb78d918.7fc128", "wires": [ [ - "788ddd9c.802654" + "5db8c267.915c24" ] ] }, { - "id": "2abc9e2a.3b6932", + "id": "9c86a373.825778", "type": "switchNode", "name": "switch tmp.nidx ", "xml": "\n\n", "comments": "", "outputs": 1, - "x": 1551.5872802734375, - "y": 106.41180419921875, - "z": "2b9e11cc.456d3e", + "x": 1542.5872802734375, + "y": 140.52279663085938, + "z": "cb78d918.7fc128", "wires": [ [ - "d0a99363.1c30e" + "3d81dbd3.1a6114" ] ] }, { - "id": "d0a99363.1c30e", + "id": "3d81dbd3.1a6114", "type": "outcome", "name": "NULL", "xml": "\n", "comments": "", "outputs": 1, - "x": 1752.015869140625, - "y": 111.98321533203125, - "z": "2b9e11cc.456d3e", + "x": 1743.015869140625, + "y": 146.09420776367188, + "z": "cb78d918.7fc128", "wires": [ [ - "ea14dde0.93393" + "75e88bb1.8a62cc" ] ] }, { - "id": "788ddd9c.802654", + "id": "5db8c267.915c24", "type": "switchNode", "name": "switch networkid found", "xml": "\n\n", "comments": "", "outputs": 1, - "x": 1940.7144775390625, - "y": 61.6787109375, - "z": "2b9e11cc.456d3e", + "x": 1931.7144775390625, + "y": 95.78970336914062, + "z": "cb78d918.7fc128", "wires": [ [ - "c02919ae.22f7c" + "e928a560.5b1c7" ] ] }, { - "id": "ea14dde0.93393", + "id": "75e88bb1.8a62cc", "type": "returnFailure", "name": "return failure", "xml": "\n\t\n\t\n \n", "comments": "", - "x": 1923.4443359375, - "y": 112.12606811523438, - "z": "2b9e11cc.456d3e", + "x": 1914.4443359375, + "y": 146.237060546875, + "z": "cb78d918.7fc128", "wires": [] }, { - "id": "c02919ae.22f7c", + "id": "e928a560.5b1c7", "type": "outcomeTrue", "name": "true", "xml": "\n", "comments": "", "outputs": 1, - "x": 2146.666748046875, - "y": 60.571441650390625, - "z": "2b9e11cc.456d3e", + "x": 2137.666748046875, + "y": 94.68243408203125, + "z": "cb78d918.7fc128", "wires": [ [ - "64769a39.b95ddc" + "4ba4d636.a30d6" ] ] }, { - "id": "64769a39.b95ddc", + "id": "4ba4d636.a30d6", "type": "set", "name": "set tmp.nidx and ctx.network-data", "xml": "\n\n\n", "comments": "", - "x": 2385.198486328125, - "y": 56.321441650390625, - "z": "2b9e11cc.456d3e", + "x": 2376.198486328125, + "y": 90.43243408203125, + "z": "cb78d918.7fc128", "wires": [] }, { - "id": "c7fcf65d.3267e", + "id": "4f7bc968.61f5a", "type": "block", "name": "block : saveNetworkData", "xml": "", "atomic": "true", "comments": "", "outputs": 1, - "x": 811, - "y": 674, - "z": "2b9e11cc.456d3e", + "x": 802, + "y": 708.1109924316406, + "z": "cb78d918.7fc128", "wires": [ [ - "90f2187a.a0ed98", - "d97a2187.fc0188", - "8edd5656.7d422", - "8bc5ebfa.1b543" + "79d9aff3.77d7a8", + "7c1ac8d9.cf4248", + "305a1978.b12f4e", + "93b679b.6a51508" ] ] }, { - "id": "a8af32f0.52f9a", + "id": "af92894.71fa378", "type": "returnSuccess", "name": "return success", "xml": "\n\n\n\n", "comments": "", - "x": 771.6665802001953, - "y": 807.3332815170288, - "z": "2b9e11cc.456d3e", + "x": 762.6665802001953, + "y": 841.4442739486694, + "z": "cb78d918.7fc128", "wires": [] }, { - "id": "8edd5656.7d422", + "id": "305a1978.b12f4e", "type": "set", "name": "copy input to service-data", "xml": "\n\n\n", "comments": "", - "x": 1104.0000076293945, - "y": 654.3333120346069, - "z": "2b9e11cc.456d3e", + "x": 1095.0000076293945, + "y": 688.4443044662476, + "z": "cb78d918.7fc128", "wires": [] }, { - "id": "90f2187a.a0ed98", + "id": "79d9aff3.77d7a8", "type": "set", "name": "set networkId", "xml": "\n\n", "comments": "", - "x": 1068.2895622253418, - "y": 698.0511589050293, - "z": "2b9e11cc.456d3e", + "x": 1059.2895622253418, + "y": 732.1621513366699, + "z": "cb78d918.7fc128", "wires": [] }, { - "id": "d97a2187.fc0188", + "id": "7c1ac8d9.cf4248", "type": "set", "name": "set object-path", "xml": "\n\n \n", "comments": "", - "x": 1074.0039291381836, - "y": 735.1940507888794, - "z": "2b9e11cc.456d3e", + "x": 1065.0039291381836, + "y": 769.30504322052, + "z": "cb78d918.7fc128", "wires": [] }, { - "id": "8bc5ebfa.1b543", + "id": "93b679b.6a51508", "type": "set", "name": "set network-level-oper-status", "xml": "\n\n\n\n", "comments": "", - "x": 1117.9999389648438, - "y": 782.333270072937, - "z": "2b9e11cc.456d3e", + "x": 1108.9999389648438, + "y": 816.4442625045776, + "z": "cb78d918.7fc128", + "wires": [] + }, + { + "id": "4a75daf.1521ba4", + "type": "get-resource", + "name": "get-resource pnf", + "xml": "\n\n", + "comments": "", + "outputs": 1, + "x": 781, + "y": 392, + "z": "cb78d918.7fc128", + "wires": [ + [ + "b89fb093.0489a8", + "6b28b3fc.71f09c", + "6a884f6a.df82b8" + ] + ] + }, + { + "id": "b89fb093.0489a8", + "type": "success", + "name": "success", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 975, + "y": 330, + "z": "cb78d918.7fc128", + "wires": [ + [ + "af6e1f5.d3f8c6" + ] + ] + }, + { + "id": "6b28b3fc.71f09c", + "type": "not-found", + "name": "not-found", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 984.490966796875, + "y": 372.57403564453125, + "z": "cb78d918.7fc128", + "wires": [ + [ + "f8931666.61247" + ] + ] + }, + { + "id": "6a884f6a.df82b8", + "type": "other", + "name": "other", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 977.823974609375, + "y": 420.9073486328125, + "z": "cb78d918.7fc128", + "wires": [ + [ + "d28c6955.33e8f" + ] + ] + }, + { + "id": "f8931666.61247", + "type": "returnFailure", + "name": "return failure", + "xml": "\n\t\n\t\n \n\t\n\t\n \n", + "comments": "", + "x": 1189, + "y": 326, + "z": "cb78d918.7fc128", + "wires": [] + }, + { + "id": "634e4197.82f778", + "type": "switchNode", + "name": "switch pe1_id", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 1340, + "y": 287, + "z": "cb78d918.7fc128", + "wires": [ + [ + "5329ae02.4dab98" + ] + ] + }, + { + "id": "5329ae02.4dab98", + "type": "outcomeTrue", + "name": "true", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 1526, + "y": 296, + "z": "cb78d918.7fc128", + "wires": [ + [ + "19f03810.34cf68" + ] + ] + }, + { + "id": "19f03810.34cf68", + "type": "set", + "name": "set pe1_id", + "xml": "\n\n", + "comments": "", + "x": 1709, + "y": 300, + "z": "cb78d918.7fc128", "wires": [] } ] diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-network-input-parameters.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-network-input-parameters.json index 109b3113..ce0a2fa3 100644 --- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-network-input-parameters.json +++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_validate-network-input-parameters.json @@ -387,7 +387,7 @@ "id": "4d7afbb9.93f474", "type": "set", "name": "set tmp-data", - "xml": "\n\n\n", + "xml": "\n\n\n", "comments": "", "x": 1779.7143096923828, "y": 301.0000247955322, @@ -398,7 +398,7 @@ "id": "e49aca1a.0651b8", "type": "switchNode", "name": "switch name", - "xml": "\n", + "xml": "\n", "comments": "", "outputs": 1, "x": 1758.7143096923828, @@ -789,7 +789,7 @@ "id": "99cbd7b1.dcbe1", "type": "switchNode", "name": "switch network-id", - "xml": "\n", + "xml": "\n", "comments": "", "outputs": 1, "x": 868.2856636047363, diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-create.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-create.xml index c2561f6b..2b280fc1 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-create.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-create.xml @@ -3,31 +3,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - @@ -247,6 +222,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -354,28 +374,28 @@ - - - - + + + + - - - - + + + + - - - - + + + + diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-delete.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-delete.xml index 8d9dac1b..c947a383 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-delete.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation-delete.xml @@ -51,11 +51,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + @@ -72,19 +105,13 @@ - - - - - - - - - - + + + + diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-network-input-parameters.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-network-input-parameters.xml index 9c13bbf5..435ecf00 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-network-input-parameters.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_validate-network-input-parameters.xml @@ -24,10 +24,10 @@ - - + + - + -- cgit 1.2.3-korg