From: Dan Timoney Date: Fri, 19 Apr 2019 13:44:40 +0000 (+0000) Subject: Merge "vf module id validation removed from DG" X-Git-Tag: 1.5.1~25 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=a3d2214597a0031069e04981981102fd7851dac4;hp=d8f615d61224c4d76646f7e1be01746a462b902b;p=sdnc%2Foam.git Merge "vf module id validation removed from DG" Former-commit-id: fc6b5397529d984b897e6ce681f4257258bb9645 --- diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-pnf-ra-assignment.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-pnf-ra-assignment.json index 616ca732..d2164e72 100644 --- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-pnf-ra-assignment.json +++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-pnf-ra-assignment.json @@ -1,20 +1,20 @@ [ { - "id": "81013586.72b878", + "id": "a5295fa5.2cebc", "type": "dgstart", "name": "DGSTART", "outputs": 1, - "x": 152.5, - "y": 73.75, - "z": "2b4129e2.7e3f56", + "x": 105, + "y": 31, + "z": "b3572fdc.57a7c", "wires": [ [ - "16d29a69.fd75d6" + "91ec004b.fde43" ] ] }, { - "id": "16d29a69.fd75d6", + "id": "91ec004b.fde43", "type": "service-logic", "name": "GENERIC-RESOURCE-API ${project.version}", "module": "GENERIC-RESOURCE-API", @@ -22,1051 +22,1051 @@ "comments": "", "xml": "", "outputs": 1, - "x": 428.5, - "y": 74.75, - "z": "2b4129e2.7e3f56", + "x": 381, + "y": 32, + "z": "b3572fdc.57a7c", "wires": [ [ - "fb8a3acf.eacc88" + "8873b97.77d8048" ] ] }, { - "id": "fb8a3acf.eacc88", + "id": "8873b97.77d8048", "type": "method", "name": "self-serve-pnf-ra-assignment", "xml": "\n", "comments": "", "outputs": 1, - "x": 745.5, - "y": 74.75, - "z": "2b4129e2.7e3f56", + "x": 237, + "y": 82, + "z": "b3572fdc.57a7c", "wires": [ [ - "11ad89b0.4aa4c6" + "871f97d8.236f68" ] ] }, { - "id": "11ad89b0.4aa4c6", + "id": "871f97d8.236f68", "type": "block", "name": "block atomic", "xml": "\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 241.66664123535156, - "y": 155.0833339691162, - "z": "2b4129e2.7e3f56", + "x": 200.16664123535156, + "y": 133.3333339691162, + "z": "b3572fdc.57a7c", "wires": [ [ - "6a8abb82.762c24", - "d5ddf680.bc1228", - "d7d846c4.3b1898", - "62bc77a8.9608f8", - "ef795e5f.2b62e", - "cd9ccb1d.ad27d8", - "e4653dfe.029a3", - "ed802b4f.e3de88", - "4ae0bbb3.7d20c4", - "3049bbb0.b6b734", - "9eebb178.0f2de", - "507cc1d.a43bf4", - "22187a30.f13be6", - "c7fb6ab.3a33598", - "7905fcc3.ff7874" + "1d7f791b.bbebb7", + "809ef1f2.9d13a", + "dfab7c99.217af", + "e9a6ef1b.98436", + "36dea652.27073a", + "937d5326.69965", + "e221b302.f0199", + "864aa7c9.1f7118", + "2ad3fcee.93df44", + "3461757d.afec6a", + "b7b3409c.b7131", + "cb318b66.0796c8", + "3d6976b6.27f80a", + "94bf3501.be3848", + "a566a00c.4994a" ] ] }, { - "id": "d5ddf680.bc1228", + "id": "809ef1f2.9d13a", "type": "set", "name": "set", "xml": "\n \n \n \n \n \n", "comments": "", - "x": 427.4166603088379, - "y": 199.83333015441895, - "z": "2b4129e2.7e3f56", + "x": 385.9166603088379, + "y": 178.08333015441895, + "z": "b3572fdc.57a7c", "wires": [] }, { - "id": "1893855c.d16e5b", + "id": "961e1d7.52131e", "type": "get-resource", "name": "get-resource VF_MODEL", "xml": "\n \n\n", "comments": "", "outputs": 1, - "x": 966.3094635009766, - "y": 591.3689861297607, - "z": "2b4129e2.7e3f56", + "x": 924.8094635009766, + "y": 569.6189861297607, + "z": "b3572fdc.57a7c", "wires": [ [ - "a87dd4cc.178e18", - "ba66fea4.81fad", - "c6434f37.1962d" + "d57245a1.3d8f88", + "b3bcf1b9.7736d", + "8b4b4f46.8310f" ] ] }, { - "id": "a87dd4cc.178e18", + "id": "d57245a1.3d8f88", "type": "failure", "name": "failure", "xml": "\n", "comments": "", "outputs": 1, - "x": 1211.3095626831055, - "y": 540.654709815979, - "z": "2b4129e2.7e3f56", + "x": 1169.8095626831055, + "y": 518.904709815979, + "z": "b3572fdc.57a7c", "wires": [ [ - "ab46b2b3.a771c" + "e952f42f.db9b58" ] ] }, { - "id": "ab46b2b3.a771c", + "id": "e952f42f.db9b58", "type": "returnFailure", "name": "return failure", "xml": "\n\t\n\t\n \n", "comments": "", - "x": 1384.3095626831055, - "y": 539.654709815979, - "z": "2b4129e2.7e3f56", + "x": 1342.8095626831055, + "y": 517.904709815979, + "z": "b3572fdc.57a7c", "wires": [] }, { - "id": "879b8f8b.c19ed", + "id": "d8999389.3a4ec", "type": "set", "name": "set tmp.sdnc-model-name, tmp.sdnc-model-version, tmp.sdnc-artifact-name", "xml": "\n\n\n\n\n\n\n\n", "comments": "", - "x": 1586.7380638122559, - "y": 640.797513961792, - "z": "2b4129e2.7e3f56", + "x": 1545.2380638122559, + "y": 619.047513961792, + "z": "b3572fdc.57a7c", "wires": [] }, { - "id": "c7b5dfc8.8b235", + "id": "a316c173.c965a", "type": "returnFailure", "name": "return failure", "xml": "\n\t\n\t\n \n", "comments": "", "outputs": 1, - "x": 487.30946350097656, - "y": 592.3689861297607, - "z": "2b4129e2.7e3f56", + "x": 445.80946350097656, + "y": 570.6189861297607, + "z": "b3572fdc.57a7c", "wires": [ [ - "e98bb0b9.b2422" + "ea42d6d6.3100d8" ] ] }, { - "id": "ba66fea4.81fad", + "id": "b3bcf1b9.7736d", "type": "not-found", "name": "not-found", "xml": "\n", "comments": "", "outputs": 1, - "x": 1217.3095626831055, - "y": 589.654709815979, - "z": "2b4129e2.7e3f56", + "x": 1175.8095626831055, + "y": 567.904709815979, + "z": "b3572fdc.57a7c", "wires": [ [ - "c7b5dfc8.8b235" + "a316c173.c965a" ] ] }, { - "id": "e98bb0b9.b2422", + "id": "ea42d6d6.3100d8", "type": "outcome", "name": "true", "xml": "", "comments": "", "outputs": 1, - "x": 736.3094635009766, - "y": 592.3689861297607, - "z": "2b4129e2.7e3f56", + "x": 694.8094635009766, + "y": 570.6189861297607, + "z": "b3572fdc.57a7c", "wires": [ [ - "1893855c.d16e5b" + "961e1d7.52131e" ] ] }, { - "id": "62bc77a8.9608f8", + "id": "e9a6ef1b.98436", "type": "for", "name": "for pnf-topology-operation-input", "xml": "", "comments": "", "outputs": 1, - "x": 503.16664123535156, - "y": 392.0833339691162, - "z": "2b4129e2.7e3f56", + "x": 461.66664123535156, + "y": 370.3333339691162, + "z": "b3572fdc.57a7c", "wires": [ [ - "72f58635.66b448" + "13eb53e4.18313c" ] ] }, { - "id": "72f58635.66b448", + "id": "13eb53e4.18313c", "type": "block", "name": "block atomic", "xml": "", "atomic": "false", "comments": "", "outputs": 1, - "x": 725.1666412353516, - "y": 391.0833339691162, - "z": "2b4129e2.7e3f56", + "x": 683.6666412353516, + "y": 369.3333339691162, + "z": "b3572fdc.57a7c", "wires": [ [ - "86d3f258.93e3b" + "b51d5848.247668" ] ] }, { - "id": "d041de83.d9577", + "id": "9d71fcdf.711af", "type": "set", "name": "set tmp.sdnc-model-name", "xml": "\n\n", "comments": "", - "x": 1376.1666412353516, - "y": 324.0833339691162, - "z": "2b4129e2.7e3f56", + "x": 1334.6666412353516, + "y": 302.3333339691162, + "z": "b3572fdc.57a7c", "wires": [] }, { - "id": "2a96bf97.393f3", + "id": "6bfa0dba.32b084", "type": "outcome", "name": "sdnc_model_name", "xml": "\n", "comments": "", "outputs": 1, - "x": 1122.1666412353516, - "y": 324.0833339691162, - "z": "2b4129e2.7e3f56", + "x": 1080.6666412353516, + "y": 302.3333339691162, + "z": "b3572fdc.57a7c", "wires": [ [ - "d041de83.d9577" + "9d71fcdf.711af" ] ] }, { - "id": "86d3f258.93e3b", + "id": "b51d5848.247668", "type": "switchNode", "name": "switch", "xml": "\n\n", "comments": "", "outputs": 1, - "x": 884.1666412353516, - "y": 391.0833339691162, - "z": "2b4129e2.7e3f56", + "x": 842.6666412353516, + "y": 369.3333339691162, + "z": "b3572fdc.57a7c", "wires": [ [ - "2a96bf97.393f3", - "ff1ab59.1eb4148", - "733b67e2.c4f3c8", - "e6ecce71.c3cfb" + "6bfa0dba.32b084", + "51d582d0.51e8dc", + "3cc10349.41b40c", + "3f7b410a.8138ce" ] ] }, { - "id": "ff1ab59.1eb4148", + "id": "51d582d0.51e8dc", "type": "outcome", "name": "sdnc_model_version", "xml": "\n", "comments": "", "outputs": 1, - "x": 1125.1666412353516, - "y": 370.0833339691162, - "z": "2b4129e2.7e3f56", + "x": 1083.6666412353516, + "y": 348.3333339691162, + "z": "b3572fdc.57a7c", "wires": [ [ - "9cc66f84.f4ee2" + "86fc17c4.fccda8" ] ] }, { - "id": "733b67e2.c4f3c8", + "id": "3cc10349.41b40c", "type": "outcome", "name": "sdnc_artifact_name", "xml": "\n", "comments": "", "outputs": 1, - "x": 1124.1666412353516, - "y": 419.0833339691162, - "z": "2b4129e2.7e3f56", + "x": 1082.6666412353516, + "y": 397.3333339691162, + "z": "b3572fdc.57a7c", "wires": [ [ - "f2663e84.97046" + "259cc042.9d044" ] ] }, { - "id": "9cc66f84.f4ee2", + "id": "86fc17c4.fccda8", "type": "set", "name": "set tmp.sdnc-model-version", "xml": "\n\n\n", "comments": "", - "x": 1380.1666412353516, - "y": 370.0833339691162, - "z": "2b4129e2.7e3f56", + "x": 1338.6666412353516, + "y": 348.3333339691162, + "z": "b3572fdc.57a7c", "wires": [] }, { - "id": "f2663e84.97046", + "id": "259cc042.9d044", "type": "set", "name": "set tmp.sdnc-artifact-name", "xml": "\n\n\n", "comments": "", - "x": 1376.1666412353516, - "y": 419.0833339691162, - "z": "2b4129e2.7e3f56", + "x": 1334.6666412353516, + "y": 397.3333339691162, + "z": "b3572fdc.57a7c", "wires": [] }, { - "id": "ab5de2cd.b8552", + "id": "11646aa2.a63495", "type": "set", "name": "set name-value other JsonString", "xml": "\n\n\n", "comments": "", - "x": 1293.416648864746, - "y": 470.58335041999817, - "z": "2b4129e2.7e3f56", + "x": 1251.916648864746, + "y": 448.83335041999817, + "z": "b3572fdc.57a7c", "wires": [] }, { - "id": "e6ecce71.c3cfb", + "id": "3f7b410a.8138ce", "type": "outcome", "name": "other", "xml": "\n", "comments": "", "outputs": 1, - "x": 1084.166648864746, - "y": 468.6547546386719, - "z": "2b4129e2.7e3f56", + "x": 1042.666648864746, + "y": 446.9047546386719, + "z": "b3572fdc.57a7c", "wires": [ [ - "ab5de2cd.b8552" + "11646aa2.a63495" ] ] }, { - "id": "cd9ccb1d.ad27d8", + "id": "937d5326.69965", "type": "set", "name": "set configAssignment JsonString", "xml": "\n\n\n\n\n", "comments": "", - "x": 497.16664123535156, - "y": 711.0833339691162, - "z": "2b4129e2.7e3f56", + "x": 455.66664123535156, + "y": 689.3333339691162, + "z": "b3572fdc.57a7c", "wires": [] }, { - "id": "e4653dfe.029a3", + "id": "e221b302.f0199", "type": "execute", "name": "execute BlueprintProcessingClient", "xml": "\n \n \n \n \n \n \n \n ", "comments": "", "outputs": 1, - "x": 504.83331298828125, - "y": 865.75, - "z": "2b4129e2.7e3f56", + "x": 463.33331298828125, + "y": 844, + "z": "b3572fdc.57a7c", "wires": [ [ - "e9f0b05a.ea9a7", - "9906e0de.d8aa9" + "ca21c8f3.691628", + "1cca5644.52e2da" ] ] }, { - "id": "e9f0b05a.ea9a7", + "id": "ca21c8f3.691628", "type": "failure", "name": "failure", "xml": "\n", "comments": "", "outputs": 1, - "x": 744.8333129882812, - "y": 839.75, - "z": "2b4129e2.7e3f56", + "x": 703.3333129882812, + "y": 818, + "z": "b3572fdc.57a7c", "wires": [ [ - "f76d9cc.08daa6" + "cbb84843.6aa378" ] ] }, { - "id": "f76d9cc.08daa6", + "id": "cbb84843.6aa378", "type": "returnFailure", "name": "return failure", "xml": "\n\t\n\t\n \n", "comments": "", - "x": 926.8333129882812, - "y": 860.75, - "z": "2b4129e2.7e3f56", + "x": 885.3333129882812, + "y": 839, + "z": "b3572fdc.57a7c", "wires": [] }, { - "id": "4ae0bbb3.7d20c4", + "id": "2ad3fcee.93df44", "type": "for", "name": "for resource-accumulator-resolved-data loop", "xml": "\n", "comments": "", "outputs": 1, - "x": 529.1666412353516, - "y": 1083.083324432373, - "z": "2b4129e2.7e3f56", + "x": 487.66664123535156, + "y": 1061.333324432373, + "z": "b3572fdc.57a7c", "wires": [ [ - "f7dcae4c.80d6" + "2c3ea9bb.7f7946" ] ] }, { - "id": "a560f52e.73b478", + "id": "9d41528b.93ca8", "type": "set", "name": "set from resource-accumulator-resolved-data", "xml": "\n\t\n\t\n\t\n\t\n", "comments": "", - "x": 1759.1666412353516, - "y": 1135.083324432373, - "z": "2b4129e2.7e3f56", + "x": 1717.6666412353516, + "y": 1113.333324432373, + "z": "b3572fdc.57a7c", "wires": [] }, { - "id": "3049bbb0.b6b734", + "id": "3461757d.afec6a", "type": "for", "name": "for capability-data", "xml": "\n", "comments": "", "outputs": 1, - "x": 454.16664123535156, - "y": 1425.083324432373, - "z": "2b4129e2.7e3f56", + "x": 412.66664123535156, + "y": 1403.333324432373, + "z": "b3572fdc.57a7c", "wires": [ [ - "c321b6db.f91618" + "d627a27f.2cb5b" ] ] }, { - "id": "c321b6db.f91618", + "id": "d627a27f.2cb5b", "type": "for", "name": "for key-mapping", "xml": "", "comments": "", "outputs": 1, - "x": 663.1666412353516, - "y": 1425.083324432373, - "z": "2b4129e2.7e3f56", + "x": 621.6666412353516, + "y": 1403.333324432373, + "z": "b3572fdc.57a7c", "wires": [ [ - "4bdfbe92.58a07" + "216ffe0c.205142" ] ] }, { - "id": "ed802b4f.e3de88", + "id": "864aa7c9.1f7118", "type": "execute", "name": "execute jsonStringToCtx", - "xml": "\n\t\n\t\n\t\n\n", + "xml": "\n\t\n\t\n\t\n\n", "comments": "", "outputs": 1, - "x": 473.16664123535156, - "y": 1004.083324432373, - "z": "2b4129e2.7e3f56", + "x": 431.66664123535156, + "y": 982.333324432373, + "z": "b3572fdc.57a7c", "wires": [ [] ] }, { - "id": "6a8abb82.762c24", + "id": "1d7f791b.bbebb7", "type": "execute", "name": "execute generateUUID", "xml": " \n \n ", "comments": "", "outputs": 1, - "x": 479.16664123535156, - "y": 155.0833339691162, - "z": "2b4129e2.7e3f56", + "x": 437.66664123535156, + "y": 133.3333339691162, + "z": "b3572fdc.57a7c", "wires": [ [ - "da110978.037e18" + "760c8db3.569a74" ] ] }, { - "id": "da110978.037e18", + "id": "760c8db3.569a74", "type": "failure", "name": "failure", "xml": "\n", "comments": "", "outputs": 1, - "x": 657.1666412353516, - "y": 153.0833339691162, - "z": "2b4129e2.7e3f56", + "x": 615.6666412353516, + "y": 131.3333339691162, + "z": "b3572fdc.57a7c", "wires": [ [ - "25f8a570.76c1ea" + "7161cbe8.334ea4" ] ] }, { - "id": "25f8a570.76c1ea", + "id": "7161cbe8.334ea4", "type": "returnFailure", "name": "return failure", "xml": "\n\t\n\t\n \n", "comments": "", - "x": 804.1666412353516, - "y": 154.0833339691162, - "z": "2b4129e2.7e3f56", + "x": 762.6666412353516, + "y": 132.3333339691162, + "z": "b3572fdc.57a7c", "wires": [] }, { - "id": "b8f9dea4.7ec9d", + "id": "3ddac87b.4f3da8", "type": "for", "name": "for pnf-parameters-data.param[]", "xml": "\n", "comments": "", "outputs": 1, - "x": 1502.1666412353516, - "y": 1084.083324432373, - "z": "2b4129e2.7e3f56", + "x": 1460.6666412353516, + "y": 1062.333324432373, + "z": "b3572fdc.57a7c", "wires": [ [ - "9d5dafdb.8e745" + "20ea2728.c6c858" ] ] }, { - "id": "f7dcae4c.80d6", + "id": "2c3ea9bb.7f7946", "type": "block", "name": "block atomic", "xml": "", "atomic": "false", "comments": "", "outputs": 1, - "x": 808.1666412353516, - "y": 1084.083324432373, - "z": "2b4129e2.7e3f56", + "x": 766.6666412353516, + "y": 1062.333324432373, + "z": "b3572fdc.57a7c", "wires": [ [ - "4b875a14.db0584", - "a6645a90.aff8b8", - "ac27262.137afd8" + "c9a47a5b.74ce78", + "704f5605.ef2be8", + "e738ca50.9bb188" ] ] }, { - "id": "d7d846c4.3b1898", + "id": "dfab7c99.217af", "type": "switchNode", "name": "switch pnf-parameters-data.param_length", "xml": "\n", "comments": "", "outputs": 1, - "x": 531.1666412353516, - "y": 253.0833339691162, - "z": "2b4129e2.7e3f56", + "x": 489.66664123535156, + "y": 231.3333339691162, + "z": "b3572fdc.57a7c", "wires": [ [ - "270f1448.0f808c", - "df2ab314.6f53a" + "6b291f06.ba442", + "d14aa673.b0f938" ] ] }, { - "id": "270f1448.0f808c", + "id": "6b291f06.ba442", "type": "outcome", "name": "null", "xml": "", "comments": "", "outputs": 1, - "x": 769.1666412353516, - "y": 221.0833339691162, - "z": "2b4129e2.7e3f56", + "x": 727.6666412353516, + "y": 199.3333339691162, + "z": "b3572fdc.57a7c", "wires": [ [ - "bc1bcfe4.47473" + "c7a81447.af0e28" ] ] }, { - "id": "df2ab314.6f53a", + "id": "d14aa673.b0f938", "type": "other", "name": "other", "xml": "\n", "comments": "", "outputs": 1, - "x": 768.1666412353516, - "y": 285.0833339691162, - "z": "2b4129e2.7e3f56", + "x": 726.6666412353516, + "y": 263.3333339691162, + "z": "b3572fdc.57a7c", "wires": [ [ - "6ae0c2e2.e112ec" + "8406cee0.8a168" ] ] }, { - "id": "bc1bcfe4.47473", + "id": "c7a81447.af0e28", "type": "set", "name": "set pre service param len as 0", "xml": "\n \n \n", "comments": "", - "x": 982.1666412353516, - "y": 221.0833339691162, - "z": "2b4129e2.7e3f56", + "x": 940.6666412353516, + "y": 199.3333339691162, + "z": "b3572fdc.57a7c", "wires": [] }, { - "id": "6ae0c2e2.e112ec", + "id": "8406cee0.8a168", "type": "set", "name": "set pre service param len", "xml": "\n \n ", "comments": "", - "x": 967.1666412353516, - "y": 285.0833339691162, - "z": "2b4129e2.7e3f56", + "x": 925.6666412353516, + "y": 263.3333339691162, + "z": "b3572fdc.57a7c", "wires": [] }, { - "id": "9d5dafdb.8e745", + "id": "20ea2728.c6c858", "type": "switchNode", "name": "switch param[].name - input vs. jsonContextPrefix", "xml": "\n", "comments": "", "outputs": 1, - "x": 1881.1666412353516, - "y": 1084.083324432373, - "z": "2b4129e2.7e3f56", + "x": 1839.6666412353516, + "y": 1062.333324432373, + "z": "b3572fdc.57a7c", "wires": [ [ - "d54adb3d.c51348" + "1f97b8fe.14f627" ] ] }, { - "id": "d54adb3d.c51348", + "id": "1f97b8fe.14f627", "type": "not-found", "name": "true", "xml": "\n", "comments": "", "outputs": 1, - "x": 2165.1666412353516, - "y": 1084.083324432373, - "z": "2b4129e2.7e3f56", + "x": 2123.6666412353516, + "y": 1062.333324432373, + "z": "b3572fdc.57a7c", "wires": [ [ - "bf4269c.812a398" + "cfd1df65.8c421" ] ] }, { - "id": "bf4269c.812a398", + "id": "cfd1df65.8c421", "type": "set", "name": "set for existing param name", "xml": "\n\n\n", "comments": "", - "x": 2375.1666412353516, - "y": 1084.083324432373, - "z": "2b4129e2.7e3f56", + "x": 2333.6666412353516, + "y": 1062.333324432373, + "z": "b3572fdc.57a7c", "wires": [] }, { - "id": "ac27262.137afd8", + "id": "e738ca50.9bb188", "type": "switchNode", "name": "switch tmp.mso.param.found", "xml": "\n", "comments": "", "outputs": 1, - "x": 1050.1666412353516, - "y": 1136.083324432373, - "z": "2b4129e2.7e3f56", + "x": 1008.6666412353516, + "y": 1114.333324432373, + "z": "b3572fdc.57a7c", "wires": [ [ - "80869ef9.b42b6" + "5d54064f.f0a378" ] ] }, { - "id": "80869ef9.b42b6", + "id": "5d54064f.f0a378", "type": "not-found", "name": "false", "xml": "\n", "comments": "", "outputs": 1, - "x": 1284.1666412353516, - "y": 1135.083324432373, - "z": "2b4129e2.7e3f56", + "x": 1242.6666412353516, + "y": 1113.333324432373, + "z": "b3572fdc.57a7c", "wires": [ [ - "aa6d15b3.b54808" + "91cea0a0.32463" ] ] }, { - "id": "4b875a14.db0584", + "id": "c9a47a5b.74ce78", "type": "set", "name": "set for existing param name", "xml": "\n\n", "comments": "", - "x": 1031.6666412353516, - "y": 1022.5833282470703, - "z": "2b4129e2.7e3f56", + "x": 990.1666412353516, + "y": 1000.8333282470703, + "z": "b3572fdc.57a7c", "wires": [] }, { - "id": "a6645a90.aff8b8", + "id": "704f5605.ef2be8", "type": "switchNode", "name": "switch check length > 0", "xml": "\n", "comments": "", "outputs": 1, - "x": 1026.6666412353516, - "y": 1084.083324432373, - "z": "2b4129e2.7e3f56", + "x": 985.1666412353516, + "y": 1062.333324432373, + "z": "b3572fdc.57a7c", "wires": [ [ - "3e9847d7.a9a428" + "82f274ba.e58e48" ] ] }, { - "id": "3e9847d7.a9a428", + "id": "82f274ba.e58e48", "type": "not-found", "name": "true", "xml": "\n", "comments": "", "outputs": 1, - "x": 1273.6666412353516, - "y": 1084.083324432373, - "z": "2b4129e2.7e3f56", + "x": 1232.1666412353516, + "y": 1062.333324432373, + "z": "b3572fdc.57a7c", "wires": [ [ - "b8f9dea4.7ec9d" + "3ddac87b.4f3da8" ] ] }, { - "id": "b72432c2.1cb81", + "id": "c2b9329e.7b7fe", "type": "for", "name": "for payload", "xml": "", "comments": "", "outputs": 1, - "x": 1845.1666412353516, - "y": 1443.083324432373, - "z": "2b4129e2.7e3f56", + "x": 1803.6666412353516, + "y": 1421.333324432373, + "z": "b3572fdc.57a7c", "wires": [ [ - "8a6d87a5.167378" + "1973b2f9.8576bd" ] ] }, { - "id": "993132bf.1fc03", + "id": "9263a471.304a78", "type": "set", "name": "set resource-key", "xml": "\n\n\n\n", "comments": "", - "x": 2194.1666412353516, - "y": 1379.083324432373, - "z": "2b4129e2.7e3f56", + "x": 2152.6666412353516, + "y": 1357.333324432373, + "z": "b3572fdc.57a7c", "wires": [] }, { - "id": "92dd255a.846018", + "id": "bdc6e9e5.246078", "type": "set", "name": "set output-data ", "xml": "\n\n\n\n\n", "comments": "", - "x": 1418.1666412353516, - "y": 1323.083324432373, - "z": "2b4129e2.7e3f56", + "x": 1376.6666412353516, + "y": 1301.333324432373, + "z": "b3572fdc.57a7c", "wires": [] }, { - "id": "4bdfbe92.58a07", + "id": "216ffe0c.205142", "type": "for", "name": "for output-key-mapping", "xml": "", "comments": "", "outputs": 1, - "x": 886.1666412353516, - "y": 1425.083324432373, - "z": "2b4129e2.7e3f56", + "x": 844.6666412353516, + "y": 1403.333324432373, + "z": "b3572fdc.57a7c", "wires": [ [ - "c7cc9512.4faa18" + "d332f89d.5d7ed8" ] ] }, { - "id": "c7cc9512.4faa18", + "id": "d332f89d.5d7ed8", "type": "block", "name": "block atomic", "xml": "", "atomic": "false", "comments": "", "outputs": 1, - "x": 1137.1666412353516, - "y": 1425.083324432373, - "z": "2b4129e2.7e3f56", + "x": 1095.6666412353516, + "y": 1403.333324432373, + "z": "b3572fdc.57a7c", "wires": [ [ - "92dd255a.846018", - "17ff9631.56b25a", - "72c5b1f7.aa391", - "69144068.7c5f8" + "bdc6e9e5.246078", + "9a22b4d.28af748", + "14d775fb.50189a", + "d1982b17.6b7748" ] ] }, { - "id": "17ff9631.56b25a", + "id": "9a22b4d.28af748", "type": "set", "name": "set length", "xml": "\n\t\n", "comments": "", - "x": 1406.1666412353516, - "y": 1461.083324432373, - "z": "2b4129e2.7e3f56", + "x": 1364.6666412353516, + "y": 1439.333324432373, + "z": "b3572fdc.57a7c", "wires": [] }, { - "id": "9906e0de.d8aa9", + "id": "1cca5644.52e2da", "type": "failure", "name": "not-found", "xml": "\n", "comments": "", "outputs": 1, - "x": 749.8333129882812, - "y": 901.75, - "z": "2b4129e2.7e3f56", + "x": 708.3333129882812, + "y": 880, + "z": "b3572fdc.57a7c", "wires": [ [ - "f76d9cc.08daa6" + "cbb84843.6aa378" ] ] }, { - "id": "72c5b1f7.aa391", + "id": "14d775fb.50189a", "type": "switchNode", "name": "switch payload_length", "xml": "\n", "comments": "", "outputs": 1, - "x": 1442.1666412353516, - "y": 1394.083324432373, - "z": "2b4129e2.7e3f56", + "x": 1400.6666412353516, + "y": 1372.333324432373, + "z": "b3572fdc.57a7c", "wires": [ [ - "4ffaaf1f.506fd", - "797447ba.d290d8" + "abcb7f77.07548", + "2376e062.61cda" ] ] }, { - "id": "4ffaaf1f.506fd", + "id": "abcb7f77.07548", "type": "outcome", "name": "true", "xml": "", "comments": "", "outputs": 1, - "x": 1663.1666412353516, - "y": 1325.083324432373, - "z": "2b4129e2.7e3f56", + "x": 1621.6666412353516, + "y": 1303.333324432373, + "z": "b3572fdc.57a7c", "wires": [ [] ] }, { - "id": "797447ba.d290d8", + "id": "2376e062.61cda", "type": "other", "name": "false", "xml": "\n", "comments": "", "outputs": 1, - "x": 1670.1666412353516, - "y": 1443.083324432373, - "z": "2b4129e2.7e3f56", + "x": 1628.6666412353516, + "y": 1421.333324432373, + "z": "b3572fdc.57a7c", "wires": [ [ - "b72432c2.1cb81" + "c2b9329e.7b7fe" ] ] }, { - "id": "c6434f37.1962d", + "id": "8b4b4f46.8310f", "type": "success", "name": "success", "xml": "\n", "comments": "", "outputs": 1, - "x": 1213.4523658752441, - "y": 640.6546821594238, - "z": "2b4129e2.7e3f56", + "x": 1171.9523658752441, + "y": 618.9046821594238, + "z": "b3572fdc.57a7c", "wires": [ [ - "879b8f8b.c19ed" + "d8999389.3a4ec" ] ] }, { - "id": "831efa97.1c0588", + "id": "6b7f75ff.e599ec", "type": "set", "name": "set length", "xml": "\n\t\n", "comments": "", - "x": 2183.1666412353516, - "y": 1443.083324432373, - "z": "2b4129e2.7e3f56", + "x": 2141.6666412353516, + "y": 1421.333324432373, + "z": "b3572fdc.57a7c", "wires": [] }, { - "id": "da21f5c1.b6dc88", + "id": "adccc85e.eca3a8", "type": "set", "name": "increment length", "xml": "\n\t\n", "comments": "", - "x": 2201.1666412353516, - "y": 1517.083324432373, - "z": "2b4129e2.7e3f56", + "x": 2159.6666412353516, + "y": 1495.333324432373, + "z": "b3572fdc.57a7c", "wires": [] }, { - "id": "69144068.7c5f8", + "id": "d1982b17.6b7748", "type": "set", "name": "increment length", "xml": "\n\t\n\n", "comments": "", - "x": 1427.1666412353516, - "y": 1528.083324432373, - "z": "2b4129e2.7e3f56", + "x": 1385.6666412353516, + "y": 1506.333324432373, + "z": "b3572fdc.57a7c", "wires": [] }, { - "id": "aa6d15b3.b54808", + "id": "91cea0a0.32463", "type": "block", "name": "block : atomic", "xml": "", "atomic": "true", "comments": "", "outputs": 1, - "x": 1461.1666412353516, - "y": 1134.083324432373, - "z": "2b4129e2.7e3f56", + "x": 1419.6666412353516, + "y": 1112.333324432373, + "z": "b3572fdc.57a7c", "wires": [ [ - "a560f52e.73b478", - "2dccbddc.c39b12" + "9d41528b.93ca8", + "2b6854a1.91680c" ] ] }, { - "id": "2dccbddc.c39b12", + "id": "2b6854a1.91680c", "type": "set", "name": "increment length", "xml": "\n\t\n", "comments": "", - "x": 1676.1666412353516, - "y": 1194.083324432373, - "z": "2b4129e2.7e3f56", + "x": 1634.6666412353516, + "y": 1172.333324432373, + "z": "b3572fdc.57a7c", "wires": [] }, { - "id": "8a6d87a5.167378", + "id": "1973b2f9.8576bd", "type": "block", "name": "block atomic", "xml": "", "atomic": "false", "comments": "", "outputs": 1, - "x": 2001.1666412353516, - "y": 1444.083324432373, - "z": "2b4129e2.7e3f56", + "x": 1959.6666412353516, + "y": 1422.333324432373, + "z": "b3572fdc.57a7c", "wires": [ [ - "993132bf.1fc03", - "831efa97.1c0588", - "da21f5c1.b6dc88" + "9263a471.304a78", + "6b7f75ff.e599ec", + "adccc85e.eca3a8" ] ] }, { - "id": "9eebb178.0f2de", + "id": "b7b3409c.b7131", "type": "record", "name": "record", "xml": "\n\n\n\n", "comments": "", "outputs": 1, - "x": 427.4999809265137, - "y": 787.083324432373, - "z": "2b4129e2.7e3f56", + "x": 385.9999809265137, + "y": 765.333324432373, + "z": "b3572fdc.57a7c", "wires": [ [] ] }, { - "id": "507cc1d.a43bf4", + "id": "cb318b66.0796c8", "type": "record", "name": "record", "xml": "\n\n\n\n", "comments": "", "outputs": 1, - "x": 424.1666488647461, - "y": 942.0833320617676, - "z": "2b4129e2.7e3f56", + "x": 382.6666488647461, + "y": 920.3333320617676, + "z": "b3572fdc.57a7c", "wires": [ [] ] }, { - "id": "c7fb6ab.3a33598", + "id": "94bf3501.be3848", "type": "execute", "name": "printContext", "xml": "\n\n", "comments": "", "outputs": 1, - "x": 432.50000762939453, - "y": 1746.2500267028809, - "z": "2b4129e2.7e3f56", + "x": 391.00000762939453, + "y": 1724.5000267028809, + "z": "b3572fdc.57a7c", "wires": [ [] ] }, { - "id": "22187a30.f13be6", + "id": "3d6976b6.27f80a", "type": "set", "name": "set pathname", "xml": "\n\n", "comments": "", - "x": 438.75000762939453, - "y": 1693.7500247955322, - "z": "2b4129e2.7e3f56", + "x": 397.25000762939453, + "y": 1672.0000247955322, + "z": "b3572fdc.57a7c", "wires": [] }, { - "id": "7905fcc3.ff7874", + "id": "a566a00c.4994a", "type": "record", "name": "record", "xml": "\n\n\n\n", "comments": "", "outputs": 1, - "x": 416.25000381469727, - "y": 1647.5000247955322, - "z": "2b4129e2.7e3f56", + "x": 374.75000381469727, + "y": 1625.7500247955322, + "z": "b3572fdc.57a7c", "wires": [ [] ] diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vfmodule-ra-assignment.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vfmodule-ra-assignment.json index bfce76d7..9f86a0e4 100644 --- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vfmodule-ra-assignment.json +++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vfmodule-ra-assignment.json @@ -366,7 +366,7 @@ "id": "b3fed148.ab4d6", "type": "execute", "name": "execute jsonStringToCtx", - "xml": "\n\t\n\t\n\t\n\n", + "xml": "\n\t\n\t\n\t\n\n", "comments": "", "outputs": 1, "x": 362.00001525878906, diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vnf-ra-assignment.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vnf-ra-assignment.json index dcefe64d..97111877 100644 --- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vnf-ra-assignment.json +++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_self-serve-vnf-ra-assignment.json @@ -482,7 +482,7 @@ "id": "a269720d.c1b3c", "type": "execute", "name": "execute jsonStringToCtx", - "xml": "\n\t\n\t\n\t\n\n", + "xml": "\n\t\n\t\n\t\n\n", "comments": "", "outputs": 1, "x": 417.66664123535156, diff --git a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vf-module-topology-operation.json b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vf-module-topology-operation.json index b1920a25..b8819dd3 100644 --- a/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vf-module-topology-operation.json +++ b/platform-logic/generic-resource-api/src/main/json/GENERIC-RESOURCE-API_vf-module-topology-operation.json @@ -1,20 +1,20 @@ [ { - "id": "89e51e9a.af64e", + "id": "8a97ec5a.e8724", "type": "dgstart", "name": "DGSTART", "outputs": 1, - "x": 107.00390625, - "y": 88.41365686058998, - "z": "3e6c75a5.b69bda", + "x": 147.01040649414062, + "y": 86.41365575790405, + "z": "85ee3913.3987f8", "wires": [ [ - "a0ef042f.2b7ad8" + "7092e500.65d96c" ] ] }, { - "id": "a0ef042f.2b7ad8", + "id": "7092e500.65d96c", "type": "service-logic", "name": "GENERIC-RESOURCE-API ${project.version}", "module": "GENERIC-RESOURCE-API", @@ -22,1294 +22,1230 @@ "comments": "", "xml": "", "outputs": 1, - "x": 220.28961181640625, - "y": 128.65176835656166, - "z": "3e6c75a5.b69bda", + "x": 260.2961120605469, + "y": 126.65176725387573, + "z": "85ee3913.3987f8", "wires": [ [ - "a57a3919.3af3c8" + "975074db.12b248" ] ] }, { - "id": "a57a3919.3af3c8", + "id": "975074db.12b248", "type": "method", "name": "method vf-module-topology-operation", "xml": "\n", "comments": "", "outputs": 1, - "x": 194.43253326416016, - "y": 168.41365113854408, - "z": "3e6c75a5.b69bda", + "x": 234.43903350830078, + "y": 166.41365003585815, + "z": "85ee3913.3987f8", "wires": [ [ - "8614ae38.109ab" + "6ba66072.d698d" ] ] }, { - "id": "38a58e7b.28bdc2", + "id": "c5d72244.65ac2", "type": "comment", "name": "vf-module-topology-operation", "info": "", "comments": "", - "x": 501.34876251220703, - "y": 36.00000062584877, - "z": "3e6c75a5.b69bda", + "x": 541.3552627563477, + "y": 33.99999952316284, + "z": "85ee3913.3987f8", "wires": [] }, { - "id": "8614ae38.109ab", + "id": "6ba66072.d698d", "type": "block", "name": "block : atomic", "xml": "", "atomic": "true", "outputs": 1, - "x": 176.50394439697266, - "y": 407.7738291323185, - "z": "3e6c75a5.b69bda", + "x": 216.51044464111328, + "y": 405.77382802963257, + "z": "85ee3913.3987f8", "wires": [ [ - "53a601da.db57d", - "f371244d.9451a8", - "c9966ea2.57b1d" + "bff84223.52b62", + "bb77dcde.97b13", + "71a0804b.8983d" ] ] }, { - "id": "53a601da.db57d", + "id": "bff84223.52b62", "type": "returnSuccess", "name": "return success", "xml": "\n\n\n\n", "comments": "", - "x": 462.0039367675781, - "y": 581.2712179720402, - "z": "3e6c75a5.b69bda", + "x": 502.01043701171875, + "y": 579.2712168693542, + "z": "85ee3913.3987f8", "wires": [] }, { - "id": "f371244d.9451a8", + "id": "bb77dcde.97b13", "type": "switchNode", "name": "switch svc-action", "xml": "\n", "comments": "", "outputs": 1, - "x": 472.9085464477539, - "y": 405.98505368828773, - "z": "3e6c75a5.b69bda", + "x": 512.9150466918945, + "y": 403.9850525856018, + "z": "85ee3913.3987f8", "wires": [ [ - "dc31bef9.f164b", - "1b121869.8a1878", - "320a19eb.21afb6", - "db7b02d4.3e117", - "b369a934.e11c08", - "8734e4a2.e72ad8", - "bcf05aca.9cd8e8", - "c7064bfe.3bb108", - "5dfbbd6.4b80544" + "d56401a4.01d66", + "ad92b387.5520d", + "9ce981c8.a135f", + "aabf716e.1d0df", + "4bf064de.ff298c", + "a756f30b.6c1cb", + "201f4d37.e91032", + "2b26c4c1.602edc" ] ] }, { - "id": "dc31bef9.f164b", + "id": "d56401a4.01d66", "type": "outcome", "name": "assign", "xml": "\n", "comments": "", "outputs": 1, - "x": 682.3848266601562, - "y": 296.27089086174965, - "z": "3e6c75a5.b69bda", + "x": 722.3913269042969, + "y": 294.2708897590637, + "z": "85ee3913.3987f8", "wires": [ [ - "d462656f.1ce878" + "481f6fe3.cdf5a" ] ] }, { - "id": "1b121869.8a1878", + "id": "ad92b387.5520d", "type": "outcome", "name": "unassign", "xml": "\n", "comments": "", "outputs": 1, - "x": 690.765811920166, - "y": 442.46158280968666, - "z": "3e6c75a5.b69bda", + "x": 730.7723121643066, + "y": 440.46158170700073, + "z": "85ee3913.3987f8", "wires": [ [ - "52d55f39.2254f" + "bb1cd6a8.6e06d8" ] ] }, { - "id": "320a19eb.21afb6", + "id": "9ce981c8.a135f", "type": "other", "name": "other", "xml": "\n", "comments": "", "outputs": 1, - "x": 678.4806060791016, - "y": 1848.9855699539185, - "z": "3e6c75a5.b69bda", + "x": 670.486686706543, + "y": 1670.985191822052, + "z": "85ee3913.3987f8", "wires": [ [ - "aa8c9f07.7e876" + "c834b9f2.d6f188" ] ] }, { - "id": "aa8c9f07.7e876", + "id": "c834b9f2.d6f188", "type": "returnFailure", "name": "return failure", "xml": "\n\t\n\t\n \n", "comments": "", - "x": 872.6710319519043, - "y": 1848.9856386184692, - "z": "3e6c75a5.b69bda", + "x": 864.6771125793457, + "y": 1670.9852604866028, + "z": "85ee3913.3987f8", "wires": [] }, { - "id": "c9966ea2.57b1d", + "id": "71a0804b.8983d", "type": "call", "name": "call GENERIC-RESOURCE-API:validate-vf-module-input", "xml": "\n", "comments": "", "outputs": 1, - "x": 592.0871887207031, - "y": 245.79471364617348, - "z": "3e6c75a5.b69bda", + "x": 632.0936889648438, + "y": 243.79471254348755, + "z": "85ee3913.3987f8", "wires": [ [] ] }, { - "id": "d462656f.1ce878", + "id": "481f6fe3.cdf5a", "type": "call", "name": "call GENERIC-RESOURCE-API:vf-module-topology-operation-assign", "xml": "\n", "comments": "", "outputs": 1, - "x": 1054.527660369873, - "y": 295.84235540032387, - "z": "3e6c75a5.b69bda", + "x": 1094.5341606140137, + "y": 293.84235429763794, + "z": "85ee3913.3987f8", "wires": [ [] ] }, { - "id": "1a8dc80f.d90c48", + "id": "a7175f3d.aa415", "type": "call", "name": "call GENERIC-RESOURCE-API:vf-module-topology-operation-deactivate", "xml": "\n", "comments": "", "outputs": 1, - "x": 1066.5276184082031, - "y": 392.50899854302406, - "z": "3e6c75a5.b69bda", + "x": 1106.5341186523438, + "y": 390.50899744033813, + "z": "85ee3913.3987f8", "wires": [ [] ] }, { - "id": "52d55f39.2254f", + "id": "bb1cd6a8.6e06d8", "type": "call", "name": "call GENERIC-RESOURCE-API:vf-module-topology-operation-unassign", "xml": "\n", "comments": "", "outputs": 1, - "x": 1060.8608894348145, - "y": 442.17571797966957, - "z": "3e6c75a5.b69bda", + "x": 1100.867389678955, + "y": 440.17571687698364, + "z": "85ee3913.3987f8", "wires": [ [] ] }, { - "id": "e3a2c358.113df", + "id": "a7404f76.f0514", "type": "outcome", "name": "deactivate", "xml": "\n", "comments": "", "outputs": 1, - "x": 694.8609046936035, - "y": 393.1756722033024, - "z": "3e6c75a5.b69bda", + "x": 734.8674049377441, + "y": 391.17567110061646, + "z": "85ee3913.3987f8", "wires": [ [ - "1a8dc80f.d90c48" + "a7175f3d.aa415" ] ] }, { - "id": "db7b02d4.3e117", + "id": "aabf716e.1d0df", "type": "outcome", "name": "changeassign", "xml": "\n", "comments": "", "outputs": 1, - "x": 705.3372268676758, - "y": 490.0803124010563, - "z": "3e6c75a5.b69bda", + "x": 745.3437271118164, + "y": 488.08031129837036, + "z": "85ee3913.3987f8", "wires": [ [ - "f258fd95.0fe79" + "8e6a8b07.9cfd08" ] ] }, { - "id": "f258fd95.0fe79", + "id": "8e6a8b07.9cfd08", "type": "call", "name": "call GENERIC-RESOURCE-API:vf-module-topology-operation-changeassign", "xml": "\n", "comments": "", "outputs": 1, - "x": 1074.4322967529297, - "y": 489.7944485247135, - "z": "3e6c75a5.b69bda", + "x": 1114.4387969970703, + "y": 487.7944474220276, + "z": "85ee3913.3987f8", "wires": [ [] ] }, { - "id": "b369a934.e11c08", + "id": "4bf064de.ff298c", "type": "outcome", "name": "create", "xml": "\n", "comments": "", "outputs": 1, - "x": 700.0041465759277, - "y": 691.4137353897095, - "z": "3e6c75a5.b69bda", + "x": 731.0104064941406, + "y": 686.413655757904, + "z": "85ee3913.3987f8", "wires": [ [ - "ba7564f.359ed98" + "856b20f2.dd3e" ] ] }, { - "id": "2c4e26db.d2576a", + "id": "4a0f3f1f.e154f", "type": "switchNode", "name": "switch request-action", "xml": "", "comments": "", "outputs": 1, - "x": 940.3377494812012, - "y": 743.0000324249268, - "z": "3e6c75a5.b69bda", + "x": 969.3440093994141, + "y": 694.0000189244747, + "z": "85ee3913.3987f8", "wires": [ [ - "3d832a02.563396", - "1104c91d.350e07", - "f844d17c.4dd8f", - "48cd140e.14f35c", - "b370d981.a636e8", - "6fc07521.c03a0c" + "61a8036d.49151c", + "9df20938.7cb218", + "e668ec20.ba224", + "e9946938.94da68", + "17aebe0e.08da62", + "6c28f181.61b7c" ] ] }, { - "id": "1104c91d.350e07", + "id": "9df20938.7cb218", "type": "outcome", "name": "CreateSiteInstance", "xml": "", "comments": "", "outputs": 1, - "x": 1198.8141288757324, - "y": 689.4793787002563, - "z": "3e6c75a5.b69bda", + "x": 1226.8203773498535, + "y": 603.4793815612793, + "z": "85ee3913.3987f8", "wires": [ [ - "20db622e.dd2f7e" + "c35bc84f.6dd758" ] ] }, { - "id": "3d832a02.563396", + "id": "61a8036d.49151c", "type": "other", "name": "other", "xml": "\n", "comments": "", "outputs": 1, - "x": 1140.7185325622559, - "y": 826.8572956621647, - "z": "3e6c75a5.b69bda", + "x": 1169.7247924804688, + "y": 777.8572821617126, + "z": "85ee3913.3987f8", "wires": [ [ - "66bc9e9c.1ac1f" + "35631ae7.723fc6" ] ] }, { - "id": "ba7564f.359ed98", + "id": "856b20f2.dd3e", "type": "block", "name": "block : atomic", "xml": "", "atomic": "true", "outputs": 1, - "x": 890.3373947143555, - "y": 688.0001001358032, - "z": "3e6c75a5.b69bda", + "x": 917.3439254760742, + "y": 614.0000205039978, + "z": "85ee3913.3987f8", "wires": [ [ - "2c4e26db.d2576a" + "4a0f3f1f.e154f", + "e795cb52.6c6f98" ] ] }, { - "id": "20db622e.dd2f7e", + "id": "c35bc84f.6dd758", "type": "call", "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-site-create", "xml": "\n", "comments": "", "outputs": 1, - "x": 1655.3379516601562, - "y": 687.0001611709595, - "z": "3e6c75a5.b69bda", + "x": 1683.3442001342773, + "y": 601.0001640319824, + "z": "85ee3913.3987f8", "wires": [ [] ] }, { - "id": "66bc9e9c.1ac1f", + "id": "35631ae7.723fc6", "type": "block", "name": "block", "xml": "\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1294.0041847229004, - "y": 826.9136921465397, - "z": "3e6c75a5.b69bda", + "x": 1323.0104446411133, + "y": 777.9136786460876, + "z": "85ee3913.3987f8", "wires": [ [] ] }, { - "id": "f844d17c.4dd8f", + "id": "e668ec20.ba224", "type": "outcome", "name": "CreateSDWANPortInstance", "xml": "", "comments": "", "outputs": 1, - "x": 1204.6709251403809, - "y": 785.247186332941, - "z": "3e6c75a5.b69bda", + "x": 1233.6771850585938, + "y": 736.247172832489, + "z": "85ee3913.3987f8", "wires": [ [ - "b6270252.07dee" + "93c38881.fc6c68" ] ] }, { - "id": "b6270252.07dee", + "id": "93c38881.fc6c68", "type": "call", "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-wanport-create", "xml": "\n", "comments": "", "outputs": 1, - "x": 1677.194622039795, - "y": 784.767938286066, - "z": "3e6c75a5.b69bda", + "x": 1706.2008819580078, + "y": 735.767924785614, + "z": "85ee3913.3987f8", "wires": [ [] ] }, { - "id": "48cd140e.14f35c", + "id": "e9946938.94da68", "type": "outcome", "name": "CreateSDWANDeviceInstance", "xml": "", "comments": "", "outputs": 1, - "x": 1214.0352592468262, - "y": 742.4451303482056, - "z": "3e6c75a5.b69bda", + "x": 1242.0415077209473, + "y": 656.4451332092285, + "z": "85ee3913.3987f8", "wires": [ [ - "3b11278c.bb8c38" + "f8aa9b06.01e4b8" ] ] }, { - "id": "3b11278c.bb8c38", + "id": "f8aa9b06.01e4b8", "type": "call", "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-device-create", "xml": "\n", "comments": "", "outputs": 1, - "x": 1669.5590476989746, - "y": 741.9659996032715, - "z": "3e6c75a5.b69bda", + "x": 1697.5652961730957, + "y": 655.9660024642944, + "z": "85ee3913.3987f8", "wires": [ [] ] }, { - "id": "b370d981.a636e8", + "id": "17aebe0e.08da62", "type": "outcome", "name": "CreateSDWANVpnInstance", "xml": "", "comments": "", "outputs": 1, - "x": 1233.0039367675781, - "y": 594.4136924743652, - "z": "3e6c75a5.b69bda", + "x": 1272.010425567627, + "y": 555.4137077331543, + "z": "85ee3913.3987f8", "wires": [ [ - "657379da.c01418" + "3571e5b5.b5fc8a" ] ] }, { - "id": "657379da.c01418", + "id": "3571e5b5.b5fc8a", "type": "call", "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-vpn-create", "xml": "\n", "comments": "", "outputs": 1, - "x": 1641.5277099609375, - "y": 591.9344596862793, - "z": "3e6c75a5.b69bda", + "x": 1680.5341987609863, + "y": 552.9344749450684, + "z": "85ee3913.3987f8", "wires": [ [] ] }, { - "id": "8734e4a2.e72ad8", + "id": "a756f30b.6c1cb", "type": "outcome", "name": "activate", "xml": "\n", "comments": "", "outputs": 1, - "x": 691.0042190551758, - "y": 978.746994972229, - "z": "3e6c75a5.b69bda", + "x": 721.0104064941406, + "y": 881.7469687461853, + "z": "85ee3913.3987f8", "wires": [ [ - "f1db3d76.89225" + "3edd603.8e265a" ] ] }, { - "id": "cdd2825f.5d09c", + "id": "a5f22e70.04f1a", "type": "outcome", "name": "ActivateSiteInstance", "xml": "", "comments": "", "outputs": 1, - "x": 1182.1472473144531, - "y": 978.6459150314331, - "z": "3e6c75a5.b69bda", + "x": 1212.153434753418, + "y": 881.6458888053894, + "z": "85ee3913.3987f8", "wires": [ [ - "2a41522d.67a51e" + "ce7332d1.0ac03" ] ] }, { - "id": "f1db3d76.89225", + "id": "3edd603.8e265a", "type": "block", "name": "block : atomic", "xml": "", "atomic": "true", "outputs": 1, - "x": 871.6709899902344, - "y": 974.1666717529297, - "z": "3e6c75a5.b69bda", + "x": 901.6771774291992, + "y": 877.166645526886, + "z": "85ee3913.3987f8", "wires": [ [ - "7f5f8826.961548" + "91a235a8.4c9e08" ] ] }, { - "id": "2a41522d.67a51e", + "id": "ce7332d1.0ac03", "type": "call", "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-site-activate", "xml": "\n", "comments": "", "outputs": 1, - "x": 1555.6710510253906, - "y": 977.1666975021362, - "z": "3e6c75a5.b69bda", + "x": 1585.6772384643555, + "y": 880.1666712760925, + "z": "85ee3913.3987f8", "wires": [ [] ] }, { - "id": "e3a84270.80d99", + "id": "f2fcfc7e.d1ffa", "type": "outcome", "name": "ActivateSDWANDeviceInstance", "xml": "", "comments": "", "outputs": 1, - "x": 1210.3377075195312, - "y": 1027.6667370796204, - "z": "3e6c75a5.b69bda", + "x": 1240.343894958496, + "y": 930.6667108535767, + "z": "85ee3913.3987f8", "wires": [ [ - "5a26eb28.451874" + "c9db1dea.dfbf5" ] ] }, { - "id": "5a26eb28.451874", + "id": "c9db1dea.dfbf5", "type": "call", "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-device-activate", "xml": "\n", "comments": "", "outputs": 1, - "x": 1645.8614044189453, - "y": 1027.1875095367432, - "z": "3e6c75a5.b69bda", + "x": 1675.8675918579102, + "y": 930.1874833106995, + "z": "85ee3913.3987f8", "wires": [ [] ] }, { - "id": "a4f9d63b.494d98", + "id": "f410619e.7b2af", "type": "call", "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-wanport-activate", "xml": "\n", "comments": "", "outputs": 1, - "x": 1650.3375396728516, - "y": 1072.6666593551636, - "z": "3e6c75a5.b69bda", + "x": 1674.3437194824219, + "y": 1015.6666650772095, + "z": "85ee3913.3987f8", "wires": [ [] ] }, { - "id": "c8acd26d.1e739", + "id": "b65d5517.761218", "type": "outcome", "name": "ActivateSDWANPortInstance", "xml": "", "comments": "", "outputs": 1, - "x": 1214.8138427734375, - "y": 1073.1458868980408, - "z": "3e6c75a5.b69bda", + "x": 1238.8200225830078, + "y": 1016.1458926200867, + "z": "85ee3913.3987f8", "wires": [ [ - "a4f9d63b.494d98" + "f410619e.7b2af" ] ] }, { - "id": "7f5f8826.961548", + "id": "91a235a8.4c9e08", "type": "switchNode", "name": "switch request-action", "xml": "", "comments": "", "outputs": 1, - "x": 922.0042114257812, - "y": 1024.746958732605, - "z": "3e6c75a5.b69bda", + "x": 978.0104064941406, + "y": 943.7469687461853, + "z": "85ee3913.3987f8", "wires": [ [ - "cdd2825f.5d09c", - "e3a84270.80d99", - "c8acd26d.1e739", - "58bf71df.40217", - "e2c3c98a.638358", - "7eb3a13c.fe01" + "a5f22e70.04f1a", + "f2fcfc7e.d1ffa", + "b65d5517.761218", + "631e788a.5ef948", + "b5cf8a8f.31ae38", + "25d6d260.b0230e" ] ] }, { - "id": "58bf71df.40217", + "id": "631e788a.5ef948", "type": "other", "name": "other", "xml": "\n", "comments": "", "outputs": 1, - "x": 1146.5757064819336, - "y": 1121.958472251892, - "z": "3e6c75a5.b69bda", + "x": 1170.581886291504, + "y": 1064.958477973938, + "z": "85ee3913.3987f8", "wires": [ [ - "9491c86f.faa978" + "c987f934.5e8db8" ] ] }, { - "id": "e2c3c98a.638358", + "id": "b5cf8a8f.31ae38", "type": "outcome", "name": "ActivateSDWANVpnInstance", "xml": "\n", "comments": "", "outputs": 1, - "x": 1225.0041465759277, - "y": 888.7469822466373, - "z": "3e6c75a5.b69bda", + "x": 1254.0104064941406, + "y": 839.7469687461853, + "z": "85ee3913.3987f8", "wires": [ [ - "3b1f1b03.8cdd84" + "e540db1.fcd5d28" ] ] }, { - "id": "3b1f1b03.8cdd84", + "id": "e540db1.fcd5d28", "type": "call", "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-vpn-activate", "xml": "\n", "comments": "", "outputs": 1, - "x": 1640.5279502868652, - "y": 882.2677589952946, - "z": "3e6c75a5.b69bda", + "x": 1669.5342102050781, + "y": 833.2677454948425, + "z": "85ee3913.3987f8", "wires": [ [] ] }, { - "id": "bcf05aca.9cd8e8", + "id": "201f4d37.e91032", "type": "outcome", "name": "deactivate", "xml": "\n", "comments": "", "outputs": 1, - "x": 685.0042686462402, - "y": 1232.7470879554749, - "z": "3e6c75a5.b69bda", + "x": 705.0103988647461, + "y": 1167.7470617294312, + "z": "85ee3913.3987f8", "wires": [ [ - "eace7410.b0c1f8" + "389867bf.2284f8" ] ] }, { - "id": "5e7397b3.dab7a8", + "id": "c7aad7d3.fb5618", "type": "outcome", "name": "DeactivateSiteInstance", "xml": "", "comments": "", "outputs": 1, - "x": 1178.1472778320312, - "y": 1281.646014213562, - "z": "3e6c75a5.b69bda", + "x": 1196.1534271240234, + "y": 1167.6459817886353, + "z": "85ee3913.3987f8", "wires": [ [ - "21bb9b2a.ea8a34" + "4675b373.48835c" ] ] }, { - "id": "eace7410.b0c1f8", + "id": "389867bf.2284f8", "type": "block", "name": "block : atomic", "xml": "", "atomic": "true", "outputs": 1, - "x": 857.6710453033447, - "y": 1233.1667957305908, - "z": "3e6c75a5.b69bda", + "x": 885.6771697998047, + "y": 1163.1667385101318, + "z": "85ee3913.3987f8", "wires": [ [ - "c3ccf383.cfe88" + "80dc1053.718dc" ] ] }, { - "id": "21bb9b2a.ea8a34", + "id": "4675b373.48835c", "type": "call", "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-site-activate", "xml": "\n", "comments": "", "outputs": 1, - "x": 1551.6710815429688, - "y": 1280.1667966842651, - "z": "3e6c75a5.b69bda", + "x": 1569.677230834961, + "y": 1166.1667642593384, + "z": "85ee3913.3987f8", "wires": [ [] ] }, { - "id": "5379b130.c4fdc", + "id": "f75c0513.6c8168", "type": "outcome", "name": "DeactivateSDWANDeviceInstance", "xml": "", "comments": "", "outputs": 1, - "x": 1206.3377380371094, - "y": 1330.6668362617493, - "z": "3e6c75a5.b69bda", + "x": 1224.3438873291016, + "y": 1216.6668038368225, + "z": "85ee3913.3987f8", "wires": [ [ - "84ada7ed.5abb58" + "85958e69.f32bb" ] ] }, { - "id": "84ada7ed.5abb58", + "id": "85958e69.f32bb", "type": "call", "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-device-deactivate", "xml": "\n", "comments": "", "outputs": 1, - "x": 1641.8614349365234, - "y": 1330.187608718872, - "z": "3e6c75a5.b69bda", + "x": 1659.8675842285156, + "y": 1216.1875762939453, + "z": "85ee3913.3987f8", "wires": [ [] ] }, { - "id": "45330326.89c95c", + "id": "73d40202.c78c6c", "type": "call", "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-wanport-deactivate", "xml": "\n", "comments": "", "outputs": 1, - "x": 1646.3375701904297, - "y": 1375.6667585372925, - "z": "3e6c75a5.b69bda", + "x": 1657.3437957763672, + "y": 1294.666778087616, + "z": "85ee3913.3987f8", "wires": [ [] ] }, { - "id": "47362b0e.0aa804", + "id": "da717258.8698a", "type": "outcome", "name": "DeactivateSDWANPortInstance", "xml": "", "comments": "", "outputs": 1, - "x": 1210.8138732910156, - "y": 1376.1459860801697, - "z": "3e6c75a5.b69bda", + "x": 1221.8200988769531, + "y": 1295.1460056304932, + "z": "85ee3913.3987f8", "wires": [ [ - "45330326.89c95c" + "73d40202.c78c6c" ] ] }, { - "id": "c3ccf383.cfe88", + "id": "80dc1053.718dc", "type": "switchNode", "name": "switch request-action", "xml": "", "comments": "", "outputs": 1, - "x": 917.0043296813965, - "y": 1301.7472405433655, - "z": "3e6c75a5.b69bda", + "x": 962.0103988647461, + "y": 1229.7470617294312, + "z": "85ee3913.3987f8", "wires": [ [ - "5e7397b3.dab7a8", - "5379b130.c4fdc", - "47362b0e.0aa804", - "63e6c1ce.d4cf5", - "4a02ebd5.071034", - "fb94038a.0100e" + "c7aad7d3.fb5618", + "f75c0513.6c8168", + "da717258.8698a", + "903da395.919c3", + "82d33324.e23e3", + "1b1f1da6.c2e872" ] ] }, { - "id": "63e6c1ce.d4cf5", + "id": "903da395.919c3", "type": "other", "name": "other", "xml": "\n", "comments": "", "outputs": 1, - "x": 1146.5756072998047, - "y": 1425.9585485458374, - "z": "3e6c75a5.b69bda", + "x": 1157.5818328857422, + "y": 1344.958568096161, + "z": "85ee3913.3987f8", "wires": [ [ - "58fb4bd3.507344" + "e8c4be82.d0b16" ] ] }, { - "id": "4a02ebd5.071034", + "id": "82d33324.e23e3", "type": "outcome", "name": "DeactivateSDWANVpnInstance", "xml": "", "comments": "", "outputs": 1, - "x": 1214.0042190551758, - "y": 1182.7470560073853, - "z": "3e6c75a5.b69bda", + "x": 1238.010398864746, + "y": 1125.7470617294312, + "z": "85ee3913.3987f8", "wires": [ [ - "fbad4fa4.97356" + "2b4b6274.20abbe" ] ] }, { - "id": "fbad4fa4.97356", + "id": "2b4b6274.20abbe", "type": "call", "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-vpn-activate", "xml": "\n", "comments": "", "outputs": 1, - "x": 1629.5280227661133, - "y": 1176.2678327560425, - "z": "3e6c75a5.b69bda", + "x": 1653.5342025756836, + "y": 1119.2678384780884, + "z": "85ee3913.3987f8", "wires": [ [] ] }, { - "id": "58fb4bd3.507344", + "id": "e8c4be82.d0b16", "type": "call", "name": "call GENERIC-RESOURCE-API:vf-module-topology-operation-deactivate", "xml": "\n", "comments": "", "outputs": 1, - "x": 1485.0042877197266, - "y": 1426.4137592315674, - "z": "3e6c75a5.b69bda", + "x": 1496.010513305664, + "y": 1345.4137787818909, + "z": "85ee3913.3987f8", "wires": [ [] ] }, { - "id": "9491c86f.faa978", + "id": "c987f934.5e8db8", "type": "call", "name": "call GENERIC-RESOURCE-API:vf-module-topology-operation-activate", "xml": "\n", "comments": "", "outputs": 1, - "x": 1477.0042190551758, - "y": 1119.4136819839478, - "z": "3e6c75a5.b69bda", + "x": 1501.010398864746, + "y": 1062.4136877059937, + "z": "85ee3913.3987f8", "wires": [ [] ] }, { - "id": "45dbdd14.1c9594", + "id": "9ee92290.b08c", "type": "call", "name": "call GENERIC-RESOURCE-API:vf-module-topology-operation-activate", "xml": "\n", "comments": "", "outputs": 1, - "x": 1059.00386428833, - "y": 343.41364446282387, - "z": "3e6c75a5.b69bda", + "x": 1099.0103645324707, + "y": 341.41364336013794, + "z": "85ee3913.3987f8", "wires": [ [] ] }, { - "id": "7ddcd159.af7c5", + "id": "d58a6905.f3a7f8", "type": "outcome", "name": "activate", "xml": "\n", "comments": "", "outputs": 1, - "x": 687.003849029541, - "y": 344.08032193779945, - "z": "3e6c75a5.b69bda", + "x": 727.0103492736816, + "y": 342.0803208351135, + "z": "85ee3913.3987f8", "wires": [ [ - "45dbdd14.1c9594" + "9ee92290.b08c" ] ] }, { - "id": "c7064bfe.3bb108", + "id": "2b26c4c1.602edc", "type": "outcome", "name": "delete", "xml": "\n", "comments": "", "outputs": 1, - "x": 669.0042915344238, - "y": 1569.0804500579834, - "z": "3e6c75a5.b69bda", + "x": 668.0104446411133, + "y": 1513.0803904533386, + "z": "85ee3913.3987f8", "wires": [ [ - "86fe3063.f5314" + "b6813743.434d08" ] ] }, { - "id": "8129346a.9a7028", + "id": "325c1f9a.af3de", "type": "switchNode", "name": "switch request-action", "xml": "", "comments": "", "outputs": 1, - "x": 900.3378295898438, - "y": 1599.666877746582, - "z": "3e6c75a5.b69bda", + "x": 907.3439636230469, + "y": 1513.666757106781, + "z": "85ee3913.3987f8", "wires": [ [ - "abdb2c6d.26329", - "1c9b503f.e869e", - "ebc11a5b.92e8f8", - "ed7bc3fc.a812b", - "f8972855.1982c8", - "5677852c.5c596c" + "f978524b.49dc8", + "ee8589f0.103678", + "ef71212e.bc228", + "c42f06a0.286dc8", + "c4490e9c.34e51", + "747ce36c.3de7fc" ] ] }, { - "id": "1c9b503f.e869e", + "id": "ee8589f0.103678", "type": "outcome", "name": "DeleteSiteInstance", "xml": "", "comments": "", "outputs": 1, - "x": 1149.8142318725586, - "y": 1589.1461973190308, - "z": "3e6c75a5.b69bda", + "x": 1176.820457458496, + "y": 1447.1461582183838, + "z": "85ee3913.3987f8", "wires": [ [ - "491e32c9.2d52ac" + "e685df53.12b53" ] ] }, { - "id": "abdb2c6d.26329", + "id": "f978524b.49dc8", "type": "other", "name": "other", "xml": "\n", "comments": "", "outputs": 1, - "x": 1099.7186889648438, - "y": 1736.524130821228, - "z": "3e6c75a5.b69bda", + "x": 1106.7248306274414, + "y": 1604.5240168571472, + "z": "85ee3913.3987f8", "wires": [ [ - "8f601e81.71977" + "9ea10b9d.acf658" ] ] }, { - "id": "86fe3063.f5314", + "id": "b6813743.434d08", "type": "block", "name": "block : atomic", "xml": "", "atomic": "true", "outputs": 1, - "x": 849.3378295898438, - "y": 1532.6668758392334, - "z": "3e6c75a5.b69bda", + "x": 854.3439636230469, + "y": 1440.6667551994324, + "z": "85ee3913.3987f8", "wires": [ [ - "8129346a.9a7028" + "325c1f9a.af3de" ] ] }, { - "id": "491e32c9.2d52ac", + "id": "e685df53.12b53", "type": "call", "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-site-delete", "xml": "\n", "comments": "", "outputs": 1, - "x": 1603.338005065918, - "y": 1584.6669492721558, - "z": "3e6c75a5.b69bda", + "x": 1596.344123840332, + "y": 1442.6670017242432, + "z": "85ee3913.3987f8", "wires": [ [] ] }, { - "id": "8f601e81.71977", + "id": "9ea10b9d.acf658", "type": "block", "name": "block", "xml": "\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1253.0043411254883, - "y": 1736.580527305603, - "z": "3e6c75a5.b69bda", + "x": 1260.010482788086, + "y": 1604.5804133415222, + "z": "85ee3913.3987f8", "wires": [ [] ] }, { - "id": "ebc11a5b.92e8f8", + "id": "ef71212e.bc228", "type": "outcome", "name": "DeleteSDWANPortInstance", "xml": "", "comments": "", "outputs": 1, - "x": 1163.6710815429688, - "y": 1694.9140214920044, - "z": "3e6c75a5.b69bda", + "x": 1170.6772232055664, + "y": 1562.9139075279236, + "z": "85ee3913.3987f8", "wires": [ [ - "f8f01738.a952f8" + "64a82c2b.8bd464" ] ] }, { - "id": "f8f01738.a952f8", + "id": "64a82c2b.8bd464", "type": "call", "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-wanport-delete", "xml": "\n", "comments": "", "outputs": 1, - "x": 1636.1947784423828, - "y": 1694.4347734451294, - "z": "3e6c75a5.b69bda", + "x": 1643.2009201049805, + "y": 1562.4346594810486, + "z": "85ee3913.3987f8", "wires": [ [] ] }, { - "id": "ed7bc3fc.a812b", + "id": "c42f06a0.286dc8", "type": "outcome", "name": "DeleteSDWANDeviceInstance", "xml": "", "comments": "", "outputs": 1, - "x": 1173.0354232788086, - "y": 1641.1119375228882, - "z": "3e6c75a5.b69bda", + "x": 1195.041618347168, + "y": 1486.111795425415, + "z": "85ee3913.3987f8", "wires": [ [ - "3f658e56.9d3b42" + "4d9adbda.eda754" ] ] }, { - "id": "3f658e56.9d3b42", + "id": "4d9adbda.eda754", "type": "call", "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-device-delete", "xml": "\n", "comments": "", "outputs": 1, - "x": 1637.5591888427734, - "y": 1640.63277053833, - "z": "3e6c75a5.b69bda", + "x": 1609.5654373168945, + "y": 1481.6326999664307, + "z": "85ee3913.3987f8", "wires": [ [] ] }, { - "id": "f8972855.1982c8", + "id": "c4490e9c.34e51", "type": "outcome", "name": "DeleteSDWANVpnInstance", "xml": "", "comments": "", "outputs": 1, - "x": 1186.004264831543, - "y": 1487.0804476737976, - "z": "3e6c75a5.b69bda", + "x": 1199.0104751586914, + "y": 1406.0804076194763, + "z": "85ee3913.3987f8", "wires": [ [ - "19b04dbd.6b60a2" + "8af6e006.bfec5" ] ] }, { - "id": "19b04dbd.6b60a2", + "id": "8af6e006.bfec5", "type": "call", "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-vpn-delete", "xml": "\n", "comments": "", "outputs": 1, - "x": 1595.5280227661133, - "y": 1488.6011400222778, - "z": "3e6c75a5.b69bda", + "x": 1592.534278869629, + "y": 1406.6011753082275, + "z": "85ee3913.3987f8", "wires": [ [] ] }, { - "id": "6fc07521.c03a0c", + "id": "e795cb52.6c6f98", + "type": "record", + "name": "record", + "xml": "\n\n\n\n\n", + "comments": "", + "outputs": 1, + "x": 1058.7604064941406, + "y": 563.0039051473141, + "z": "85ee3913.3987f8", + "wires": [ + [] + ] + }, + { + "id": "6c28f181.61b7c", "type": "outcome", "name": "CreateSDWANLanPortInstance", "xml": "", "comments": "", "outputs": 1, - "x": 1241.0312728881836, - "y": 642.5312581062317, - "z": "3e6c75a5.b69bda", + "x": 1235.75390625, + "y": 697.25390625, + "z": "85ee3913.3987f8", "wires": [ [ - "8f4dfe29.61b9d" + "1169c073.b7816" ] ] }, { - "id": "8f4dfe29.61b9d", + "id": "1169c073.b7816", "type": "call", "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-lanport-create", "xml": "\n", "comments": "", "outputs": 1, - "x": 1651.5550537109375, - "y": 641.0520095825195, - "z": "3e6c75a5.b69bda", + "x": 1708.277603149414, + "y": 696.774658203125, + "z": "85ee3913.3987f8", "wires": [ [] ] }, { - "id": "7eb3a13c.fe01", + "id": "25d6d260.b0230e", "type": "outcome", "name": "ActivateSDWANLanPortInstance", "xml": "", "comments": "", "outputs": 1, - "x": 1229.03125, - "y": 932.03125, - "z": "3e6c75a5.b69bda", + "x": 1247.75390625, + "y": 974.50390625, + "z": "85ee3913.3987f8", "wires": [ [ - "41d9f761.0dc728" + "ec26a8f0.36bb88" ] ] }, { - "id": "41d9f761.0dc728", + "id": "ec26a8f0.36bb88", "type": "call", "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-lanport-activate", "xml": "\n", "comments": "", "outputs": 1, - "x": 1639.555030822754, - "y": 930.5520014762878, - "z": "3e6c75a5.b69bda", + "x": 1665.2775573730469, + "y": 974.0246677398682, + "z": "85ee3913.3987f8", "wires": [ [] ] }, { - "id": "fb94038a.0100e", + "id": "1b1f1da6.c2e872", "type": "outcome", "name": "DeactivateSDWANLanPortInstance", "xml": "", "comments": "", "outputs": 1, - "x": 1213.03125, - "y": 1236.53125, - "z": "3e6c75a5.b69bda", + "x": 1233.75390625, + "y": 1260.75390625, + "z": "85ee3913.3987f8", "wires": [ [ - "383a8f05.b6135" + "dabaac5b.2c0a7" ] ] }, { - "id": "383a8f05.b6135", + "id": "dabaac5b.2c0a7", "type": "call", "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-lanport-deactivate", "xml": "\n", "comments": "", "outputs": 1, - "x": 1623.555030822754, - "y": 1235.0520014762878, - "z": "3e6c75a5.b69bda", + "x": 1651.2775573730469, + "y": 1260.2746677398682, + "z": "85ee3913.3987f8", "wires": [ [] ] }, { - "id": "5677852c.5c596c", + "id": "747ce36c.3de7fc", "type": "outcome", "name": "DeleteSDWANLanPortInstance", - "xml": "", + "xml": "", "comments": "", "outputs": 1, - "x": 1201.03125, - "y": 1544.53125, - "z": "3e6c75a5.b69bda", + "x": 1197.75390625, + "y": 1523.75390625, + "z": "85ee3913.3987f8", "wires": [ [ - "7c7dc424.e574ac" + "19220770.af1c39" ] ] }, { - "id": "7c7dc424.e574ac", + "id": "19220770.af1c39", "type": "call", "name": "call GENERIC-RESOURCE-API:sdwan-vf-operation-lanport-delete", "xml": "\n", "comments": "", "outputs": 1, - "x": 1607.5550842285156, - "y": 1546.0520501732826, - "z": "3e6c75a5.b69bda", - "wires": [ - [] - ] - }, - { - "id": "5dfbbd6.4b80544", - "type": "outcome", - "name": "update", - "xml": "\n", - "comments": "", - "outputs": 1, - "x": 683.000057220459, - "y": 1791.333441734314, - "z": "3e6c75a5.b69bda", - "wires": [ - [ - "321a7638.3b493a" - ] - ] - }, - { - "id": "321a7638.3b493a", - "type": "block", - "name": "block : atomic", - "xml": "", - "atomic": "true", - "outputs": 1, - "x": 857.3335571289062, - "y": 1790.9197030067444, - "z": "3e6c75a5.b69bda", - "wires": [ - [ - "31f55a0d.2f22a6" - ] - ] - }, - { - "id": "31f55a0d.2f22a6", - "type": "switchNode", - "name": "switch request-action", - "xml": "", - "comments": "", - "outputs": 1, - "x": 1056.3335647583008, - "y": 1790.919867515564, - "z": "3e6c75a5.b69bda", - "wires": [ - [ - "b3fecb60.6fce78" - ] - ] - }, - { - "id": "b3fecb60.6fce78", - "type": "outcome", - "name": "SdwanBandwidthChange", - "xml": "", - "comments": "", - "outputs": 1, - "x": 1300.0000381469727, - "y": 1789.000054359436, - "z": "3e6c75a5.b69bda", - "wires": [ - [ - "ec71b2dd.08538" - ] - ] - }, - { - "id": "ec71b2dd.08538", - "type": "call", - "name": "call GENERIC-RESOURCE-API:sdwan-bandwidth-policy-change", - "xml": "\n", - "comments": "", - "outputs": 1, - "x": 1673.5238418579102, - "y": 1789.520941734314, - "z": "3e6c75a5.b69bda", + "x": 1615.2775573730469, + "y": 1523.2746677398682, + "z": "85ee3913.3987f8", "wires": [ [] ] diff --git a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-device-create.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-device-create.json index f258de41..4760d35a 100644 --- a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-device-create.json +++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-device-create.json @@ -1,22 +1,22 @@ [ { - "id": "5c12f35e.e1cabc", + "id": "ad9a9168.e57ff", "type": "switchNode", "name": "switch this vnf-id == input vnf-id", "xml": " \n", "comments": "", "outputs": 1, - "x": 887.3294982910156, - "y": 250.16278743743896, - "z": "67d8f5f.109b30c", + "x": 956.03125, + "y": 159.13152408599854, + "z": "46bf2b6e.2c0e64", "wires": [ [ - "fc9a82de.84ce" + "e7246404.3ab3d8" ] ] }, { - "id": "b009e5d5.1d5ff8", + "id": "6ad25904.845b18", "type": "service-logic", "name": "GENERIC-RESOURCE-API ${project.version}", "module": "GENERIC-RESOURCE-API", @@ -24,521 +24,722 @@ "comments": "", "xml": "", "outputs": 1, - "x": 177, - "y": 143.99999141693115, - "z": "67d8f5f.109b30c", + "x": 228.7017364501953, + "y": 186.96871662139893, + "z": "46bf2b6e.2c0e64", "wires": [ [ - "9b496cef.08cf1" + "f16fce6c.5d5ba" ] ] }, { - "id": "9b496cef.08cf1", + "id": "f16fce6c.5d5ba", "type": "method", "name": "sdwan-vf-operation-device-create", "xml": "\n", "comments": "", "outputs": 1, - "x": 176, - "y": 243.99999141693115, - "z": "67d8f5f.109b30c", + "x": 227.7017364501953, + "y": 286.9687166213989, + "z": "46bf2b6e.2c0e64", "wires": [ [ - "a4608885.5f82c8" + "c112bcf.84b4e4" ] ] }, { - "id": "7da866ae.544bb8", + "id": "1a36f303.fc1c1d", "type": "dgstart", "name": "DGSTART", "outputs": 1, - "x": 98.50000381469727, - "y": 39, - "z": "67d8f5f.109b30c", + "x": 114.20173835754395, + "y": 79.96872520446777, + "z": "46bf2b6e.2c0e64", "wires": [ [ - "b009e5d5.1d5ff8" + "6ad25904.845b18" ] ] }, { - "id": "a4608885.5f82c8", + "id": "c112bcf.84b4e4", "type": "block", "name": "block : atomic", "xml": "\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 334.99998474121094, - "y": 360, - "z": "67d8f5f.109b30c", + "x": 386.70172119140625, + "y": 402.9687252044678, + "z": "46bf2b6e.2c0e64", "wires": [ [ - "4e77e130.304fb", - "802c77ca.22e778", - "9922275a.527928", - "e01d2f82.7429f", - "a8f9e83.8a6e918", - "c8a186f7.659098", - "b9b958fd.141f08", - "f27c9cac.ebc18", - "35a34bb1.948374", - "178a7bac.307b74", - "7fbeb541.aa905c", - "4845313f.7a00d", - "e8cf2ce.61834d", - "d9a88b51.5c3ff8" + "abed0b7b.e9c438", + "724392ca.bd7b5c", + "2b72757.931558a", + "a49a2243.bbcb2", + "c992605b.552a5", + "40876e67.4cc8d", + "86ee3fd8.45a8b", + "414cae1d.205f6", + "7ba39512.c516ac", + "3a2a0968.648d36", + "7024b9ac.3160d8", + "fdab20c0.e8295", + "d3c28e8a.2aecc", + "b7d7095a.45e048" ] ] }, { - "id": "4e77e130.304fb", + "id": "abed0b7b.e9c438", "type": "for", "name": "for each vnf", "xml": "\n", "comments": "", "outputs": 1, - "x": 635.3294067382812, - "y": 251.49612426757812, - "z": "67d8f5f.109b30c", + "x": 704.0311584472656, + "y": 160.4648609161377, + "z": "46bf2b6e.2c0e64", "wires": [ [ - "5c12f35e.e1cabc" + "ad9a9168.e57ff" ] ] }, { - "id": "ddad9e6f.97581", + "id": "4ed9f1d2.fc2b7", "type": "set", "name": "set vnf-index", "xml": "\n\n", "comments": "", - "x": 1258.9959869384766, - "y": 252.1627902984619, - "z": "67d8f5f.109b30c", + "x": 1327.697738647461, + "y": 161.13152694702148, + "z": "46bf2b6e.2c0e64", "wires": [] }, { - "id": "fc9a82de.84ce", + "id": "e7246404.3ab3d8", "type": "outcomeTrue", "name": "true", "xml": "\n", "comments": "", "outputs": 1, - "x": 1105.6628150939941, - "y": 252.16276931762695, - "z": "67d8f5f.109b30c", + "x": 1174.3645668029785, + "y": 161.13150596618652, + "z": "46bf2b6e.2c0e64", "wires": [ [ - "ddad9e6f.97581" + "4ed9f1d2.fc2b7" ] ] }, { - "id": "e01d2f82.7429f", + "id": "2b72757.931558a", "type": "for", "name": "for loop idx - VF input parameters", "xml": "\n\n", "comments": "", "outputs": 1, - "x": 709.2501907348633, - "y": 473.66665744781494, - "z": "67d8f5f.109b30c", + "x": 784.9518966674805, + "y": 561.6354055404663, + "z": "46bf2b6e.2c0e64", "wires": [ [ - "7ea0d8c4.d056e8" + "1cf539f3.af1b96" ] ] }, { - "id": "7ea0d8c4.d056e8", + "id": "1cf539f3.af1b96", "type": "block", "name": "block", "xml": "\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 924.0285339355469, - "y": 471.22224140167236, - "z": "67d8f5f.109b30c", + "x": 999.7302398681641, + "y": 559.1909894943237, + "z": "46bf2b6e.2c0e64", "wires": [ [ - "c6b87ab0.44cce8", - "f6199a92.b6bb08" + "1a9f780a.a03398", + "dcb3e18.352e72" ] ] }, { - "id": "c6b87ab0.44cce8", + "id": "1a9f780a.a03398", "type": "execute", "name": "execute split parameterName", "xml": "\n\n\n\n", "comments": "", "outputs": 1, - "x": 1120.2847366333008, - "y": 448.97037982940674, - "z": "67d8f5f.109b30c", + "x": 1195.986442565918, + "y": 536.9391279220581, + "z": "46bf2b6e.2c0e64", "wires": [ [] ] }, { - "id": "f6199a92.b6bb08", + "id": "dcb3e18.352e72", "type": "set", "name": "set parameterName", "xml": "\n\n", "comments": "", - "x": 1089.7291641235352, - "y": 485.97049617767334, - "z": "67d8f5f.109b30c", + "x": 1165.4308700561523, + "y": 573.9392442703247, + "z": "46bf2b6e.2c0e64", "wires": [] }, { - "id": "92e456fa.39e618", - "type": "comment", - "name": "Take the parameter names by removing prefix", - "info": "", - "comments": "", - "x": 1093.2503929138184, - "y": 408.3333258628845, - "z": "67d8f5f.109b30c", - "wires": [] - }, - { - "id": "802c77ca.22e778", + "id": "724392ca.bd7b5c", "type": "switchNode", "name": "switch vnf_length", "xml": "\n", "comments": "", "outputs": 1, - "x": 649.75, - "y": 206.99999332427979, - "z": "67d8f5f.109b30c", + "x": 718.4517517089844, + "y": 115.96872997283936, + "z": "46bf2b6e.2c0e64", "wires": [ [ - "b9775757.c586e8" + "b66cc394.12346" ] ] }, { - "id": "b9775757.c586e8", + "id": "b66cc394.12346", "type": "other", "name": "NULL", "xml": "\n", "comments": "", "outputs": 1, - "x": 836.4166793823242, - "y": 206.33329105377197, - "z": "67d8f5f.109b30c", + "x": 905.1184310913086, + "y": 115.30202770233154, + "z": "46bf2b6e.2c0e64", "wires": [ [ - "8ca0a76c.6a9638" + "c5ad3c03.3e718" ] ] }, { - "id": "8ca0a76c.6a9638", + "id": "c5ad3c03.3e718", "type": "returnFailure", "name": "return failure", "xml": "\n\t\n\t\n \n", "comments": "", - "x": 1018.0833053588867, - "y": 206.33329105377197, - "z": "67d8f5f.109b30c", + "x": 1086.785057067871, + "y": 115.30202770233154, + "z": "46bf2b6e.2c0e64", "wires": [] }, { - "id": "9922275a.527928", - "type": "switchNode", - "name": "switch vf-modules.vf-module_length", - "xml": "\n", + "id": "40876e67.4cc8d", + "type": "set", + "name": "copy input data to service data", + "xml": "\n\n\n\n\n\n\n\n\n\n", + "comments": "", + "x": 769.5548782348633, + "y": 728.4649872779846, + "z": "46bf2b6e.2c0e64", + "wires": [] + }, + { + "id": "a49a2243.bbcb2", + "type": "set", + "name": "set vf-module-request-input.", + "xml": "\n\n", + "comments": "", + "x": 775.8880348205566, + "y": 624.1229696273804, + "z": "46bf2b6e.2c0e64", + "wires": [] + }, + { + "id": "c992605b.552a5", + "type": "call", + "name": "call sdwan-get-vf-module-device-param", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 801.8884124755859, + "y": 680.1232032775879, + "z": "46bf2b6e.2c0e64", + "wires": [ + [] + ] + }, + { + "id": "86ee3fd8.45a8b", + "type": "set", + "name": "set vf-module-object-path", + "xml": "\n \n\n\n\n", + "comments": "", + "x": 764.7017707824707, + "y": 778.9688324928284, + "z": "46bf2b6e.2c0e64", + "wires": [] + }, + { + "id": "414cae1d.205f6", + "type": "set", + "name": "set vf-module-level-oper-status", + "xml": "\n\n\n\n", + "comments": "", + "x": 772.2018737792969, + "y": 826.9687967300415, + "z": "46bf2b6e.2c0e64", + "wires": [] + }, + { + "id": "c8a9b81e.4dea68", + "type": "save", + "name": "save sdwan vpn resource in AAI", + "xml": "\n\n\n\n\n\n\n\n\n\n\n\n\n", + "comments": "", + "outputs": 1, + "x": 1206.701789855957, + "y": 852.4687442779541, + "z": "46bf2b6e.2c0e64", + "wires": [ + [] + ] + }, + { + "id": "3a2a0968.648d36", + "type": "save", + "name": "save service relationship in AAI", + "xml": "\n\n\n\n\n\n", + "comments": "", + "outputs": 1, + "x": 775.7016677856445, + "y": 920.4687957763672, + "z": "46bf2b6e.2c0e64", + "wires": [ + [] + ] + }, + { + "id": "7ba39512.c516ac", + "type": "returnSuccess", + "name": "return success", + "xml": "\n\n\n\n", + "comments": "", + "x": 724.4241981506348, + "y": 966.6426386833191, + "z": "46bf2b6e.2c0e64", + "wires": [] + }, + { + "id": "faa86376.49175", + "type": "execute", + "name": "execute generate-vf-id", + "xml": "\n\n", "comments": "", "outputs": 1, - "x": 690.9999895095825, - "y": 326.9999942779541, - "z": "67d8f5f.109b30c", + "x": 1251.8685150146484, + "y": 240.30206966400146, + "z": "46bf2b6e.2c0e64", + "wires": [ + [] + ] + }, + { + "id": "491e4f90.e2d44", + "type": "block", + "name": "block : atomic", + "xml": "", + "atomic": "true", + "outputs": 1, + "x": 1004.8680419921875, + "y": 254.95347213745117, + "z": "46bf2b6e.2c0e64", "wires": [ [ - "c5166da1.64b87", - "f58b3753.891bc8" + "faa86376.49175", + "1889b968.9cafa7", + "c8eb51dd.8bc9f" ] ] }, { - "id": "c5166da1.64b87", + "id": "74ee118f.3bdb3", + "type": "set", + "name": "set prop.vf-id", + "xml": "\n\n", + "comments": "", + "x": 1210.3999099731445, + "y": 457.985107421875, + "z": "46bf2b6e.2c0e64", + "wires": [] + }, + { + "id": "dfbd61c4.ba851", + "type": "block", + "name": "block : atomic", + "xml": "", + "atomic": "true", + "outputs": 1, + "x": 1004.3995361328125, + "y": 410.9848394393921, + "z": "46bf2b6e.2c0e64", + "wires": [ + [ + "74ee118f.3bdb3", + "1889b968.9cafa7", + "f58396e4.0282e8" + ] + ] + }, + { + "id": "1889b968.9cafa7", + "type": "block", + "name": "block : atomic", + "xml": "", + "atomic": "true", + "outputs": 1, + "x": 1239.8996353149414, + "y": 334.98486328125, + "z": "46bf2b6e.2c0e64", + "wires": [ + [ + "ecce0898.ef26d8", + "e6c1d3e3.fb47b" + ] + ] + }, + { + "id": "e28abe4b.99802", "type": "other", - "name": "Null", + "name": "NULL", "xml": "\n", "comments": "", "outputs": 1, - "x": 922, - "y": 302.99999141693115, - "z": "67d8f5f.109b30c", + "x": 1701.6139278411865, + "y": 254.12758922576904, + "z": "46bf2b6e.2c0e64", "wires": [ [ - "4d85b0fa.e45f4" + "4d6a716f.84ac8" ] ] }, { - "id": "f58b3753.891bc8", + "id": "4d6a716f.84ac8", + "type": "set", + "name": "set vf-index=0", + "xml": "\n\n", + "comments": "", + "x": 1849.8995761871338, + "y": 251.12764358520508, + "z": "46bf2b6e.2c0e64", + "wires": [] + }, + { + "id": "ad9a94b.6789668", "type": "other", "name": "other", "xml": "\n", "comments": "", "outputs": 1, - "x": 922, - "y": 342.99999141693115, - "z": "67d8f5f.109b30c", + "x": 1705.0424251556396, + "y": 299.41338062286377, + "z": "46bf2b6e.2c0e64", "wires": [ [ - "3cc5230a.5b2c3c" + "aa7a0bdb.e96638" ] ] }, { - "id": "4d85b0fa.e45f4", + "id": "aa7a0bdb.e96638", "type": "set", - "name": "set vf-index", - "xml": "\n\n", + "name": "set vf-index = vf_length", + "xml": "\n\n", "comments": "", - "x": 1064.5, - "y": 302.99999141693115, - "z": "67d8f5f.109b30c", + "x": 1888.90016746521, + "y": 299.6991491317749, + "z": "46bf2b6e.2c0e64", "wires": [] }, { - "id": "3cc5230a.5b2c3c", - "type": "block", - "name": "block", - "xml": "\n", - "atomic": "false", + "id": "ecce0898.ef26d8", + "type": "set", + "name": "set new vF_length", + "xml": "\n\n", + "comments": "", + "x": 1417.8996391296387, + "y": 363.984827041626, + "z": "46bf2b6e.2c0e64", + "wires": [] + }, + { + "id": "b86e63fd.fc195", + "type": "outcomeTrue", + "name": "true", + "xml": "\n", "comments": "", "outputs": 1, - "x": 1066.3570442199707, - "y": 342.93650341033936, - "z": "67d8f5f.109b30c", + "x": 1654.471076965332, + "y": 394.1277618408203, + "z": "46bf2b6e.2c0e64", "wires": [ [ - "1560cc74.e1f714", - "105e52c3.2d94dd" + "5a9cb21d.1f494c" ] ] }, { - "id": "105e52c3.2d94dd", - "type": "set", - "name": "set vf-index", - "xml": "\n\n\n\n", + "id": "5a9cb21d.1f494c", + "type": "returnFailure", + "name": "return failure", + "xml": "\n\t\n\t\n \n", "comments": "", - "x": 1219.055519104004, - "y": 312.5556021030061, - "z": "67d8f5f.109b30c", + "x": 1793.0424346923828, + "y": 394.12772274017334, + "z": "46bf2b6e.2c0e64", "wires": [] }, { - "id": "1560cc74.e1f714", - "type": "for", - "name": "for each existing vf-index", - "xml": "\n", + "id": "2f10259c.95f9fa", + "type": "other", + "name": "other", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 853.3991165161133, + "y": 378.9847173690796, + "z": "46bf2b6e.2c0e64", + "wires": [ + [ + "dfbd61c4.ba851" + ] + ] + }, + { + "id": "c5868d60.4eb9c", + "type": "outcome", + "name": "NULL", + "xml": "", "comments": "", "outputs": 1, - "x": 1275.4840240478516, - "y": 365.7777318954468, - "z": "67d8f5f.109b30c", + "x": 856.8679389953613, + "y": 318.9534797668457, + "z": "46bf2b6e.2c0e64", "wires": [ [ - "e9396ecf.61386" + "491e4f90.e2d44" ] ] }, { - "id": "9bfcdd3d.e8854", + "id": "585f0966.3b4ab8", "type": "comment", - "name": "make sure this network doesn't exist already", + "name": "if SO provide vf-id use that else create new", "info": "", "comments": "", - "x": 1499.1347541809082, - "y": 324.0317893028259, - "z": "67d8f5f.109b30c", + "x": 1554.3991317749023, + "y": 214.98472118377686, + "z": "46bf2b6e.2c0e64", "wires": [] }, { - "id": "e9396ecf.61386", + "id": "fdab20c0.e8295", "type": "switchNode", - "name": "switch vf-module-id found", - "xml": "\n", + "name": "switch vf-id", + "xml": "\n", "comments": "", "outputs": 1, - "x": 1550.7697448730469, - "y": 365.34923458099365, - "z": "67d8f5f.109b30c", + "x": 715.8679351806641, + "y": 343.95348834991455, + "z": "46bf2b6e.2c0e64", "wires": [ [ - "7c76b41d.ea06ac" + "c5868d60.4eb9c", + "2f10259c.95f9fa" ] ] }, { - "id": "7c76b41d.ea06ac", - "type": "outcomeTrue", - "name": "true", - "xml": "\n", + "id": "7024b9ac.3160d8", + "type": "switchNode", + "name": "switch vnf-index", + "xml": "\n", "comments": "", "outputs": 1, - "x": 1451.499942779541, - "y": 423.9206657409668, - "z": "67d8f5f.109b30c", + "x": 715.7330017089844, + "y": 208.99999523162842, + "z": "46bf2b6e.2c0e64", "wires": [ [ - "91b09a0a.6c6428" + "a1384c59.cdef8" ] ] }, { - "id": "91b09a0a.6c6428", - "type": "returnFailure", - "name": "return failure", - "xml": "\n\t\n\t\n \n", + "id": "a1384c59.cdef8", + "type": "other", + "name": "Null", + "xml": "\n", "comments": "", - "x": 1599.2500457763672, - "y": 423.7778578097932, - "z": "67d8f5f.109b30c", - "wires": [] + "outputs": 1, + "x": 877.7330474853516, + "y": 207.9999942779541, + "z": "46bf2b6e.2c0e64", + "wires": [ + [ + "b60890ce.7212a" + ] + ] }, { - "id": "35a34bb1.948374", - "type": "set", - "name": "copy input data to service data", - "xml": "\n\n\n\n\n\n\n\n\n\n\n\n", + "id": "b60890ce.7212a", + "type": "returnFailure", + "name": "return failure", + "xml": "\n\t\n\t\n \n", "comments": "", - "x": 702.8531951904297, - "y": 753.496214389801, - "z": "67d8f5f.109b30c", + "x": 1026.983139038086, + "y": 205.7778720855713, + "z": "46bf2b6e.2c0e64", "wires": [] }, { - "id": "f27c9cac.ebc18", - "type": "execute", - "name": "execute generate-vf-module-index", - "xml": "\n\n", + "id": "e6c1d3e3.fb47b", + "type": "switchNode", + "name": "switch vf-modules.vf-module_length", + "xml": "\n", "comments": "", "outputs": 1, - "x": 711.1866912841797, - "y": 700.162947177887, - "z": "67d8f5f.109b30c", + "x": 1479.7329788208008, + "y": 280.0000104904175, + "z": "46bf2b6e.2c0e64", "wires": [ - [] + [ + "e28abe4b.99802", + "ad9a94b.6789668" + ] ] }, { - "id": "b9b958fd.141f08", - "type": "set", - "name": "set new vf-module_length", - "xml": "\n", - "comments": "", - "x": 685.1866683959961, - "y": 646.1628408432007, - "z": "67d8f5f.109b30c", - "wires": [] - }, - { - "id": "a8f9e83.8a6e918", - "type": "set", - "name": "set vf-module-request-input.", - "xml": "\n\n", + "id": "62be0465.8c201c", + "type": "switchNode", + "name": "switch vf-module-id found", + "xml": "\n", "comments": "", - "x": 700.1863288879395, - "y": 536.154221534729, - "z": "67d8f5f.109b30c", - "wires": [] + "outputs": 1, + "x": 1471.7329788208008, + "y": 402.49998474121094, + "z": "46bf2b6e.2c0e64", + "wires": [ + [ + "b86e63fd.fc195" + ] + ] }, { - "id": "c8a186f7.659098", - "type": "call", - "name": "call sdwan-get-vf-module-device-param", - "xml": "\n", + "id": "f58396e4.0282e8", + "type": "for", + "name": "for each existing vf-index", + "xml": "\n", "comments": "", "outputs": 1, - "x": 726.1867065429688, - "y": 592.1544551849365, - "z": "67d8f5f.109b30c", + "x": 1235.7329788208008, + "y": 406.49998474121094, + "z": "46bf2b6e.2c0e64", "wires": [ - [] + [ + "62be0465.8c201c" + ] ] }, { - "id": "178a7bac.307b74", + "id": "d3c28e8a.2aecc", "type": "set", - "name": "set vf-module-object-path", - "xml": "\n\n\n\n", + "name": "set prop.sdncCreate=false", + "xml": "\n\n", "comments": "", - "x": 698.0000877380371, - "y": 804.0000596046448, - "z": "67d8f5f.109b30c", + "x": 746.2329788208008, + "y": 71.99999809265137, + "z": "46bf2b6e.2c0e64", "wires": [] }, { - "id": "7fbeb541.aa905c", + "id": "c8eb51dd.8bc9f", "type": "set", - "name": "set vf-module-level-oper-status", - "xml": "\n\n\n\n", + "name": "set prop.sdncCreate=true", + "xml": "\n\n", "comments": "", - "x": 705.5001907348633, - "y": 852.0000238418579, - "z": "67d8f5f.109b30c", + "x": 1265.2329864501953, + "y": 202.99999713897705, + "z": "46bf2b6e.2c0e64", "wires": [] }, { - "id": "e8cf2ce.61834d", - "type": "save", - "name": "save sdwan vpn resource in AAI", - "xml": "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n", + "id": "b7d7095a.45e048", + "type": "switchNode", + "name": "switch prop.sdncCreate", + "xml": "\n", "comments": "", "outputs": 1, - "x": 713.0001373291016, - "y": 910.4999666213989, - "z": "67d8f5f.109b30c", + "x": 754.2330436706543, + "y": 876.0000257492065, + "z": "46bf2b6e.2c0e64", "wires": [ - [] + [ + "bb597028.866e9", + "18aecad0.0cad25" + ] ] }, { - "id": "d9a88b51.5c3ff8", - "type": "save", - "name": "save service relationship in AAI", - "xml": "\n\n\n\n\n\n", + "id": "18aecad0.0cad25", + "type": "outcomeFalse", + "name": "false", + "xml": "\n", "comments": "", "outputs": 1, - "x": 708.9999847412109, - "y": 945.5000228881836, - "z": "67d8f5f.109b30c", + "x": 969.2330417633057, + "y": 887.0000257492065, + "z": "46bf2b6e.2c0e64", "wires": [ - [] + [ + "8ea3c05b.19b31" + ] ] }, { - "id": "4845313f.7a00d", - "type": "returnSuccess", - "name": "return success", - "xml": "\n\n\n\n", + "id": "bb597028.866e9", + "type": "outcomeTrue", + "name": "true", + "xml": "\n", "comments": "", - "x": 657.7225151062012, - "y": 991.6738657951355, - "z": "67d8f5f.109b30c", - "wires": [] + "outputs": 1, + "x": 972.2330417633057, + "y": 848.9999942779541, + "z": "46bf2b6e.2c0e64", + "wires": [ + [ + "c8a9b81e.4dea68" + ] + ] }, { - "id": "b5bea2af.4d20d", - "type": "comment", - "name": "TODO: if SO passes vnf-id, need to update prop.sdncCreate as true", - "info": "if SO passes vnf-id, need to update prop.sdncCreate as true", + "id": "8ea3c05b.19b31", + "type": "save", + "name": "update sdwan vpn resource in AAI", + "xml": "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n", "comments": "", - "x": 806.6974792480469, - "y": 141.0160083770752, - "z": "67d8f5f.109b30c", - "wires": [] + "outputs": 1, + "x": 1203.2329864501953, + "y": 892.999997138977, + "z": "46bf2b6e.2c0e64", + "wires": [ + [] + ] } ] \ No newline at end of file diff --git a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-create.json b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-create.json index dd6f3215..475c093d 100644 --- a/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-create.json +++ b/platform-logic/generic-resource-api/src/main/json/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-create.json @@ -1,37 +1,37 @@ [ { - "id": "2de211e6.98e23e", + "id": "2464f2e7.0e2fce", "type": "block", "name": "block : atomic", "xml": "\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 468, - "y": 381.0000009536743, - "z": "f1f197ca.402af8", + "x": 450.00390625, + "y": 347.0000014305115, + "z": "4e5f9446.b42e3c", "wires": [ [ - "6436367.bae22c8", - "1f79f37c.52109d", - "86c4e83c.6dd4c8", - "e7ab9a67.b605f8", - "1d935a3c.53bb66", - "9465c248.bcdbd", - "944e3f22.30053", - "240305a4.5a5a9a", - "5d2253aa.4bfbec", - "b6ddeb01.d7f708", - "83d0d62b.725028", - "8a6622c.9c3e9e", - "d3e9377a.b7b628", - "166cfcae.a53de3", - "4cde94b6.d8700c" + "32c4b65c.2d59aa", + "5509b148.13914", + "aad7e68e.3b6ca8", + "94574a55.b19c88", + "7de1d3e.65c652c", + "7b54ca79.4bc724", + "e23c49d7.715338", + "a50b2df2.ad39e", + "e9af352a.620918", + "bbeb53a3.c2576", + "37a48c20.31bdf4", + "c012bd48.a280b", + "3e34e572.c1fb4a", + "83fb72db.90602", + "370a2393.20ff3c" ] ] }, { - "id": "489fcd29.cfaa34", + "id": "4af2ac42.490d34", "type": "service-logic", "name": "GENERIC-RESOURCE-API ${project.version}", "module": "GENERIC-RESOURCE-API", @@ -39,616 +39,616 @@ "comments": "", "xml": "", "outputs": 1, - "x": 310.00001525878906, - "y": 164.99999237060547, - "z": "f1f197ca.402af8", + "x": 292.00392150878906, + "y": 130.99999284744263, + "z": "4e5f9446.b42e3c", "wires": [ [ - "105708eb.457607" + "5b6c766c.98d2a8" ] ] }, { - "id": "105708eb.457607", + "id": "5b6c766c.98d2a8", "type": "method", "name": "sdwan-vf-operation-vpn-create", "xml": "\n", "comments": "", "outputs": 1, - "x": 309.00001525878906, - "y": 264.99999237060547, - "z": "f1f197ca.402af8", + "x": 291.00392150878906, + "y": 230.99999284744263, + "z": "4e5f9446.b42e3c", "wires": [ [ - "2de211e6.98e23e" + "2464f2e7.0e2fce" ] ] }, { - "id": "a574a3fb.d3201", + "id": "4418c0ab.c80bf", "type": "dgstart", "name": "DGSTART", "outputs": 1, - "x": 139.50001525878906, - "y": 76, - "z": "f1f197ca.402af8", + "x": 121.50392150878906, + "y": 42.00000047683716, + "z": "4e5f9446.b42e3c", "wires": [ [ - "489fcd29.cfaa34" + "4af2ac42.490d34" ] ] }, { - "id": "6436367.bae22c8", + "id": "32c4b65c.2d59aa", "type": "for", "name": "for each vnf", "xml": "\n", "comments": "", "outputs": 1, - "x": 768.3294219970703, - "y": 272.49612522125244, - "z": "f1f197ca.402af8", + "x": 750.3333282470703, + "y": 238.4961256980896, + "z": "4e5f9446.b42e3c", "wires": [ [ - "a118e404.bdd118" + "3161e290.49fc4e" ] ] }, { - "id": "a118e404.bdd118", + "id": "3161e290.49fc4e", "type": "switchNode", "name": "switch this vnf-id == input vnf-id", "xml": " \n", "comments": "", "outputs": 1, - "x": 1020.3295135498047, - "y": 271.1627883911133, - "z": "f1f197ca.402af8", + "x": 1002.3334197998047, + "y": 237.16278886795044, + "z": "4e5f9446.b42e3c", "wires": [ [ - "40e93eeb.bac38" + "5b45671f.cd82a8" ] ] }, { - "id": "948c1668.1af8e8", + "id": "e5b08bcc.460cf8", "type": "set", "name": "set vnf-index", "xml": "\n\n\n", "comments": "", - "x": 1391.9960021972656, - "y": 273.16279125213623, - "z": "f1f197ca.402af8", + "x": 1373.9999084472656, + "y": 239.1627917289734, + "z": "4e5f9446.b42e3c", "wires": [] }, { - "id": "40e93eeb.bac38", + "id": "5b45671f.cd82a8", "type": "outcomeTrue", "name": "true", "xml": "\n", "comments": "", "outputs": 1, - "x": 1238.6628303527832, - "y": 273.16277027130127, - "z": "f1f197ca.402af8", + "x": 1220.6667366027832, + "y": 239.16277074813843, + "z": "4e5f9446.b42e3c", "wires": [ [ - "948c1668.1af8e8" + "e5b08bcc.460cf8" ] ] }, { - "id": "e7ab9a67.b605f8", + "id": "94574a55.b19c88", "type": "for", "name": "for loop idx - VF input parameters", "xml": "\n\n", "comments": "", "outputs": 1, - "x": 842.2502059936523, - "y": 494.66665840148926, - "z": "f1f197ca.402af8", + "x": 824.2541122436523, + "y": 460.6666588783264, + "z": "4e5f9446.b42e3c", "wires": [ [ - "62290f8b.75c82" + "213647dd.26e428" ] ] }, { - "id": "62290f8b.75c82", + "id": "213647dd.26e428", "type": "block", "name": "block", "xml": "\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1057.028549194336, - "y": 492.2222423553467, - "z": "f1f197ca.402af8", + "x": 1039.032455444336, + "y": 458.22224283218384, + "z": "4e5f9446.b42e3c", "wires": [ [ - "59b05bb9.0b68b4", - "72944c92.a776a4" + "501e761.bc5eb88", + "76a61aa5.aca9e4" ] ] }, { - "id": "59b05bb9.0b68b4", + "id": "501e761.bc5eb88", "type": "execute", "name": "execute split parameterName", "xml": "\n\n\n\n", "comments": "", "outputs": 1, - "x": 1253.2847518920898, - "y": 469.97038078308105, - "z": "f1f197ca.402af8", + "x": 1235.2886581420898, + "y": 435.9703812599182, + "z": "4e5f9446.b42e3c", "wires": [ [] ] }, { - "id": "72944c92.a776a4", + "id": "76a61aa5.aca9e4", "type": "set", "name": "set parameterName", "xml": "\n\n", "comments": "", - "x": 1222.7291793823242, - "y": 506.97049713134766, - "z": "f1f197ca.402af8", + "x": 1204.7330856323242, + "y": 472.9704976081848, + "z": "4e5f9446.b42e3c", "wires": [] }, { - "id": "d0552bf7.11fd78", + "id": "801b9de7.f8983", "type": "comment", "name": "Take the parameter names by removing prefix", "info": "", "comments": "", - "x": 1226.2504081726074, - "y": 429.33332681655884, - "z": "f1f197ca.402af8", + "x": 1208.2543144226074, + "y": 395.333327293396, + "z": "4e5f9446.b42e3c", "wires": [] }, { - "id": "1f79f37c.52109d", + "id": "5509b148.13914", "type": "switchNode", "name": "switch vnf_length", "xml": "\n", "comments": "", "outputs": 1, - "x": 782.7500152587891, - "y": 227.9999942779541, - "z": "f1f197ca.402af8", + "x": 764.7539215087891, + "y": 193.99999475479126, + "z": "4e5f9446.b42e3c", "wires": [ [ - "f848aa6e.cfe238" + "1afa6ba0.b560d4" ] ] }, { - "id": "f848aa6e.cfe238", + "id": "1afa6ba0.b560d4", "type": "other", "name": "NULL", "xml": "\n", "comments": "", "outputs": 1, - "x": 969.4166946411133, - "y": 227.3332920074463, - "z": "f1f197ca.402af8", + "x": 951.4206008911133, + "y": 193.33329248428345, + "z": "4e5f9446.b42e3c", "wires": [ [ - "63764309.2b5d2c" + "f6ded972.6369c8" ] ] }, { - "id": "63764309.2b5d2c", + "id": "f6ded972.6369c8", "type": "returnFailure", "name": "return failure", "xml": "\n\t\n\t\n \n", "comments": "", - "x": 1151.0833206176758, - "y": 227.3332920074463, - "z": "f1f197ca.402af8", + "x": 1133.0872268676758, + "y": 193.33329248428345, + "z": "4e5f9446.b42e3c", "wires": [] }, { - "id": "86c4e83c.6dd4c8", + "id": "aad7e68e.3b6ca8", "type": "switchNode", "name": "switch vf-modules.vf-module_length", "xml": "\n", "comments": "", "outputs": 1, - "x": 824.0000047683716, - "y": 347.9999952316284, - "z": "f1f197ca.402af8", + "x": 806.0039110183716, + "y": 313.9999957084656, + "z": "4e5f9446.b42e3c", "wires": [ [ - "47ea1345.69aafc", - "1d47e1b9.b5ac9e" + "e139df7a.80637", + "caf10502.734168" ] ] }, { - "id": "47ea1345.69aafc", + "id": "e139df7a.80637", "type": "other", "name": "Null", "xml": "\n", "comments": "", "outputs": 1, - "x": 1055.000015258789, - "y": 323.99999237060547, - "z": "f1f197ca.402af8", + "x": 1037.003921508789, + "y": 289.9999928474426, + "z": "4e5f9446.b42e3c", "wires": [ [ - "4b7cf824.56d218" + "b4a2933f.20169" ] ] }, { - "id": "1d47e1b9.b5ac9e", + "id": "caf10502.734168", "type": "other", "name": "other", "xml": "\n", "comments": "", "outputs": 1, - "x": 1055.000015258789, - "y": 363.99999237060547, - "z": "f1f197ca.402af8", + "x": 1037.003921508789, + "y": 329.9999928474426, + "z": "4e5f9446.b42e3c", "wires": [ [ - "ff6c5552.af6328" + "63770f1.c37c1f" ] ] }, { - "id": "4b7cf824.56d218", + "id": "b4a2933f.20169", "type": "set", "name": "set vf-index", "xml": "\n\n", "comments": "", - "x": 1197.500015258789, - "y": 323.99999237060547, - "z": "f1f197ca.402af8", + "x": 1179.503921508789, + "y": 289.9999928474426, + "z": "4e5f9446.b42e3c", "wires": [] }, { - "id": "ff6c5552.af6328", + "id": "63770f1.c37c1f", "type": "block", "name": "block", "xml": "\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1199.3570594787598, - "y": 363.9365043640137, - "z": "f1f197ca.402af8", + "x": 1181.3609657287598, + "y": 329.93650484085083, + "z": "4e5f9446.b42e3c", "wires": [ [ - "34f94cf0.e3aea4", - "b3996c0f.5f9d2" + "82e73ea.9f6d1c", + "facab090.c3497" ] ] }, { - "id": "b3996c0f.5f9d2", + "id": "facab090.c3497", "type": "set", "name": "set vf-index", "xml": "\n\n\n\n", "comments": "", - "x": 1352.055534362793, - "y": 333.5556030566804, - "z": "f1f197ca.402af8", + "x": 1334.059440612793, + "y": 299.55560353351757, + "z": "4e5f9446.b42e3c", "wires": [] }, { - "id": "34f94cf0.e3aea4", + "id": "82e73ea.9f6d1c", "type": "for", "name": "for each existing vf-index", "xml": "\n", "comments": "", "outputs": 1, - "x": 1408.4840393066406, - "y": 386.7777328491211, - "z": "f1f197ca.402af8", + "x": 1390.4879455566406, + "y": 352.77773332595825, + "z": "4e5f9446.b42e3c", "wires": [ [ - "441d1901.20ad48" + "df7833b0.b66c4" ] ] }, { - "id": "f0d652ef.7b8d", + "id": "f1cb1fc.e0fb2e", "type": "comment", "name": "make sure this network doesn't exist already", "info": "", "comments": "", - "x": 1632.1347694396973, - "y": 345.03179025650024, - "z": "f1f197ca.402af8", + "x": 1614.1386756896973, + "y": 311.0317907333374, + "z": "4e5f9446.b42e3c", "wires": [] }, { - "id": "441d1901.20ad48", + "id": "df7833b0.b66c4", "type": "switchNode", "name": "switch vf-module-id found", "xml": "\n", "comments": "", "outputs": 1, - "x": 1683.769760131836, - "y": 386.34923553466797, - "z": "f1f197ca.402af8", + "x": 1665.773666381836, + "y": 352.3492360115051, + "z": "4e5f9446.b42e3c", "wires": [ [ - "d51340c3.db8f7" + "f0bc8641.c01b88" ] ] }, { - "id": "d51340c3.db8f7", + "id": "f0bc8641.c01b88", "type": "outcomeTrue", "name": "true", "xml": "\n", "comments": "", "outputs": 1, - "x": 1584.49995803833, - "y": 444.9206666946411, - "z": "f1f197ca.402af8", + "x": 1566.50386428833, + "y": 410.92066717147827, + "z": "4e5f9446.b42e3c", "wires": [ [ - "20af1164.21510e" + "ac9ea707.076ba8" ] ] }, { - "id": "20af1164.21510e", + "id": "ac9ea707.076ba8", "type": "returnFailure", "name": "return failure", "xml": "\n\t\n\t\n \n", "comments": "", - "x": 1732.2500610351562, - "y": 444.7778587634675, - "z": "f1f197ca.402af8", + "x": 1714.2539672851562, + "y": 410.7778592403047, + "z": "4e5f9446.b42e3c", "wires": [] }, { - "id": "240305a4.5a5a9a", + "id": "a50b2df2.ad39e", "type": "set", "name": "copy input data to service data", "xml": "\n\n\n\n\n\n\n\n\n\n\n\n\n", "comments": "", - "x": 837.8531951904297, - "y": 797.4962463378906, - "z": "f1f197ca.402af8", + "x": 819.8571014404297, + "y": 763.4962468147278, + "z": "4e5f9446.b42e3c", "wires": [] }, { - "id": "944e3f22.30053", + "id": "e23c49d7.715338", "type": "execute", "name": "execute generate-vf-module-index", "xml": "\n\n", "comments": "", "outputs": 1, - "x": 849.186767578125, - "y": 750.1629486083984, - "z": "f1f197ca.402af8", + "x": 831.190673828125, + "y": 716.1629490852356, + "z": "4e5f9446.b42e3c", "wires": [ [] ] }, { - "id": "9465c248.bcdbd", + "id": "7b54ca79.4bc724", "type": "set", "name": "set new vf-module_length", "xml": "\n", "comments": "", - "x": 821.1868286132812, - "y": 701.1629486083984, - "z": "f1f197ca.402af8", + "x": 803.1907348632812, + "y": 667.1629490852356, + "z": "4e5f9446.b42e3c", "wires": [] }, { - "id": "1d935a3c.53bb66", + "id": "7de1d3e.65c652c", "type": "set", "name": "set vf-module-request-input.", "xml": "\n\n", "comments": "", - "x": 821.1863555908203, - "y": 647.1542367935181, - "z": "f1f197ca.402af8", + "x": 803.1902618408203, + "y": 613.1542372703552, + "z": "4e5f9446.b42e3c", "wires": [] }, { - "id": "5d2253aa.4bfbec", + "id": "e9af352a.620918", "type": "set", "name": "set vf-module-level-oper-status", "xml": "\n\n\n", "comments": "", - "x": 831.5001831054688, - "y": 895.0000674128532, - "z": "f1f197ca.402af8", + "x": 813.5040893554688, + "y": 861.0000678896904, + "z": "4e5f9446.b42e3c", "wires": [] }, { - "id": "166cfcae.a53de3", + "id": "83fb72db.90602", "type": "save", "name": "save sdwan vpn resource in AAI", "xml": "\n\n\n\n\n\n\n\n\n", "comments": "", "outputs": 1, - "x": 838.0000438690186, - "y": 940.5000152587891, - "z": "f1f197ca.402af8", + "x": 820.0039501190186, + "y": 906.5000157356262, + "z": "4e5f9446.b42e3c", "wires": [ [] ] }, { - "id": "b6ddeb01.d7f708", + "id": "bbeb53a3.c2576", "type": "returnSuccess", "name": "return success", "xml": "\n\n\n\n", "comments": "", - "x": 785.7225170135498, - "y": 1033.6739058494568, - "z": "f1f197ca.402af8", + "x": 767.7264232635498, + "y": 999.673906326294, + "z": "4e5f9446.b42e3c", "wires": [] }, { - "id": "83d0d62b.725028", + "id": "37a48c20.31bdf4", "type": "for", "name": "for loop i - Network input parameters", "xml": "\n", "comments": "", "outputs": 1, - "x": 849.2539215087891, - "y": 583.50390625, - "z": "f1f197ca.402af8", + "x": 831.2578277587891, + "y": 549.5039067268372, + "z": "4e5f9446.b42e3c", "wires": [ [ - "4fef64f6.74978c" + "4c79fd81.204e24" ] ] }, { - "id": "4fef64f6.74978c", + "id": "4c79fd81.204e24", "type": "block", "name": "block", "xml": "\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1136.4767990112305, - "y": 583.7262201309204, - "z": "f1f197ca.402af8", + "x": 1118.4807052612305, + "y": 549.7262206077576, + "z": "4e5f9446.b42e3c", "wires": [ [ - "70539f79.6843b", - "69460cae.8c8bb4" + "6ee57e2b.017f1", + "6d15949f.a4f72c" ] ] }, { - "id": "70539f79.6843b", + "id": "6ee57e2b.017f1", "type": "switchNode", "name": "switch name", "xml": "\n\n", "comments": "", "outputs": 1, - "x": 1324.698642730713, - "y": 566.0595242977142, - "z": "f1f197ca.402af8", + "x": 1306.702548980713, + "y": 532.0595247745514, + "z": "4e5f9446.b42e3c", "wires": [ [ - "63c5ecf6.3d2174" + "3f65f879.eac058" ] ] }, { - "id": "69460cae.8c8bb4", + "id": "6d15949f.a4f72c", "type": "switchNode", "name": "switch topology", "xml": "", "comments": "", "outputs": 1, - "x": 1335.5383033752441, - "y": 606.0595223903656, - "z": "f1f197ca.402af8", + "x": 1317.5422096252441, + "y": 572.0595228672028, + "z": "4e5f9446.b42e3c", "wires": [ [ - "c6e54399.0667f" + "a2b79be1.ed04c8" ] ] }, { - "id": "63c5ecf6.3d2174", + "id": "3f65f879.eac058", "type": "outcomeTrue", "name": "true", "xml": "\n", "comments": "", "outputs": 1, - "x": 1511.698642730713, - "y": 562.0595242977142, - "z": "f1f197ca.402af8", + "x": 1493.702548980713, + "y": 528.0595247745514, + "z": "4e5f9446.b42e3c", "wires": [ [ - "7b7eb3bd.411e2c" + "2305c57e.8cca7a" ] ] }, { - "id": "c6e54399.0667f", + "id": "a2b79be1.ed04c8", "type": "outcomeTrue", "name": "true", "xml": "\n", "comments": "", "outputs": 1, - "x": 1505.5383033752441, - "y": 602.0595223903656, - "z": "f1f197ca.402af8", + "x": 1487.5422096252441, + "y": 568.0595228672028, + "z": "4e5f9446.b42e3c", "wires": [ [ - "660aadb7.bbfbd4" + "4726038d.e1157c" ] ] }, { - "id": "7b7eb3bd.411e2c", + "id": "2305c57e.8cca7a", "type": "set", "name": "set name", "xml": "\n\n\n", "comments": "", - "x": 1661.69877243042, - "y": 560.659530878067, - "z": "f1f197ca.402af8", + "x": 1643.70267868042, + "y": 526.6595313549042, + "z": "4e5f9446.b42e3c", "wires": [] }, { - "id": "660aadb7.bbfbd4", + "id": "4726038d.e1157c", "type": "set", "name": "set topology", "xml": "\n\n", "comments": "", - "x": 1692.8717441558838, - "y": 600.5206792354584, - "z": "f1f197ca.402af8", + "x": 1674.8756504058838, + "y": 566.5206797122955, + "z": "4e5f9446.b42e3c", "wires": [] }, { - "id": "8a6622c.9c3e9e", + "id": "c012bd48.a280b", "type": "call", "name": "call GENERIC-RESOURCE-API:validate-sdwan-vf-vpn-input-parameters", "xml": "\n", "comments": "", "outputs": 1, - "x": 950.5039215087891, - "y": 173.00390625, - "z": "f1f197ca.402af8", + "x": 932.5078277587891, + "y": 139.00390672683716, + "z": "4e5f9446.b42e3c", "wires": [ [] ] }, { - "id": "d3e9377a.b7b628", + "id": "3e34e572.c1fb4a", "type": "set", "name": "set vf-module-object-path", - "xml": "\n\n\n\n\n", + "xml": "\n\n\n\n\n", "comments": "", - "x": 823.5000610351562, - "y": 846.0312868952751, - "z": "f1f197ca.402af8", + "x": 805.5039672851562, + "y": 812.0312873721123, + "z": "4e5f9446.b42e3c", "wires": [] }, { - "id": "4cde94b6.d8700c", + "id": "370a2393.20ff3c", "type": "save", "name": "save service relationship in AAI", "xml": "\n\n\n\n\n\n", "comments": "", "outputs": 1, - "x": 838.0001220703125, - "y": 988.0001564025879, - "z": "f1f197ca.402af8", + "x": 820.0040283203125, + "y": 954.000156879425, + "z": "4e5f9446.b42e3c", "wires": [ [] ] } -] +] \ No newline at end of file diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-pnf-ra-assignment.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-pnf-ra-assignment.xml index 707de84b..fb782ada 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-pnf-ra-assignment.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-pnf-ra-assignment.xml @@ -137,7 +137,7 @@ - + diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vfmodule-ra-assignment.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vfmodule-ra-assignment.xml index f9e12e4e..1553f977 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vfmodule-ra-assignment.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vfmodule-ra-assignment.xml @@ -162,7 +162,7 @@ - + diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vnf-ra-assignment.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vnf-ra-assignment.xml index cee988dd..2834e11f 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vnf-ra-assignment.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_self-serve-vnf-ra-assignment.xml @@ -137,7 +137,7 @@ - + diff --git a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation.xml b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation.xml index eab88b48..fb12ca3e 100644 --- a/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation.xml +++ b/platform-logic/generic-resource-api/src/main/xml/GENERIC-RESOURCE-API_vf-module-topology-operation.xml @@ -16,19 +16,25 @@ + + + + + + - - - + + + @@ -44,15 +50,15 @@ - - - + + + @@ -68,15 +74,15 @@ - - - + + + @@ -92,15 +98,15 @@ - - - + + + @@ -110,15 +116,6 @@ - - - - - - - - - diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-device-create.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-device-create.xml index 9b3109d3..80df2aad 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-device-create.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-device-create.xml @@ -3,6 +3,9 @@ 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}'> + + + @@ -21,28 +24,77 @@ - + - - - + + + + + - - + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + @@ -63,29 +115,22 @@ - - - - - - - + - - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + diff --git a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-create.xml b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-create.xml index 3e5e8d90..02a816bd 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-create.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sdwan/GENERIC-RESOURCE-API_sdwan-vf-operation-vpn-create.xml @@ -98,7 +98,7 @@ - + - + \ No newline at end of file diff --git a/platform-logic/restapi-templates/pom.xml b/platform-logic/restapi-templates/pom.xml index aeb7b290..47efea15 100644 --- a/platform-logic/restapi-templates/pom.xml +++ b/platform-logic/restapi-templates/pom.xml @@ -46,6 +46,13 @@ true + + src/main/multipartfile + + **/*.* + + true + diff --git a/platform-logic/restapi-templates/src/main/multipartfile/README.md b/platform-logic/restapi-templates/src/main/multipartfile/README.md new file mode 100644 index 00000000..454d373f --- /dev/null +++ b/platform-logic/restapi-templates/src/main/multipartfile/README.md @@ -0,0 +1,3 @@ +This source folder contains multi part form data files used as part of RestApiCallNode plugin usage by DGs. + +