diff options
2 files changed, 348 insertions, 250 deletions
diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation.json index fa5c8916..e0baa7a1 100644 --- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation.json +++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_network-topology-operation.json @@ -1,20 +1,20 @@ [ { - "id": "c99606bb.e2a028", + "id": "41c5caea.9adc34", "type": "dgstart", "name": "DGSTART", "outputs": 1, - "x": 112.11111450195312, - "y": 72.41365623474121, - "z": "cb3252c9.673b6", + "x": 95.54763793945312, + "y": 109.41365623474121, + "z": "67a3081a.032478", "wires": [ [ - "864e4d1.67b0cb" + "cc320d31.bccdf" ] ] }, { - "id": "864e4d1.67b0cb", + "id": "cc320d31.bccdf", "type": "service-logic", "name": "GENERIC-RESOURCE-API ${project.version}", "module": "GENERIC-RESOURCE-API", @@ -22,727 +22,821 @@ "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": 194.0634765625, - "y": 112.6517686843872, - "z": "cb3252c9.673b6", + "x": 177.5, + "y": 149.6517686843872, + "z": "67a3081a.032478", "wires": [ [ - "8523dd91.6b0d1" + "82b10f50.5d8e8" ] ] }, { - "id": "8523dd91.6b0d1", + "id": "82b10f50.5d8e8", "type": "method", "name": "network-topology-operation", "xml": "<method rpc='network-topology-operation' mode='sync'>\n", "comments": "", "outputs": 1, - "x": 190.53974151611328, - "y": 152.4136505126953, - "z": "cb3252c9.673b6", + "x": 173.97626495361328, + "y": 189.4136505126953, + "z": "67a3081a.032478", "wires": [ [ - "1a229729.b26c99" + "bf4f5344.1024c8" ] ] }, { - "id": "38f1087b.161648", + "id": "17ece3ab.35321c", "type": "comment", "name": " NETWORK-TOPOLOGY-OPERATION ", "info": "", "comments": "", - "x": 506.45597076416016, - "y": 20, - "z": "cb3252c9.673b6", + "x": 489.89249420166016, + "y": 57, + "z": "67a3081a.032478", "wires": [] }, { - "id": "1a229729.b26c99", + "id": "bf4f5344.1024c8", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "outputs": 1, - "x": 226.11114501953125, - "y": 235.85713958740234, - "z": "cb3252c9.673b6", + "x": 209.54766845703125, + "y": 272.85713958740234, + "z": "67a3081a.032478", "wires": [ [ - "98cc4191.2cf35", - "57ac21c1.a3bc3", - "987f679f.f57988", - "1170a38.c1b8e5d" + "d50c5a2a.c0cea", + "b762591f.2fb7a", + "f06b8960.155ea8", + "f1b5981d.bfa858" ] ] }, { - "id": "98cc4191.2cf35", + "id": "d50c5a2a.c0cea", "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": 456.1945037841797, - "y": 859.6997756958008, - "z": "cb3252c9.673b6", + "x": 439.6310272216797, + "y": 896.6997756958008, + "z": "67a3081a.032478", "wires": [] }, { - "id": "57ac21c1.a3bc3", + "id": "b762591f.2fb7a", "type": "switchNode", "name": "switch svc-action", "xml": "<switch test='`$network-topology-operation-input.sdnc-request-header.svc-action`'>\n", "comments": "", "outputs": 1, - "x": 452.82537841796875, - "y": 466.2708339691162, - "z": "cb3252c9.673b6", + "x": 436.26190185546875, + "y": 503.2708339691162, + "z": "67a3081a.032478", "wires": [ [ - "f08cfd72.f6d7a", - "ba263e37.fc151", - "ee75a5f3.d1d328", - "906cbd9a.3bcc1", - "483543a0.87b2ec" + "38a30397.7f9c64", + "5b59ca66.3fadec", + "7a4b792c.22588", + "b22e57ce.c6aee8", + "10c582cc.cfd665", + "de74faab.3a2ae", + "9bc3f97c.14bbf8" ] ] }, { - "id": "f08cfd72.f6d7a", + "id": "38a30397.7f9c64", "type": "other", "name": "assign", "xml": "<outcome value='assign'>\n", "comments": "", "outputs": 1, - "x": 673.3015747070312, - "y": 328.5564842224121, - "z": "cb3252c9.673b6", + "x": 656.7380981445312, + "y": 365.5564842224121, + "z": "67a3081a.032478", "wires": [ [ - "85930aff.cc50b8" + "7047d313.0a4e84" ] ] }, { - "id": "85930aff.cc50b8", + "id": "7047d313.0a4e84", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "outputs": 1, - "x": 854.5397338867188, - "y": 329.5566062927246, - "z": "cb3252c9.673b6", + "x": 837.9762573242188, + "y": 366.5566062927246, + "z": "67a3081a.032478", "wires": [ [ - "733204ba.52ff4c" + "fbc9882f.656ad8" ] ] }, { - "id": "987f679f.f57988", + "id": "f06b8960.155ea8", "type": "call", "name": "call GENERIC-RESOURCE-API:validate-network-input", "xml": "<call module='GENERIC-RESOURCE-API' rpc='validate-network-input' mode='sync' >\n", "comments": "", "outputs": 1, - "x": 584.1111145019531, - "y": 236.4136562347412, - "z": "cb3252c9.673b6", + "x": 567.5476379394531, + "y": 273.4136562347412, + "z": "67a3081a.032478", "wires": [ [] ] }, { - "id": "733204ba.52ff4c", + "id": "fbc9882f.656ad8", "type": "call", "name": "call GENERIC-RESOURCE-API:network-topology-operation-assign", "xml": "<call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-assign' mode='sync' >\n", "comments": "", "outputs": 1, - "x": 1226.111083984375, - "y": 326.4136619567871, - "z": "cb3252c9.673b6", + "x": 1209.547607421875, + "y": 363.4136619567871, + "z": "67a3081a.032478", "wires": [ [] ] }, { - "id": "ba263e37.fc151", + "id": "5b59ca66.3fadec", "type": "other", "name": "activate", "xml": "<outcome value='activate'>\n", "comments": "", "outputs": 1, - "x": 675.1111145019531, - "y": 416.4136562347412, - "z": "cb3252c9.673b6", + "x": 658.5476379394531, + "y": 453.4136562347412, + "z": "67a3081a.032478", "wires": [ [ - "70342e4b.918dc" + "73ce8c08.c3845c" ] ] }, { - "id": "70342e4b.918dc", + "id": "73ce8c08.c3845c", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "outputs": 1, - "x": 859.3492736816406, - "y": 417.4137783050537, - "z": "cb3252c9.673b6", + "x": 842.7857971191406, + "y": 454.4137783050537, + "z": "67a3081a.032478", "wires": [ [ - "69a87518.69854c", - "bd1a56c0.3e9138" + "a003c0d6.5a0d8", + "61a363af.ee55bc" ] ] }, { - "id": "68785460.4653ec", + "id": "ee7e53d1.6aac9", "type": "call", "name": "call GENERIC-RESOURCE-API:network-topology-operation-activate", "xml": "<call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-activate' mode='sync' >\n", "comments": "", "outputs": 1, - "x": 1991.9206848144531, - "y": 579.2708282470703, - "z": "cb3252c9.673b6", + "x": 1975.3572082519531, + "y": 616.2708282470703, + "z": "67a3081a.032478", "wires": [ [] ] }, { - "id": "ee75a5f3.d1d328", + "id": "7a4b792c.22588", "type": "other", "name": "deactivate", "xml": "<outcome value='deactivate'>\n", "comments": "", "outputs": 1, - "x": 664.1111145019531, - "y": 576.4136810302734, - "z": "cb3252c9.673b6", + "x": 647.5476379394531, + "y": 613.4136810302734, + "z": "67a3081a.032478", "wires": [ [ - "444b8a86.f0f0b4" + "72ac187b.b86c38" ] ] }, { - "id": "444b8a86.f0f0b4", + "id": "72ac187b.b86c38", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "outputs": 1, - "x": 845.3492736816406, - "y": 577.4138031005859, - "z": "cb3252c9.673b6", + "x": 828.7857971191406, + "y": 614.4138031005859, + "z": "67a3081a.032478", "wires": [ [ - "69a87518.69854c", - "142787bd.d3eaa8" + "a003c0d6.5a0d8", + "831644e8.e13cc" ] ] }, { - "id": "a1ea1a5a.119a28", + "id": "65e2e00c.98fae8", "type": "call", "name": "call GENERIC-RESOURCE-API:network-topology-operation-deactivate", "xml": "<call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-deactivate' mode='sync' >\n", "comments": "", "outputs": 1, - "x": 1998.4205932617188, - "y": 695.0208282470703, - "z": "cb3252c9.673b6", + "x": 1981.8571166992188, + "y": 732.0208282470703, + "z": "67a3081a.032478", "wires": [ [] ] }, { - "id": "906cbd9a.3bcc1", + "id": "b22e57ce.c6aee8", "type": "other", "name": "unassign", "xml": "<outcome value='unassign'>\n", "comments": "", "outputs": 1, - "x": 672.1111145019531, - "y": 641.4136810302734, - "z": "cb3252c9.673b6", + "x": 655.5476379394531, + "y": 678.4136810302734, + "z": "67a3081a.032478", "wires": [ [ - "78e21d22.3aa574" + "4894d2ca.1278e4" ] ] }, { - "id": "78e21d22.3aa574", + "id": "4894d2ca.1278e4", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "outputs": 1, - "x": 853.3492736816406, - "y": 642.4138031005859, - "z": "cb3252c9.673b6", + "x": 836.7857971191406, + "y": 679.4138031005859, + "z": "67a3081a.032478", "wires": [ [ - "69a87518.69854c", - "9de6fd5e.4ad14" + "a003c0d6.5a0d8", + "2108d22b.ae9926" ] ] }, { - "id": "6c5f5914.18dc18", + "id": "40a123a7.613904", "type": "call", "name": "call GENERIC-RESOURCE-API:network-topology-operation-unassign", "xml": "<call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-unassign' mode='sync' >\n", "comments": "", "outputs": 1, - "x": 2005.1705932617188, - "y": 807.7708282470703, - "z": "cb3252c9.673b6", + "x": 1988.6071166992188, + "y": 844.7708282470703, + "z": "67a3081a.032478", "wires": [ [] ] }, { - "id": "483543a0.87b2ec", + "id": "10c582cc.cfd665", "type": "other", "name": "other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 663.1111183166504, - "y": 701.4136714935303, - "z": "cb3252c9.673b6", + "x": 646.5476417541504, + "y": 738.4136714935303, + "z": "67a3081a.032478", "wires": [ [ - "a3c1c755.071638" + "9b7e6225.5d79d" ] ] }, { - "id": "a3c1c755.071638", + "id": "9b7e6225.5d79d", "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": 845.1111145019531, - "y": 700.4136810302734, - "z": "cb3252c9.673b6", + "x": 828.5476379394531, + "y": 737.4136810302734, + "z": "67a3081a.032478", "wires": [] }, { - "id": "1170a38.c1b8e5d", + "id": "f1b5981d.bfa858", "type": "set", "name": "Set final indicator to Y", "xml": "<set>\n<parameter name=\"ack-final\" value=\"Y\"/>", "comments": "", - "x": 475.2221984863281, - "y": 818.8581142425537, - "z": "cb3252c9.673b6", + "x": 458.6587219238281, + "y": 855.8581142425537, + "z": "67a3081a.032478", "wires": [] }, { - "id": "d9b3b70a.4d0258", + "id": "e4027dbf.f06578", "type": "for", "name": "for nidx..service-data.networks.network[]", "xml": "<for index='nidx' start='0' end='`$service-data.networks.network_length`' >\n", "comments": "", "outputs": 1, - "x": 1893.8414764404297, - "y": 473.1755828857422, - "z": "cb3252c9.673b6", + "x": 1877.2779998779297, + "y": 510.1755828857422, + "z": "67a3081a.032478", "wires": [ [ - "7ab3dce2.d045e4" + "ac917046.066bc" ] ] }, { - "id": "69a87518.69854c", + "id": "a003c0d6.5a0d8", "type": "switchNode", "name": "switch service-data.networks.network_length", "xml": "<switch test='`$service-data.networks.network_length`'>\n", "comments": "", "outputs": 1, - "x": 1227.5555725097656, - "y": 437.74696350097656, - "z": "cb3252c9.673b6", + "x": 1210.9920959472656, + "y": 474.74696350097656, + "z": "67a3081a.032478", "wires": [ [ - "1c5afa5b.117ca6", - "e5671ca3.48268" + "9e3ec1fd.ad5b98", + "47eae2b1.438c54" ] ] }, { - "id": "1c5afa5b.117ca6", + "id": "9e3ec1fd.ad5b98", "type": "other", "name": "outcome Null", "xml": "<outcome value=''>\n", "comments": "", "outputs": 1, - "x": 1470.5555114746094, - "y": 439.7469730377197, - "z": "cb3252c9.673b6", + "x": 1453.9920349121094, + "y": 476.7469730377197, + "z": "67a3081a.032478", "wires": [ [ - "88ef598e.91daa8" + "f460d6cb.ffd978" ] ] }, { - "id": "e5671ca3.48268", + "id": "47eae2b1.438c54", "type": "other", "name": "other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 1424.5555419921875, - "y": 472.7469940185547, - "z": "cb3252c9.673b6", + "x": 1407.9920654296875, + "y": 509.7469940185547, + "z": "67a3081a.032478", "wires": [ [ - "18cdb225.91a67e" + "e10cc477.9b0f2" ] ] }, { - "id": "7ab3dce2.d045e4", + "id": "ac917046.066bc", "type": "switchNode", "name": "switch networkid found", "xml": "<switch test=\"`$service-data.networks.network[$nidx].network-id == $network-topology-operation-input.network-information.network-id`\">\n\n", "comments": "", "outputs": 1, - "x": 2184.2700271606445, - "y": 472.42566680908203, - "z": "cb3252c9.673b6", + "x": 2167.7065505981445, + "y": 509.42566680908203, + "z": "67a3081a.032478", "wires": [ [ - "3a66da90.0e3556" + "6f4b90eb.3d488" ] ] }, { - "id": "3a66da90.0e3556", + "id": "6f4b90eb.3d488", "type": "outcomeTrue", "name": "true", "xml": "<outcome value='true'>\n", "comments": "", "outputs": 1, - "x": 2373.222381591797, - "y": 473.3184051513672, - "z": "cb3252c9.673b6", + "x": 2356.658905029297, + "y": 510.3184051513672, + "z": "67a3081a.032478", "wires": [ [ - "7d4e697f.fd23e8" + "9e191d8a.ab6c4" ] ] }, { - "id": "7d4e697f.fd23e8", + "id": "9e191d8a.ab6c4", "type": "set", "name": "set tmp.nidx and ctx.network-data", "xml": "<set>\n<parameter name='tmp.nidx' value='`$nidx`' />\n<parameter name='ctx.network-data.' value='`$service-data.networks.network[$nidx].`' />\n", "comments": "", - "x": 2606.754150390625, - "y": 472.0684127807617, - "z": "cb3252c9.673b6", + "x": 2590.190673828125, + "y": 509.0684127807617, + "z": "67a3081a.032478", "wires": [] }, { - "id": "cc47bcf0.238e4", + "id": "7b13cf65.3164b", "type": "comment", "name": "Find the index to service data for this network - save id in tmp.nidx, save service-data", "info": "", "comments": "", - "x": 1350.6666564941406, - "y": 406.74698638916016, - "z": "cb3252c9.673b6", + "x": 1334.1031799316406, + "y": 443.74698638916016, + "z": "67a3081a.032478", "wires": [] }, { - "id": "60b7d7a1.646f18", + "id": "1ed6801d.d2f0c8", "type": "comment", "name": "service-data will not be stored until we have a network-id", "info": "", "comments": "", - "x": 1193.7777099609375, - "y": 294.63589096069336, - "z": "cb3252c9.673b6", + "x": 1177.2142333984375, + "y": 331.63589096069336, + "z": "67a3081a.032478", "wires": [] }, { - "id": "88ef598e.91daa8", + "id": "f460d6cb.ffd978", "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=\"network-topology-operation-input.network-request-input.network-id not found in service-data\" />\n", "comments": "", - "x": 1662.3330688476562, - "y": 437.63597106933594, - "z": "cb3252c9.673b6", + "x": 1645.7695922851562, + "y": 474.63597106933594, + "z": "67a3081a.032478", "wires": [] }, { - "id": "18cdb225.91a67e", + "id": "e10cc477.9b0f2", "type": "block", "name": "block : atomic", "xml": "<block atomic=\"true\">", "atomic": "true", "outputs": 1, - "x": 1591.8255081176758, - "y": 472.301570892334, - "z": "cb3252c9.673b6", + "x": 1575.2620315551758, + "y": 509.301570892334, + "z": "67a3081a.032478", "wires": [ [ - "d9b3b70a.4d0258", - "46916c71.7511d4" + "e4027dbf.f06578", + "8872fa92.c2a47" ] ] }, { - "id": "46916c71.7511d4", + "id": "8872fa92.c2a47", "type": "switchNode", "name": "switch tmp.nidx ", "xml": "<switch test=\"`$tmp.nidx`\">\n\n", "comments": "", "outputs": 1, - "x": 1812.1429061889648, - "y": 515.1587896347046, - "z": "cb3252c9.673b6", + "x": 1795.5794296264648, + "y": 552.1587896347046, + "z": "67a3081a.032478", "wires": [ [ - "744b6bc1.2a0f74" + "90030fdf.45af7" ] ] }, { - "id": "570ef8cd.cbcb88", + "id": "6b0a8e46.af7a78", "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=\"network-topology-operation-input.network-request-input.network-id not found in service-data\" />\n", "comments": "", - "x": 2164.9998893737793, - "y": 510.87303161621094, - "z": "cb3252c9.673b6", + "x": 2148.4364128112793, + "y": 547.8730316162109, + "z": "67a3081a.032478", "wires": [] }, { - "id": "744b6bc1.2a0f74", + "id": "90030fdf.45af7", "type": "outcome", "name": "NULL", "xml": "<outcome value=''>\n", "comments": "", "outputs": 1, - "x": 1983.5714416503906, - "y": 513.7301750183105, - "z": "cb3252c9.673b6", + "x": 1967.0079650878906, + "y": 550.7301750183105, + "z": "67a3081a.032478", "wires": [ [ - "570ef8cd.cbcb88" + "6b0a8e46.af7a78" ] ] }, { - "id": "bd1a56c0.3e9138", + "id": "61a363af.ee55bc", "type": "switchNode", "name": "switch network-level-oper-status", "xml": "<switch test='`$service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`'>\n", "comments": "", "outputs": 1, - "x": 1204.888916015625, - "y": 579.2222290039062, - "z": "cb3252c9.673b6", + "x": 1188.325439453125, + "y": 616.2222290039062, + "z": "67a3081a.032478", "wires": [ [ - "f3be99d5.176a88", - "215ed9fd.338986" + "a0dc1668.8be6a8", + "e9825cb2.5deff" ] ] }, { - "id": "f3be99d5.176a88", + "id": "a0dc1668.8be6a8", "type": "outcome", "name": "outcome PendingCreate", "xml": "<outcome value='PendingCreate'>\n", "comments": "", "outputs": 1, - "x": 1569.8888956705723, - "y": 579.2222137451171, - "z": "cb3252c9.673b6", + "x": 1553.3254191080723, + "y": 616.2222137451171, + "z": "67a3081a.032478", "wires": [ [ - "68785460.4653ec" + "ee7e53d1.6aac9" ] ] }, { - "id": "215ed9fd.338986", + "id": "e9825cb2.5deff", "type": "other", "name": "other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 1519.8889427185059, - "y": 619.2222442626953, - "z": "cb3252c9.673b6", + "x": 1503.3254661560059, + "y": 656.2222442626953, + "z": "67a3081a.032478", "wires": [ [ - "598a9836.8dec38" + "44229861.ecaaa8" ] ] }, { - "id": "598a9836.8dec38", + "id": "44229861.ecaaa8", "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=\"`'Network is not in appropriate state for activate. Current state is ' + $service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`\" />", "comments": "", - "x": 1689.8889427185059, - "y": 619.2222442626953, - "z": "cb3252c9.673b6", + "x": 1673.3254661560059, + "y": 656.2222442626953, + "z": "67a3081a.032478", "wires": [] }, { - "id": "142787bd.d3eaa8", + "id": "831644e8.e13cc", "type": "switchNode", "name": "switch network-level-oper-status", "xml": "<switch test='`$service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`'>\n", "comments": "", "outputs": 1, - "x": 1212.1903991699219, - "y": 695.1736297607422, - "z": "cb3252c9.673b6", + "x": 1195.6269226074219, + "y": 732.1736297607422, + "z": "67a3081a.032478", "wires": [ [ - "ae28e421.942868", - "d2690a94.f5d8c8" + "1181976c.1aed59", + "1843fe0b.3bf1d2" ] ] }, { - "id": "ae28e421.942868", + "id": "1181976c.1aed59", "type": "outcome", "name": "outcome Created", "xml": "<outcome value='Created'>\n", "comments": "", "outputs": 1, - "x": 1575.1903686523438, - "y": 695.1736602783203, - "z": "cb3252c9.673b6", + "x": 1558.6268920898438, + "y": 732.1736602783203, + "z": "67a3081a.032478", "wires": [ [ - "a1ea1a5a.119a28" + "65e2e00c.98fae8" ] ] }, { - "id": "d2690a94.f5d8c8", + "id": "1843fe0b.3bf1d2", "type": "other", "name": "other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 1545.1903686523438, - "y": 735.1736602783203, - "z": "cb3252c9.673b6", + "x": 1528.6268920898438, + "y": 772.1736602783203, + "z": "67a3081a.032478", "wires": [ [ - "db8d6195.30425" + "420607f9.76c808" ] ] }, { - "id": "db8d6195.30425", + "id": "420607f9.76c808", "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=\"`'Network is not in appropriate state for deactivate. Current state is ' + $service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`\" />", "comments": "", - "x": 1711.1903686523438, - "y": 737.1736602783203, - "z": "cb3252c9.673b6", + "x": 1694.6268920898438, + "y": 774.1736602783203, + "z": "67a3081a.032478", "wires": [] }, { - "id": "9de6fd5e.4ad14", + "id": "2108d22b.ae9926", "type": "switchNode", "name": "switch network-level-oper-status", "xml": "<switch test='`$service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`'>\n", "comments": "", "outputs": 1, - "x": 1211.9919738769531, - "y": 809.3750305175781, - "z": "cb3252c9.673b6", + "x": 1195.4284973144531, + "y": 846.3750305175781, + "z": "67a3081a.032478", "wires": [ [ - "7e221c63.bc45a4", - "cf28440b.dda768", - "c3dda3f.4ff456" + "e2213711.520dd", + "6c464ada.030e1c", + "457e18b7.6ac5a8" ] ] }, { - "id": "7e221c63.bc45a4", + "id": "e2213711.520dd", "type": "outcome", "name": "outcome PendingCreate", "xml": "<outcome value='PendingCreate'>\n", "comments": "", "outputs": 1, - "x": 1571.991943359375, - "y": 809.3750610351562, - "z": "cb3252c9.673b6", + "x": 1555.428466796875, + "y": 846.3750610351562, + "z": "67a3081a.032478", "wires": [ [ - "6c5f5914.18dc18" + "40a123a7.613904" ] ] }, { - "id": "cf28440b.dda768", + "id": "6c464ada.030e1c", "type": "other", "name": "other", "xml": "<outcome value='Other'>\n", "comments": "", "outputs": 1, - "x": 1528.9918823242188, - "y": 893.3750762939453, - "z": "cb3252c9.673b6", + "x": 1512.4284057617188, + "y": 930.3750762939453, + "z": "67a3081a.032478", "wires": [ [ - "fbd25549.98f538" + "138a0d17.b239e3" ] ] }, { - "id": "fbd25549.98f538", + "id": "138a0d17.b239e3", "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=\"`'Network is not in appropriate state for unassign. Current state is ' + $service-data.networks.network[$tmp.nidx].network-data.network-level-oper-status.order-status`\" />", "comments": "", - "x": 1720.3253021240234, - "y": 892.0417051315308, - "z": "cb3252c9.673b6", + "x": 1703.7618255615234, + "y": 929.0417051315308, + "z": "67a3081a.032478", "wires": [] }, { - "id": "c3dda3f.4ff456", + "id": "457e18b7.6ac5a8", "type": "outcome", "name": "outcome PendingDelete", "xml": "<outcome value='PendingDelete'>\n", "comments": "", "outputs": 1, - "x": 1575.22216796875, - "y": 847.2222290039062, - "z": "cb3252c9.673b6", + "x": 1558.65869140625, + "y": 884.2222290039062, + "z": "67a3081a.032478", "wires": [ [ - "6c5f5914.18dc18" + "40a123a7.613904" ] ] + }, + { + "id": "de74faab.3a2ae", + "type": "other", + "name": "create", + "xml": "<outcome value='create'>\n", + "comments": "", + "outputs": 1, + "x": 644, + "y": 798, + "z": "67a3081a.032478", + "wires": [ + [ + "326c42d2.bec496" + ] + ] + }, + { + "id": "9bc3f97c.14bbf8", + "type": "other", + "name": "delete", + "xml": "<outcome value='delete'>\n", + "comments": "", + "outputs": 1, + "x": 647, + "y": 851, + "z": "67a3081a.032478", + "wires": [ + [ + "58d15587.e02aec" + ] + ] + }, + { + "id": "326c42d2.bec496", + "type": "block", + "name": "block : atomic", + "xml": "<block atomic=\"true\">", + "atomic": "true", + "outputs": 1, + "x": 833, + "y": 804, + "z": "67a3081a.032478", + "wires": [ + [ + "4ece5b87.0ed32c" + ] + ] + }, + { + "id": "58d15587.e02aec", + "type": "block", + "name": "block : atomic", + "xml": "<block atomic=\"true\">", + "atomic": "true", + "outputs": 1, + "x": 832, + "y": 863, + "z": "67a3081a.032478", + "wires": [ + [ + "b37ff23e.4b78c8" + ] + ] + }, + { + "id": "4ece5b87.0ed32c", + "type": "call", + "name": "call GENERIC-RESOURCE-API:network-topology-operation-create", + "xml": "<call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-create' mode='sync' >\n", + "comments": "", + "outputs": 1, + "x": 1241, + "y": 989, + "z": "67a3081a.032478", + "wires": [ + [] + ] + }, + { + "id": "b37ff23e.4b78c8", + "type": "call", + "name": "call GENERIC-RESOURCE-API:network-topology-operation-delete", + "xml": "<call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-delete' mode='sync' >\n", + "comments": "", + "outputs": 1, + "x": 1247, + "y": 1072, + "z": "67a3081a.032478", + "wires": [ + [] + ] } ] diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation.xml index ab398ce3..cb82d329 100755 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_network-topology-operation.xml @@ -97,7 +97,11 @@ <parameter name='ack-final' value='Y'/>
<parameter name="error-code" value="500" />
<parameter name="error-message" value="sdnc-request-header.svc-action is a required input" />
-</return></outcome></switch><set>
+</return></outcome><outcome value='create'>
+<block atomic="true"><call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-create' mode='sync' >
+</call></block></outcome><outcome value='delete'>
+<block atomic="true"><call module='GENERIC-RESOURCE-API' rpc='network-topology-operation-delete' mode='sync' >
+</call></block></outcome></switch><set>
<parameter name="ack-final" value="Y"/></set><return status='success'>
<parameter name="ack-final-indicator" value="Y" />
<parameter name="error-code" value="200" />
|