From bb560f77ea1ebfc01ecd907ed5e2e61521da596e Mon Sep 17 00:00:00 2001 From: Hesam Rahimi Date: Thu, 7 May 2020 18:16:58 +0000 Subject: NNI-based Service creation DG bug fixes (uni, l2vpn, and underlay resources). - This is needed for F release Issue-ID: SDNC-1184 Signed-off-by: Hesam Rahimi Change-Id: Ib35d7a70e862c6068d9e3edc10f7d80ba5764e6a (cherry picked from commit ccf839a4815dc7e26deaf36627d04c0a4587780b [formerly f515a8831e0036414d69d73030e871dec88180f8]) Former-commit-id: fe1e29bd322bdb230b2bcf69fd3823567f11f7f2 --- .../DataChange_update-network-links-to-aai.json | 1246 +++++----- .../json/DataChange_update-network-to-aai.json | 480 ++-- .../DataChange_update-tp-ttp-relationship.json | 404 +-- .../xml/DataChange_update-network-links-to-aai.xml | 516 ++-- .../main/xml/DataChange_update-network-to-aai.xml | 290 +-- .../xml/DataChange_update-tp-ttp-relationship.xml | 103 +- ...ENERIC-RESOURCE-API_sotn-create-otn-tunnel.json | 578 +++-- ...URCE-API_sotn-get-otn-tunnel-path-from-oof.json | 2597 ++++++++++---------- ...-RESOURCE-API_sotn-get-vf-module-uni-param.json | 166 +- ...OURCE-API_sotn-vf-operation-l2vpn-activate.json | 250 +- ...ESOURCE-API_sotn-vf-operation-l2vpn-create.json | 586 +++-- ...ESOURCE-API_sotn-vf-operation-uni-activate.json | 933 +++---- ...-RESOURCE-API_sotn-vf-operation-uni-create.json | 440 ++-- ...n-vnf-topology-operation-underlay-activate.json | 250 +- ...otn-vnf-topology-operation-underlay-create.json | 344 +-- ...GENERIC-RESOURCE-API_sotn-create-otn-tunnel.xml | 86 +- ...OURCE-API_sotn-get-otn-tunnel-path-from-oof.xml | 380 +-- ...C-RESOURCE-API_sotn-get-vf-module-uni-param.xml | 4 +- ...SOURCE-API_sotn-vf-operation-l2vpn-activate.xml | 70 +- ...RESOURCE-API_sotn-vf-operation-l2vpn-create.xml | 118 +- ...RESOURCE-API_sotn-vf-operation-uni-activate.xml | 79 +- ...C-RESOURCE-API_sotn-vf-operation-uni-create.xml | 64 +- ...tn-vnf-topology-operation-underlay-activate.xml | 10 +- ...sotn-vnf-topology-operation-underlay-create.xml | 22 +- 24 files changed, 5261 insertions(+), 4755 deletions(-) diff --git a/platform-logic/datachange/src/main/json/DataChange_update-network-links-to-aai.json b/platform-logic/datachange/src/main/json/DataChange_update-network-links-to-aai.json index 236bc6a3..0d6a2784 100644 --- a/platform-logic/datachange/src/main/json/DataChange_update-network-links-to-aai.json +++ b/platform-logic/datachange/src/main/json/DataChange_update-network-links-to-aai.json @@ -1,20 +1,20 @@ [ { - "id": "eb6ce69b.3f957", + "id": "ebe56983.0d3a9", "type": "dgstart", "name": "DGSTART", "outputs": 1, - "x": 248, - "y": 67, - "z": "42ade40f.4fa29c", + "x": 134, + "y": 65, + "z": "3cbec5d5.54ea02", "wires": [ [ - "dc110d5e.a3e278" + "13e5c84a.55bf3" ] ] }, { - "id": "dc110d5e.a3e278", + "id": "13e5c84a.55bf3", "type": "service-logic", "name": "DataChange ${project.version}", "module": "DataChange", @@ -22,1885 +22,1885 @@ "comments": "", "xml": "", "outputs": 1, - "x": 305, - "y": 146.888916015625, - "z": "42ade40f.4fa29c", + "x": 191, + "y": 144.888916015625, + "z": "3cbec5d5.54ea02", "wires": [ [ - "5f52c1a1.066a8" + "66a22ecb.fd2f58" ] ] }, { - "id": "5f52c1a1.066a8", + "id": "66a22ecb.fd2f58", "type": "method", "name": "method update-network-links-to-aai", "xml": "\n", "comments": "", "outputs": 1, - "x": 319, - "y": 223.22222900390625, - "z": "42ade40f.4fa29c", + "x": 205, + "y": 221.22222900390625, + "z": "3cbec5d5.54ea02", "wires": [ [ - "d4e648b5.a39fa8" + "6e3553b1.ce5dcc" ] ] }, { - "id": "d4e648b5.a39fa8", + "id": "6e3553b1.ce5dcc", "type": "block", "name": "block : atomic", "xml": "\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 330.33343505859375, - "y": 300.7779235839844, - "z": "42ade40f.4fa29c", + "x": 216.33343505859375, + "y": 298.7779235839844, + "z": "3cbec5d5.54ea02", "wires": [ [ - "e5c5d545.9d86e8" + "ce48b85e.94f938" ] ] }, { - "id": "367c2dd.186e752", + "id": "a43a6e87.7bb85", "type": "update", "name": "save logical-link with regular id", "xml": "\n\n\n\n\n\n\n\n\n", "comments": "", "outputs": 1, - "x": 1205.111083984375, - "y": 725.111083984375, - "z": "42ade40f.4fa29c", + "x": 1091.111083984375, + "y": 723.111083984375, + "z": "3cbec5d5.54ea02", "wires": [ [] ] }, { - "id": "e5c5d545.9d86e8", + "id": "ce48b85e.94f938", "type": "for", "name": "for each link", "xml": "\n", "comments": "", "outputs": 1, - "x": 358.88885498046875, - "y": 394.33331298828125, - "z": "42ade40f.4fa29c", + "x": 244.88885498046875, + "y": 392.33331298828125, + "z": "3cbec5d5.54ea02", "wires": [ [ - "c535a196.07d77", - "2b697423.656f74", - "23c74055.452fd8", - "357884ff.889364", - "5d91edd1.3c2f24" + "dec42fbf.1e3dc8", + "faf4c2c8.a313e8", + "6624aa74.606e14", + "dbc86076.1de4f", + "4c4fa03a.a50f2" ] ] }, { - "id": "c535a196.07d77", + "id": "dec42fbf.1e3dc8", "type": "set", "name": "set network link's local variables", "xml": "\n\n\n\n", "comments": "", - "x": 691.111083984375, - "y": 99.22221374511719, - "z": "42ade40f.4fa29c", + "x": 577.111083984375, + "y": 97.22221374511719, + "z": "3cbec5d5.54ea02", "wires": [] }, { - "id": "3a0f4814.b217", + "id": "9f28786b.9755c", "type": "for", "name": "for each label-restriction", "xml": "\n", "comments": "", "outputs": 1, - "x": 1731.4444580078125, - "y": 945.111083984375, - "z": "42ade40f.4fa29c", + "x": 1617.4444580078125, + "y": 943.111083984375, + "z": "3cbec5d5.54ea02", "wires": [ [ - "2cea987d.04721", - "76b35791.18f63", - "2f963aac.304aa6", - "a173e4f5.f5a478", - "c921d18d.970b48", - "15c10484.c4629b" + "a10e9de3.90e708", + "9f6f811c.bccf8", + "7166bef0.82e4a", + "c6ea0cbf.fb7cd", + "441a859d.1c08ec", + "e1339bff.8f7f98" ] ] }, { - "id": "2cea987d.04721", + "id": "a10e9de3.90e708", "type": "set", "name": "set label-restriction's local variables", "xml": "\n\n", "comments": "", - "x": 2036.111328125, - "y": 910.0000610351562, - "z": "42ade40f.4fa29c", + "x": 1922.111328125, + "y": 908.0000610351562, + "z": "3cbec5d5.54ea02", "wires": [] }, { - "id": "a53b765.67e4408", + "id": "481ae7ff.84ac9", "type": "success", "name": "success", "xml": "\n", "comments": "", "outputs": 1, - "x": 2149.4998779296875, - "y": 952.74609375, - "z": "42ade40f.4fa29c", + "x": 2035.4998779296875, + "y": 950.74609375, + "z": "3cbec5d5.54ea02", "wires": [ [ - "bcb47eec.4c95d8" + "4b5e8d4c.a2cfc4" ] ] }, { - "id": "987d5f9c.60006", + "id": "958898b9.8616a", "type": "failure", "name": "failure", "xml": "\n", "comments": "", "outputs": 1, - "x": 2157.178466796875, - "y": 1011.9604187011719, - "z": "42ade40f.4fa29c", + "x": 2043.178466796875, + "y": 1009.9604187011719, + "z": "3cbec5d5.54ea02", "wires": [ [ - "e46f36b.2789648" + "76714a99.5b6304" ] ] }, { - "id": "bcb47eec.4c95d8", + "id": "4b5e8d4c.a2cfc4", "type": "block", "name": "block", "xml": "\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 2310, - "y": 952.0000305175781, - "z": "42ade40f.4fa29c", + "x": 2196, + "y": 950.0000305175781, + "z": "3cbec5d5.54ea02", "wires": [ [] ] }, { - "id": "df8ec894.2ce188", + "id": "1494b149.c9a337", "type": "set", "name": "set src-ltpId dst-ltpId", "xml": "\n\n", "comments": "", - "x": 2718.5001220703125, - "y": 2414.545135498047, - "z": "42ade40f.4fa29c", + "x": 2604.5001220703125, + "y": 2412.545135498047, + "z": "3cbec5d5.54ea02", "wires": [] }, { - "id": "ed966c58.9421a", + "id": "ed0f5687.170a7", "type": "save", "name": "save srcLTP relationship in AAI", "xml": "\n\n\n\n\n\n\n\n", "comments": "", "outputs": 1, - "x": 2752.0001220703125, - "y": 2454.545135498047, - "z": "42ade40f.4fa29c", + "x": 2638.0001220703125, + "y": 2452.545135498047, + "z": "3cbec5d5.54ea02", "wires": [ [] ] }, { - "id": "c79cef0b.98c06", + "id": "c964af3.a8439d", "type": "save", "name": "save dstLTP relationship in AAI", "xml": "\n\n\n\n", "comments": "", "outputs": 1, - "x": 2752.0001220703125, - "y": 2494.545135498047, - "z": "42ade40f.4fa29c", + "x": 2638.0001220703125, + "y": 2492.545135498047, + "z": "3cbec5d5.54ea02", "wires": [ [] ] }, { - "id": "e46f36b.2789648", + "id": "76714a99.5b6304", "type": "update", "name": "save label-restriction", "xml": " \n\n\n\n\n\n\n\n", "comments": "", "outputs": 1, - "x": 2341, - "y": 1012.0000305175781, - "z": "42ade40f.4fa29c", + "x": 2227, + "y": 1010.0000305175781, + "z": "3cbec5d5.54ea02", "wires": [ [] ] }, { - "id": "cce10880.3add5", + "id": "df8f6a30.0e19f", "type": "save", "name": "save link relationship to label-restriction in AAI", "xml": "\n\n\n\n\n", "comments": "", "outputs": 1, - "x": 2052, - "y": 1208, - "z": "42ade40f.4fa29c", + "x": 1938, + "y": 1206, + "z": "3cbec5d5.54ea02", "wires": [ [] ] }, { - "id": "76b35791.18f63", + "id": "9f6f811c.bccf8", "type": "update", "name": "save label-restriction", "xml": " \n\n\n\n\n\n\n\n", "comments": "", "outputs": 1, - "x": 1990.815185546875, - "y": 984.5556640625, - "z": "42ade40f.4fa29c", + "x": 1876.815185546875, + "y": 982.5556640625, + "z": "3cbec5d5.54ea02", "wires": [ [ - "a53b765.67e4408", - "987d5f9c.60006" + "481ae7ff.84ac9", + "958898b9.8616a" ] ] }, { - "id": "6bd86154.f4552", + "id": "e7971b0b.c3d0c", "type": "switchNode", "name": "switch te-link-attributes label-restriction_length", "xml": "\n", "comments": "", "outputs": 1, - "x": 1250, - "y": 945, - "z": "42ade40f.4fa29c", + "x": 1136, + "y": 943, + "z": "3cbec5d5.54ea02", "wires": [ [ - "6ededdc5.cf6c8c", - "ecaf5041.3bee8", - "5dbfa8d0.65ebe" + "d0a27e5d.161cf", + "c301ff98.2e6928", + "4d75dbb8.4d6b04" ] ] }, { - "id": "2b697423.656f74", + "id": "faf4c2c8.a313e8", "type": "switchNode", "name": "switch link.destination", "xml": "\n", "comments": "", "outputs": 1, - "x": 667, - "y": 204, - "z": "42ade40f.4fa29c", + "x": 553, + "y": 202, + "z": "3cbec5d5.54ea02", "wires": [ [ - "6a7d179d.85fe8", - "e3266b7a.5033d8" + "998d07b5.34538", + "4877c101.9ce65" ] ] }, { - "id": "6a7d179d.85fe8", + "id": "998d07b5.34538", "type": "outcome", "name": "Null", "xml": "\n", "comments": "", "outputs": 1, - "x": 871, - "y": 165, - "z": "42ade40f.4fa29c", + "x": 757, + "y": 163, + "z": "3cbec5d5.54ea02", "wires": [ [ - "ea7811a5.6557e" + "c3ced1a5.7034b" ] ] }, { - "id": "e3266b7a.5033d8", + "id": "4877c101.9ce65", "type": "other", "name": "other", "xml": "\n", "comments": "", "outputs": 1, - "x": 868, - "y": 227, - "z": "42ade40f.4fa29c", + "x": 754, + "y": 225, + "z": "3cbec5d5.54ea02", "wires": [ [ - "68cf703d.fdacb8" + "d4197495.299218" ] ] }, { - "id": "68cf703d.fdacb8", + "id": "d4197495.299218", "type": "set", "name": "set network link's destination variables", "xml": "\n\n\n\n\n", "comments": "", - "x": 1097, - "y": 190, - "z": "42ade40f.4fa29c", + "x": 983, + "y": 188, + "z": "3cbec5d5.54ea02", "wires": [] }, { - "id": "d8b9afa9.8c7938", + "id": "c382f34.d97691", "type": "set", "name": "set is-open-ended-link", "xml": "\n\n\n", "comments": "", - "x": 1275, - "y": 65, - "z": "42ade40f.4fa29c", + "x": 1161, + "y": 63, + "z": "3cbec5d5.54ea02", "wires": [] }, { - "id": "4445364b.3ff31", + "id": "ff450949.dbf658", "type": "save", "name": "get p-interface from aai", "xml": "", "comments": "", "outputs": 1, - "x": 1278, - "y": 150, - "z": "42ade40f.4fa29c", + "x": 1164, + "y": 148, + "z": "3cbec5d5.54ea02", "wires": [ [ - "1fabb633.34a7e2", - "30ce6e4c.0b0d22", - "78ec6cbb.d8199c" + "5da3043a.2acbac", + "1bf53d3.d439ac3", + "8f4faa5b.7a92c" ] ] }, { - "id": "1fabb633.34a7e2", + "id": "5da3043a.2acbac", "type": "success", "name": "success", "xml": "\n", "comments": "", "outputs": 1, - "x": 1521, - "y": 145, - "z": "42ade40f.4fa29c", + "x": 1407, + "y": 143, + "z": "3cbec5d5.54ea02", "wires": [ [ - "f6b85f73.a6bb" + "ce061615.442fb" ] ] }, { - "id": "30ce6e4c.0b0d22", + "id": "1bf53d3.d439ac3", "type": "failure", "name": "failure", "xml": "\n", "comments": "", "outputs": 1, - "x": 1519, - "y": 234, - "z": "42ade40f.4fa29c", + "x": 1405, + "y": 232, + "z": "3cbec5d5.54ea02", "wires": [ [ - "112ae233.6a9666" + "8dce7fe6.cbf1f" ] ] }, { - "id": "2d37b161.c87e5e", + "id": "863e663a.20d8f8", "type": "set", "name": "set alternative unique link id", "xml": "\n\n\n\n", "comments": "", - "x": 2194, - "y": 162, - "z": "42ade40f.4fa29c", + "x": 2080, + "y": 160, + "z": "3cbec5d5.54ea02", "wires": [] }, { - "id": "112ae233.6a9666", + "id": "8dce7fe6.cbf1f", "type": "returnFailure", "name": "return failure", "xml": "\n\n\n", "comments": "", - "x": 1688, - "y": 235, - "z": "42ade40f.4fa29c", + "x": 1574, + "y": 233, + "z": "3cbec5d5.54ea02", "wires": [] }, { - "id": "b25a39cd.f52a6", + "id": "2b1dcd15.312222", "type": "save", "name": "get logical-link from aai", "xml": "", "comments": "", "outputs": 1, - "x": 986, - "y": 671, - "z": "42ade40f.4fa29c", + "x": 872, + "y": 669, + "z": "3cbec5d5.54ea02", "wires": [ [ - "2eac00b.0ddcd8", - "cef26741.44e878" + "ec693039.84dc28", + "3de532fd.f494f6" ] ] }, { - "id": "78ec6cbb.d8199c", + "id": "8f4faa5b.7a92c", "type": "not-found", "name": "not-found", "xml": "\n", "comments": "", "outputs": 1, - "x": 1530.490966796875, - "y": 187.57403564453125, - "z": "42ade40f.4fa29c", + "x": 1416.490966796875, + "y": 185.57403564453125, + "z": "3cbec5d5.54ea02", "wires": [ [ - "cc3c7aa7.507dd8" + "788cf8a5.93c298" ] ] }, { - "id": "cc3c7aa7.507dd8", + "id": "788cf8a5.93c298", "type": "returnFailure", "name": "return failure", "xml": "\n\t\n\t\n \n", "comments": "", "outputs": 1, - "x": 565, - "y": 710, - "z": "42ade40f.4fa29c", + "x": 451, + "y": 708, + "z": "3cbec5d5.54ea02", "wires": [ [ - "7bffce42.060d68", - "601fa3d8.aedcac" + "6cd18165.d49da8", + "a4b87205.849aa" ] ] }, { - "id": "7bffce42.060d68", + "id": "6cd18165.d49da8", "type": "outcomeFalse", "name": "false", "xml": "\n", "comments": "", "outputs": 1, - "x": 782, - "y": 732, - "z": "42ade40f.4fa29c", + "x": 668, + "y": 730, + "z": "3cbec5d5.54ea02", "wires": [ [ - "d9f05462.4a8968" + "6eb10efe.79be58" ] ] }, { - "id": "601fa3d8.aedcac", + "id": "a4b87205.849aa", "type": "outcomeTrue", "name": "true", "xml": "\n", "comments": "", "outputs": 1, - "x": 785, - "y": 672, - "z": "42ade40f.4fa29c", + "x": 671, + "y": 670, + "z": "3cbec5d5.54ea02", "wires": [ [ - "b25a39cd.f52a6" + "2b1dcd15.312222" ] ] }, { - "id": "2eac00b.0ddcd8", + "id": "ec693039.84dc28", "type": "success", "name": "success", "xml": "\n", "comments": "", "outputs": 1, - "x": 1230, - "y": 341, - "z": "42ade40f.4fa29c", + "x": 1116, + "y": 339, + "z": "3cbec5d5.54ea02", "wires": [ [ - "d26336.070c9cc8" + "7e014e1e.a8dd8" ] ] }, { - "id": "cef26741.44e878", + "id": "3de532fd.f494f6", "type": "not-found", "name": "not-found", "xml": "\n", "comments": "", "outputs": 1, - "x": 1255.490966796875, - "y": 536.5740356445312, - "z": "42ade40f.4fa29c", + "x": 1141.490966796875, + "y": 534.5740356445312, + "z": "3cbec5d5.54ea02", "wires": [ [ - "1417b1e7.adccae" + "308dc22b.73a67e" ] ] }, { - "id": "c9f57eec.3fa43", + "id": "2e5d2820.63e8c", "type": "update", "name": "save logical-link with alternative link id", - "xml": "\n\n\n\n\n\n\n\n\n", + "xml": "\n\n\n\n\n\n\n\n\n", "comments": "", "outputs": 1, - "x": 1727, - "y": 558, - "z": "42ade40f.4fa29c", + "x": 1613, + "y": 556, + "z": "3cbec5d5.54ea02", "wires": [ [] ] }, { - "id": "d9f05462.4a8968", + "id": "6eb10efe.79be58", "type": "block", "name": "block : atomic", "xml": "", "atomic": "true", "comments": "", "outputs": 1, - "x": 960, - "y": 740, - "z": "42ade40f.4fa29c", + "x": 846, + "y": 738, + "z": "3cbec5d5.54ea02", "wires": [ [ - "367c2dd.186e752", - "6bd86154.f4552", - "8c3bc53e.020c3", - "3b98d33.38a2bac", - "9f4e28fe.9e925" + "a43a6e87.7bb85", + "e7971b0b.c3d0c", + "a6b6ae44.7eb2a8", + "370b414a.4eba76", + "4aadddbd.521a8c" ] ] }, { - "id": "882e1409.701ce8", + "id": "521f891d.91cfc8", "type": "save", "name": "update dest TP by putting src TP of the current link", "xml": "\n\n\n\n\n\n\n\n\n", "comments": "", "outputs": 1, - "x": 2641, - "y": 387, - "z": "42ade40f.4fa29c", + "x": 2527, + "y": 385, + "z": "3cbec5d5.54ea02", "wires": [ [ - "a1bfa8c8.032428", - "4552885e.7227f8" + "27e614a8.33d2f4", + "5b692078.dcecc" ] ] }, { - "id": "7c1006a1.c0bf28", + "id": "6468635a.9e6d94", "type": "save", "name": "save source and dest TP", "xml": "\n\n\n\n\n\n\n\n\n", "comments": "", "outputs": 1, - "x": 1190, - "y": 1179, - "z": "42ade40f.4fa29c", + "x": 1076, + "y": 1177, + "z": "3cbec5d5.54ea02", "wires": [ [] ] }, { - "id": "ea7811a5.6557e", + "id": "c3ced1a5.7034b", "type": "block", "name": "block", "xml": "\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1059, - "y": 126, - "z": "42ade40f.4fa29c", + "x": 945, + "y": 124, + "z": "3cbec5d5.54ea02", "wires": [ [ - "d8b9afa9.8c7938", - "4445364b.3ff31", - "78b9c95f.ae17e8" + "c382f34.d97691", + "ff450949.dbf658", + "b85c23da.8517d" ] ] }, { - "id": "1417b1e7.adccae", + "id": "308dc22b.73a67e", "type": "block", "name": "block : atomic", "xml": "", "atomic": "true", "comments": "", "outputs": 1, - "x": 1444, - "y": 539, - "z": "42ade40f.4fa29c", + "x": 1330, + "y": 537, + "z": "3cbec5d5.54ea02", "wires": [ [ - "c9f57eec.3fa43", - "fe6e139a.88d838", - "1e861048.9f807", - "fc9bbbc9.76dd6" + "2e5d2820.63e8c", + "3996c800.afa0a8", + "d3a8ab71.fccb7", + "6c137df8.722b8c" ] ] }, { - "id": "fe6e139a.88d838", + "id": "3996c800.afa0a8", "type": "save", "name": "save source only", "xml": "\n\n\n\n\n", "comments": "", "outputs": 1, - "x": 1656, - "y": 619, - "z": "42ade40f.4fa29c", + "x": 1542, + "y": 617, + "z": "3cbec5d5.54ea02", "wires": [ [] ] }, { - "id": "ed1851cd.c2d2d", + "id": "51ef22a.000c3dc", "type": "for", "name": "for each label-restriction", "xml": "\n", "comments": "", "outputs": 1, - "x": 2183, - "y": 745, - "z": "42ade40f.4fa29c", + "x": 2069, + "y": 743, + "z": "3cbec5d5.54ea02", "wires": [ [ - "bf2a36f0.0411c", - "1a178b14.9ad4dd", - "13838be4.d07ac4", - "ec158e78.eb2b58", - "a3570d8f.6b641", - "1375d0c1.e8bf07" + "cb31166c.2edd2", + "db1f7d98.2def68", + "c4dd69cd.d872b", + "f581a4e4.841408", + "f2fac409.beeaf8", + "ea1f1d76.87207" ] ] }, { - "id": "bf2a36f0.0411c", + "id": "cb31166c.2edd2", "type": "set", "name": "set label-restriction's local variables", "xml": "\n\n", "comments": "", - "x": 2473.6669921875, - "y": 623.8889770507812, - "z": "42ade40f.4fa29c", + "x": 2359.6669921875, + "y": 621.8889770507812, + "z": "3cbec5d5.54ea02", "wires": [] }, { - "id": "eb573572.449a5", + "id": "1dcb5e38.622da2", "type": "success", "name": "success", "xml": "\n", "comments": "", "outputs": 1, - "x": 2615.0555419921875, - "y": 702.635009765625, - "z": "42ade40f.4fa29c", + "x": 2501.0555419921875, + "y": 700.635009765625, + "z": "3cbec5d5.54ea02", "wires": [ [ - "80720656.40f1f8" + "2526017c.1c252e" ] ] }, { - "id": "e5ad824b.fd1c3", + "id": "19906550.30ac83", "type": "failure", "name": "failure", "xml": "\n", "comments": "", "outputs": 1, - "x": 2622.734130859375, - "y": 761.8493347167969, - "z": "42ade40f.4fa29c", + "x": 2508.734130859375, + "y": 759.8493347167969, + "z": "3cbec5d5.54ea02", "wires": [ [ - "75cc9002.94bbf8" + "52d0ed95.142f34" ] ] }, { - "id": "80720656.40f1f8", + "id": "2526017c.1c252e", "type": "block", "name": "block", "xml": "\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 2775.5556640625, - "y": 701.8889465332031, - "z": "42ade40f.4fa29c", + "x": 2661.5556640625, + "y": 699.8889465332031, + "z": "3cbec5d5.54ea02", "wires": [ [] ] }, { - "id": "75cc9002.94bbf8", + "id": "52d0ed95.142f34", "type": "update", "name": "save label-restriction", "xml": " \n\n\n\n\n\n\n\n", "comments": "", "outputs": 1, - "x": 2806.5556640625, - "y": 761.8889465332031, - "z": "42ade40f.4fa29c", + "x": 2692.5556640625, + "y": 759.8889465332031, + "z": "3cbec5d5.54ea02", "wires": [ [] ] }, { - "id": "cb668db0.48c4b", + "id": "e7979ea6.dbce4", "type": "save", "name": "save link relationship to label-restriction in AAI", "xml": "\n\n\n\n\n", "comments": "", "outputs": 1, - "x": 2482.5556640625, - "y": 894.888916015625, - "z": "42ade40f.4fa29c", + "x": 2368.5556640625, + "y": 892.888916015625, + "z": "3cbec5d5.54ea02", "wires": [ [] ] }, { - "id": "1a178b14.9ad4dd", + "id": "db1f7d98.2def68", "type": "update", "name": "save label-restriction", "xml": " \n\n\n\n\n\n\n", "comments": "", "outputs": 1, - "x": 2424.370849609375, - "y": 734.444580078125, - "z": "42ade40f.4fa29c", + "x": 2310.370849609375, + "y": 732.444580078125, + "z": "3cbec5d5.54ea02", "wires": [ [ - "eb573572.449a5", - "e5ad824b.fd1c3" + "1dcb5e38.622da2", + "19906550.30ac83" ] ] }, { - "id": "23c74055.452fd8", + "id": "6624aa74.606e14", "type": "set", "name": "set more local variables", "xml": "\n\n\n\n", "comments": "", - "x": 668, - "y": 149, - "z": "42ade40f.4fa29c", + "x": 554, + "y": 147, + "z": "3cbec5d5.54ea02", "wires": [] }, { - "id": "93546ba2.1bedb8", + "id": "6e337c6f.cd362c", "type": "block", "name": "block", "xml": "\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1610, - "y": 62, - "z": "42ade40f.4fa29c", + "x": 1496, + "y": 60, + "z": "3cbec5d5.54ea02", "wires": [ [] ] }, { - "id": "f6b85f73.a6bb", + "id": "ce061615.442fb", "type": "switchNode", "name": "switch inter-domain-plug-id of the src tp", "xml": "\n", "comments": "", "outputs": 1, - "x": 1760, - "y": 142, - "z": "42ade40f.4fa29c", + "x": 1646, + "y": 140, + "z": "3cbec5d5.54ea02", "wires": [ [ - "905e14d2.8e13d", - "56d86a80.47b554" + "a445a8a1.87665", + "7abf5d27.d789e4" ] ] }, { - "id": "905e14d2.8e13d", + "id": "a445a8a1.87665", "type": "outcome", "name": "Null", "xml": "\n", "comments": "", "outputs": 1, - "x": 1990, - "y": 89, - "z": "42ade40f.4fa29c", + "x": 1876, + "y": 87, + "z": "3cbec5d5.54ea02", "wires": [ [ - "39191ee3.a2421a" + "85dfc9e9.b205a8" ] ] }, { - "id": "56d86a80.47b554", + "id": "7abf5d27.d789e4", "type": "other", "name": "other", "xml": "\n", "comments": "", "outputs": 1, - "x": 1994, - "y": 162, - "z": "42ade40f.4fa29c", + "x": 1880, + "y": 160, + "z": "3cbec5d5.54ea02", "wires": [ [ - "2d37b161.c87e5e" + "863e663a.20d8f8" ] ] }, { - "id": "39191ee3.a2421a", + "id": "85dfc9e9.b205a8", "type": "set", "name": "unset is-open-ended-link", "xml": "\n\n\n\n", "comments": "", - "x": 2178, - "y": 85, - "z": "42ade40f.4fa29c", + "x": 2064, + "y": 83, + "z": "3cbec5d5.54ea02", "wires": [] }, { - "id": "1ecef5c2.0f02ca", + "id": "5df859b8.6bf788", "type": "save", "name": "delete logical-link", "xml": "\n", "comments": "", "outputs": 1, - "x": 2159, - "y": 34, - "z": "42ade40f.4fa29c", + "x": 2045, + "y": 32, + "z": "3cbec5d5.54ea02", "wires": [ [] ] }, { - "id": "357884ff.889364", + "id": "dbc86076.1de4f", "type": "set", "name": "unset network link's local variables", "xml": "\n\n\n\n\n\n\n", "comments": "", - "x": 696, - "y": 41, - "z": "42ade40f.4fa29c", + "x": 582, + "y": 39, + "z": "3cbec5d5.54ea02", "wires": [] }, { - "id": "37660aa6.c865c6", + "id": "5be7d94e.325bd", "type": "switchNode", "name": "switch is-invalid-open-ended-link", "xml": "\n", "comments": "", "outputs": 1, - "x": 786, - "y": 1157, - "z": "42ade40f.4fa29c", + "x": 672, + "y": 1155, + "z": "3cbec5d5.54ea02", "wires": [ [ - "f54e3efd.634a38", - "8022555f.169df8" + "3a021903.aa35de", + "bd6a87fb.60cad" ] ] }, { - "id": "8022555f.169df8", + "id": "bd6a87fb.60cad", "type": "outcomeTrue", "name": "true", "xml": "\n", "comments": "", "outputs": 1, - "x": 993, - "y": 1125, - "z": "42ade40f.4fa29c", + "x": 879, + "y": 1123, + "z": "3cbec5d5.54ea02", "wires": [ [ - "e44bc7ce.ed35b8" + "7d536275.1f7f6c" ] ] }, { - "id": "f54e3efd.634a38", + "id": "3a021903.aa35de", "type": "outcomeFalse", "name": "false", "xml": "\n", "comments": "", "outputs": 1, - "x": 990, - "y": 1185, - "z": "42ade40f.4fa29c", + "x": 876, + "y": 1183, + "z": "3cbec5d5.54ea02", "wires": [ [ - "7c1006a1.c0bf28" + "6468635a.9e6d94" ] ] }, { - "id": "e44bc7ce.ed35b8", + "id": "7d536275.1f7f6c", "type": "save", "name": "save source only", "xml": "\n\n\n\n\n", "comments": "", "outputs": 1, - "x": 1173, - "y": 1124, - "z": "42ade40f.4fa29c", + "x": 1059, + "y": 1122, + "z": "3cbec5d5.54ea02", "wires": [ [] ] }, { - "id": "6e0155a0.4236dc", + "id": "c290c25a.9cb058", "type": "switchNode", "name": "switch relationship-list_length", "xml": "\n", "comments": "", "outputs": 1, - "x": 1502, - "y": 314, - "z": "42ade40f.4fa29c", + "x": 1388, + "y": 312, + "z": "3cbec5d5.54ea02", "wires": [ [ - "c6d7c8ac.8edfe", - "e1f14b0f.6d7378", - "863a7ad.fb20188" + "8171cd76.e9b4d", + "9c1be6a.eb1c998", + "be2751bf.fc2318" ] ] }, { - "id": "64886b03.3e43e4", + "id": "8ea0dfd0.e04d5", "type": "switchNode", "name": "switch relationship-list_length != $src-tpId", "xml": "\n", "comments": "", "outputs": 1, - "x": 1953, - "y": 328, - "z": "42ade40f.4fa29c", + "x": 1839, + "y": 326, + "z": "3cbec5d5.54ea02", "wires": [ [ - "b3998350.44919" + "f6fe2af1.32bcd" ] ] }, { - "id": "c6d7c8ac.8edfe", + "id": "8171cd76.e9b4d", "type": "outcome", "name": "0", "xml": "\n", "comments": "", "outputs": 1, - "x": 1720, - "y": 273, - "z": "42ade40f.4fa29c", + "x": 1606, + "y": 271, + "z": "3cbec5d5.54ea02", "wires": [ [ - "ae0ebd2c.ab0408" + "6d799180.26117" ] ] }, { - "id": "e1f14b0f.6d7378", + "id": "9c1be6a.eb1c998", "type": "outcome", "name": "1", "xml": "\n", "comments": "", "outputs": 1, - "x": 1717, - "y": 310, - "z": "42ade40f.4fa29c", + "x": 1603, + "y": 308, + "z": "3cbec5d5.54ea02", "wires": [ [ - "64886b03.3e43e4" + "8ea0dfd0.e04d5" ] ] }, { - "id": "863a7ad.fb20188", + "id": "be2751bf.fc2318", "type": "other", "name": "other", "xml": "\n", "comments": "", "outputs": 1, - "x": 1727, - "y": 384, - "z": "42ade40f.4fa29c", + "x": 1613, + "y": 382, + "z": "3cbec5d5.54ea02", "wires": [ [ - "8fdcd683.3660b" + "a1d91cb.fcaede" ] ] }, { - "id": "8fdcd683.3660b", + "id": "a1d91cb.fcaede", "type": "block", "name": "block", "xml": "\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1864, - "y": 385, - "z": "42ade40f.4fa29c", + "x": 1750, + "y": 383, + "z": "3cbec5d5.54ea02", "wires": [ [ - "ec1a3a53.fa7ff8" + "9a538487.c08aa" ] ] }, { - "id": "ae0ebd2c.ab0408", + "id": "6d799180.26117", "type": "block", "name": "block", "xml": "\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1862, - "y": 281, - "z": "42ade40f.4fa29c", + "x": 1748, + "y": 279, + "z": "3cbec5d5.54ea02", "wires": [ [ - "c29cb556.f4deb8" + "92abbd48.ac3ab" ] ] }, { - "id": "5d91edd1.3c2f24", + "id": "4c4fa03a.a50f2", "type": "switchNode", "name": "switch is-invalid-open-ended-link", "xml": "\n", "comments": "", "outputs": 1, - "x": 563, - "y": 538, - "z": "42ade40f.4fa29c", + "x": 449, + "y": 536, + "z": "3cbec5d5.54ea02", "wires": [ [ - "62e07412.96bbe4", - "db9d2b02.3f6e5" + "7a803037.7fbd88", + "a043c19c.e11a18" ] ] }, { - "id": "db9d2b02.3f6e5", + "id": "a043c19c.e11a18", "type": "outcomeTrue", "name": "true", "xml": "\n", "comments": "", "outputs": 1, - "x": 770, - "y": 506, - "z": "42ade40f.4fa29c", + "x": 656, + "y": 504, + "z": "3cbec5d5.54ea02", "wires": [ [ - "7150962.0cacbe8" + "2aea0930.46cd5e" ] ] }, { - "id": "62e07412.96bbe4", + "id": "7a803037.7fbd88", "type": "outcomeFalse", "name": "false", "xml": "\n", "comments": "", "outputs": 1, - "x": 767, - "y": 566, - "z": "42ade40f.4fa29c", + "x": 653, + "y": 564, + "z": "3cbec5d5.54ea02", "wires": [ [ - "339fe7b3.ae4e" + "98f67a1e.d79eb" ] ] }, { - "id": "7150962.0cacbe8", + "id": "2aea0930.46cd5e", "type": "block", "name": "block", "xml": "\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 921, - "y": 506, - "z": "42ade40f.4fa29c", + "x": 807, + "y": 504, + "z": "3cbec5d5.54ea02", "wires": [ [] ] }, { - "id": "8c3bc53e.020c3", + "id": "a6b6ae44.7eb2a8", "type": "save", "name": "save source and dest TP", "xml": "\n\n\n\n\n\n\n\n\n", "comments": "", "outputs": 1, - "x": 1188, - "y": 828, - "z": "42ade40f.4fa29c", + "x": 1074, + "y": 826, + "z": "3cbec5d5.54ea02", "wires": [ [] ] }, { - "id": "b3998350.44919", + "id": "f6fe2af1.32bcd", "type": "outcomeTrue", "name": "true", "xml": "\n", "comments": "", "outputs": 1, - "x": 2200, - "y": 319, - "z": "42ade40f.4fa29c", + "x": 2086, + "y": 317, + "z": "3cbec5d5.54ea02", "wires": [ [] ] }, { - "id": "3b98d33.38a2bac", + "id": "370b414a.4eba76", "type": "record", "name": "log file", "xml": " \n \n \n \n \n \n \n \n \n ", "comments": "", "outputs": 1, - "x": 1133, - "y": 773, - "z": "42ade40f.4fa29c", + "x": 1019, + "y": 771, + "z": "3cbec5d5.54ea02", "wires": [ [] ] }, { - "id": "78b9c95f.ae17e8", + "id": "b85c23da.8517d", "type": "set", "name": "unset tmp.aai.p-interface", "xml": "\n\n\n\n", "comments": "", - "x": 1276, - "y": 103, - "z": "42ade40f.4fa29c", + "x": 1162, + "y": 101, + "z": "3cbec5d5.54ea02", "wires": [] }, { - "id": "c7f9432f.fc4c28", + "id": "e0d728fb.03e448", "type": "record", "name": "log file", "xml": " \n \n \n \n \n \n \n \n \n ", "comments": "", "outputs": 1, - "x": 2516, - "y": 291, - "z": "42ade40f.4fa29c", + "x": 2402, + "y": 289, + "z": "3cbec5d5.54ea02", "wires": [ [] ] }, { - "id": "d26336.070c9cc8", + "id": "7e014e1e.a8dd8", "type": "block", "name": "block", "xml": "\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 2192, - "y": 536, - "z": "42ade40f.4fa29c", + "x": 2078, + "y": 534, + "z": "3cbec5d5.54ea02", "wires": [ [ - "c7f9432f.fc4c28", - "882e1409.701ce8", - "6e4bc51.b0c9dbc", - "7a9fabbe.629c44" + "e0d728fb.03e448", + "521f891d.91cfc8", + "cedaeaf5.78fef8", + "740002f8.4aedac" ] ] }, { - "id": "a1bfa8c8.032428", + "id": "27e614a8.33d2f4", "type": "success", "name": "success", "xml": "\n", "comments": "", "outputs": 1, - "x": 2930, - "y": 357, - "z": "42ade40f.4fa29c", + "x": 2816, + "y": 355, + "z": "3cbec5d5.54ea02", "wires": [ [ - "c9e17582.5ea8" + "c5f6a36b.0845d8" ] ] }, { - "id": "4552885e.7227f8", + "id": "5b692078.dcecc", "type": "failure", "name": "failure", "xml": "\n", "comments": "", "outputs": 1, - "x": 2937.6785888671875, - "y": 416.2143249511719, - "z": "42ade40f.4fa29c", + "x": 2823.6785888671875, + "y": 414.2143249511719, + "z": "3cbec5d5.54ea02", "wires": [ [ - "de1c7c10.d4de68" + "b2044c9b.8096a" ] ] }, { - "id": "c9e17582.5ea8", + "id": "c5f6a36b.0845d8", "type": "block", "name": "block", "xml": "\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 3078, - "y": 352, - "z": "42ade40f.4fa29c", + "x": 2964, + "y": 350, + "z": "3cbec5d5.54ea02", "wires": [ [ - "747beccb.60a274" + "ad2b40a6.ff37f8" ] ] }, { - "id": "747beccb.60a274", + "id": "ad2b40a6.ff37f8", "type": "record", "name": "log file", "xml": " \n \n \n \n \n \n \n \n \n ", "comments": "", "outputs": 1, - "x": 3223, - "y": 352, - "z": "42ade40f.4fa29c", + "x": 3109, + "y": 350, + "z": "3cbec5d5.54ea02", "wires": [ [] ] }, { - "id": "de1c7c10.d4de68", + "id": "b2044c9b.8096a", "type": "block", "name": "block", "xml": "\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 3085, - "y": 414, - "z": "42ade40f.4fa29c", + "x": 2971, + "y": 412, + "z": "3cbec5d5.54ea02", "wires": [ [ - "81d2a002.7c0388" + "a8dbf2db.72f548" ] ] }, { - "id": "c29cb556.f4deb8", + "id": "92abbd48.ac3ab", "type": "record", "name": "log file", "xml": " \n \n \n \n ", "comments": "", "outputs": 1, - "x": 1998, - "y": 279, - "z": "42ade40f.4fa29c", + "x": 1884, + "y": 277, + "z": "3cbec5d5.54ea02", "wires": [ [] ] }, { - "id": "ec1a3a53.fa7ff8", + "id": "9a538487.c08aa", "type": "record", "name": "log file", "xml": " \n \n \n \n \n \n ", "comments": "", "outputs": 1, - "x": 2009, - "y": 394, - "z": "42ade40f.4fa29c", + "x": 1895, + "y": 392, + "z": "3cbec5d5.54ea02", "wires": [ [] ] }, { - "id": "81d2a002.7c0388", + "id": "a8dbf2db.72f548", "type": "record", "name": "log file", "xml": " \n \n \n \n \n \n \n \n \n ", "comments": "", "outputs": 1, - "x": 3230, - "y": 414, - "z": "42ade40f.4fa29c", + "x": 3116, + "y": 412, + "z": "3cbec5d5.54ea02", "wires": [ [] ] }, { - "id": "6ededdc5.cf6c8c", + "id": "d0a27e5d.161cf", "type": "other", "name": "Null", "xml": "\n", "comments": "", "outputs": 1, - "x": 1544, - "y": 843, - "z": "42ade40f.4fa29c", + "x": 1430, + "y": 841, + "z": "3cbec5d5.54ea02", "wires": [ [ - "13eb321c.419dee" + "53c3433b.ea3fa4" ] ] }, { - "id": "ecaf5041.3bee8", + "id": "c301ff98.2e6928", "type": "outcome", "name": "length 0", "xml": "\n", "comments": "", "outputs": 1, - "x": 1546, - "y": 891, - "z": "42ade40f.4fa29c", + "x": 1432, + "y": 889, + "z": "3cbec5d5.54ea02", "wires": [ [ - "13eb321c.419dee" + "53c3433b.ea3fa4" ] ] }, { - "id": "5dbfa8d0.65ebe", + "id": "4d75dbb8.4d6b04", "type": "other", "name": "other", "xml": "\n", "comments": "", "outputs": 1, - "x": 1543, - "y": 945, - "z": "42ade40f.4fa29c", + "x": 1429, + "y": 943, + "z": "3cbec5d5.54ea02", "wires": [ [ - "3a0f4814.b217" + "9f28786b.9755c" ] ] }, { - "id": "13eb321c.419dee", + "id": "53c3433b.ea3fa4", "type": "block", "name": "block", "xml": "\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1699, - "y": 843, - "z": "42ade40f.4fa29c", + "x": 1585, + "y": 841, + "z": "3cbec5d5.54ea02", "wires": [ [] ] }, { - "id": "1e861048.9f807", + "id": "d3a8ab71.fccb7", "type": "switchNode", "name": "switch te-link-attributes label-restriction_length", "xml": "\n", "comments": "", "outputs": 1, - "x": 1725, - "y": 736, - "z": "42ade40f.4fa29c", + "x": 1611, + "y": 734, + "z": "3cbec5d5.54ea02", "wires": [ [ - "f4fbab89.9ba908", - "7dc7ac6a.dc9714", - "4d8c04cc.f4e3d4" + "d2a47af.0c53388", + "6ac8d49a.12d694", + "7da4e2ad.ccfb34" ] ] }, { - "id": "f4fbab89.9ba908", + "id": "d2a47af.0c53388", "type": "other", "name": "Null", "xml": "\n", "comments": "", "outputs": 1, - "x": 1997, - "y": 646, - "z": "42ade40f.4fa29c", + "x": 1883, + "y": 644, + "z": "3cbec5d5.54ea02", "wires": [ [ - "bc7188dd.cc9d18" + "70211305.a9bd74" ] ] }, { - "id": "bc7188dd.cc9d18", + "id": "70211305.a9bd74", "type": "block", "name": "block", "xml": "\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 2152, - "y": 646, - "z": "42ade40f.4fa29c", + "x": 2038, + "y": 644, + "z": "3cbec5d5.54ea02", "wires": [ [] ] }, { - "id": "7dc7ac6a.dc9714", + "id": "6ac8d49a.12d694", "type": "outcome", "name": "length 0", "xml": "\n", "comments": "", "outputs": 1, - "x": 1999, - "y": 694, - "z": "42ade40f.4fa29c", + "x": 1885, + "y": 692, + "z": "3cbec5d5.54ea02", "wires": [ [ - "bc7188dd.cc9d18" + "70211305.a9bd74" ] ] }, { - "id": "4d8c04cc.f4e3d4", + "id": "7da4e2ad.ccfb34", "type": "other", "name": "other", "xml": "\n", "comments": "", "outputs": 1, - "x": 1998, - "y": 745, - "z": "42ade40f.4fa29c", + "x": 1884, + "y": 743, + "z": "3cbec5d5.54ea02", "wires": [ [ - "ed1851cd.c2d2d" + "51ef22a.000c3dc" ] ] }, { - "id": "13838be4.d07ac4", + "id": "c4dd69cd.d872b", "type": "set", "name": "unset label-restriction's local variables", "xml": "\n\n\n", "comments": "", - "x": 2479, - "y": 572, - "z": "42ade40f.4fa29c", + "x": 2365, + "y": 570, + "z": "3cbec5d5.54ea02", "wires": [] }, { - "id": "2f963aac.304aa6", + "id": "7166bef0.82e4a", "type": "set", "name": "unset label-restriction's local variables", "xml": "\n\n\n", "comments": "", - "x": 2033, - "y": 799, - "z": "42ade40f.4fa29c", + "x": 1919, + "y": 797, + "z": "3cbec5d5.54ea02", "wires": [] }, { - "id": "6e4bc51.b0c9dbc", + "id": "cedaeaf5.78fef8", "type": "switchNode", "name": "switch te-link-attributes label-restriction_length", "xml": "\n", "comments": "", "outputs": 1, - "x": 2817, - "y": 523, - "z": "42ade40f.4fa29c", + "x": 2703, + "y": 521, + "z": "3cbec5d5.54ea02", "wires": [ [ - "30a1d0ca.e887a", - "92fd4ff1.3a409", - "389e55ce.061fe2" + "e2267c99.350348", + "3e0a9900.cec47e", + "ab55b067.791f5" ] ] }, { - "id": "30a1d0ca.e887a", + "id": "e2267c99.350348", "type": "other", "name": "Null", "xml": "\n", "comments": "", "outputs": 1, - "x": 3087, - "y": 485, - "z": "42ade40f.4fa29c", + "x": 2973, + "y": 483, + "z": "3cbec5d5.54ea02", "wires": [ [ - "5dda79fd.751e4" + "8e66b008.2f7c48" ] ] }, { - "id": "5dda79fd.751e4", + "id": "8e66b008.2f7c48", "type": "block", "name": "block", "xml": "\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 3242, - "y": 485, - "z": "42ade40f.4fa29c", + "x": 3128, + "y": 483, + "z": "3cbec5d5.54ea02", "wires": [ [] ] }, { - "id": "92fd4ff1.3a409", + "id": "3e0a9900.cec47e", "type": "outcome", "name": "length 0", "xml": "\n", "comments": "", "outputs": 1, - "x": 3089, - "y": 533, - "z": "42ade40f.4fa29c", + "x": 2975, + "y": 531, + "z": "3cbec5d5.54ea02", "wires": [ [ - "5dda79fd.751e4" + "8e66b008.2f7c48" ] ] }, { - "id": "389e55ce.061fe2", + "id": "ab55b067.791f5", "type": "other", "name": "other", "xml": "\n", "comments": "", "outputs": 1, - "x": 3088, - "y": 584, - "z": "42ade40f.4fa29c", + "x": 2974, + "y": 582, + "z": "3cbec5d5.54ea02", "wires": [ [ - "bc1a2664.a26998" + "ef26b767.51cb" ] ] }, { - "id": "bc1a2664.a26998", + "id": "ef26b767.51cb", "type": "for", "name": "for each label-restriction", "xml": "\n", "comments": "", "outputs": 1, - "x": 3273, - "y": 584, - "z": "42ade40f.4fa29c", + "x": 3159, + "y": 582, + "z": "3cbec5d5.54ea02", "wires": [ [ - "bc3590a8.aace38", - "c370620b.230e48", - "a5a0665d.651de8", - "1ab3f9a3.2d2bce", - "fed3d208.8682f8", - "864febfd.65faf" + "1e98f683.1aa1c9", + "fb05e52d.520ed8", + "d6c4c7a0.0d9e8", + "c76088aa.f470c8", + "4bfdac8d.42ab7c", + "fab9bbde.d7c01" ] ] }, { - "id": "a5a0665d.651de8", + "id": "d6c4c7a0.0d9e8", "type": "set", "name": "unset label-restriction's local variables", "xml": "\n\n\n", "comments": "", - "x": 3571, - "y": 399, - "z": "42ade40f.4fa29c", + "x": 3457, + "y": 397, + "z": "3cbec5d5.54ea02", "wires": [] }, { - "id": "bc3590a8.aace38", + "id": "1e98f683.1aa1c9", "type": "set", "name": "set label-restriction's local variables", "xml": "\n\n", "comments": "", - "x": 3560.6669921875, - "y": 445.88897705078125, - "z": "42ade40f.4fa29c", + "x": 3446.6669921875, + "y": 443.88897705078125, + "z": "3cbec5d5.54ea02", "wires": [] }, { - "id": "c370620b.230e48", + "id": "fb05e52d.520ed8", "type": "update", "name": "save label-restriction", "xml": " \n\n\n\n\n\n\n", "comments": "", "outputs": 1, - "x": 3514.370849609375, - "y": 573.444580078125, - "z": "42ade40f.4fa29c", + "x": 3400.370849609375, + "y": 571.444580078125, + "z": "3cbec5d5.54ea02", "wires": [ [ - "fa7d62b3.003ef", - "8c2cda96.78942" + "d9005ccd.b320e8", + "c6b7c3e3.521e98" ] ] }, { - "id": "bad7ff54.e113a8", + "id": "9c6aaa8e.65077", "type": "save", "name": "save link relationship to label-restriction in AAI", "xml": "\n\n\n\n\n", "comments": "", "outputs": 1, - "x": 3588.5556640625, - "y": 757.888916015625, - "z": "42ade40f.4fa29c", + "x": 3474.5556640625, + "y": 755.888916015625, + "z": "3cbec5d5.54ea02", "wires": [ [] ] }, { - "id": "fa7d62b3.003ef", + "id": "d9005ccd.b320e8", "type": "success", "name": "success", "xml": "\n", "comments": "", "outputs": 1, - "x": 3705.0555419921875, - "y": 541.635009765625, - "z": "42ade40f.4fa29c", + "x": 3591.0555419921875, + "y": 539.635009765625, + "z": "3cbec5d5.54ea02", "wires": [ [ - "ee15e7b0.52d0f8" + "85dd0f0d.ac434" ] ] }, { - "id": "8c2cda96.78942", + "id": "c6b7c3e3.521e98", "type": "failure", "name": "failure", "xml": "\n", "comments": "", "outputs": 1, - "x": 3712.734130859375, - "y": 600.8493347167969, - "z": "42ade40f.4fa29c", + "x": 3598.734130859375, + "y": 598.8493347167969, + "z": "3cbec5d5.54ea02", "wires": [ [ - "ed52377e.4eb4a" + "d138a600.db5b8" ] ] }, { - "id": "ee15e7b0.52d0f8", + "id": "85dd0f0d.ac434", "type": "block", "name": "block", "xml": "\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 3865.5556640625, - "y": 540.8889465332031, - "z": "42ade40f.4fa29c", + "x": 3751.5556640625, + "y": 538.8889465332031, + "z": "3cbec5d5.54ea02", "wires": [ [] ] }, { - "id": "ed52377e.4eb4a", + "id": "d138a600.db5b8", "type": "update", "name": "save label-restriction", "xml": " \n\n\n\n\n\n\n", "comments": "", "outputs": 1, - "x": 3896.5556640625, - "y": 600.8889465332031, - "z": "42ade40f.4fa29c", + "x": 3782.5556640625, + "y": 598.8889465332031, + "z": "3cbec5d5.54ea02", "wires": [ [] ] }, { - "id": "1ab3f9a3.2d2bce", + "id": "c76088aa.f470c8", "type": "set", "name": "set label-restriction's local variables", "xml": "\n\n", "comments": "", - "x": 3561, - "y": 495, - "z": "42ade40f.4fa29c", + "x": 3447, + "y": 493, + "z": "3cbec5d5.54ea02", "wires": [] }, { - "id": "ec158e78.eb2b58", + "id": "f581a4e4.841408", "type": "set", "name": "set label-restriction's local variables", "xml": "\n\n", "comments": "", - "x": 2475, - "y": 664, - "z": "42ade40f.4fa29c", + "x": 2361, + "y": 662, + "z": "3cbec5d5.54ea02", "wires": [] }, { - "id": "a173e4f5.f5a478", + "id": "c6ea0cbf.fb7cd", "type": "set", "name": "set label-restriction's local variables", "xml": "\n\n", "comments": "", - "x": 2030, - "y": 851, - "z": "42ade40f.4fa29c", + "x": 1916, + "y": 849, + "z": "3cbec5d5.54ea02", "wires": [] }, { - "id": "9f4e28fe.9e925", + "id": "4aadddbd.521a8c", "type": "update", "name": "save te-link-attribute", "xml": " \n\n\n\n", "comments": "", "outputs": 1, - "x": 1171, - "y": 873, - "z": "42ade40f.4fa29c", + "x": 1057, + "y": 871, + "z": "3cbec5d5.54ea02", "wires": [ [] ] }, { - "id": "15c10484.c4629b", + "id": "e1339bff.8f7f98", "type": "save", "name": "save te-link-attribute relationship to label-restriction", "xml": "\n\n\n\n\n", "comments": "", "outputs": 1, - "x": 2062, - "y": 1142, - "z": "42ade40f.4fa29c", + "x": 1948, + "y": 1140, + "z": "3cbec5d5.54ea02", "wires": [ [] ] }, { - "id": "c921d18d.970b48", + "id": "441a859d.1c08ec", "type": "save", "name": "save te-link-attribute relationship to logical-link in AAI", "xml": "\n\n\n\n\n", "comments": "", "outputs": 1, - "x": 2071, - "y": 1082, - "z": "42ade40f.4fa29c", + "x": 1957, + "y": 1080, + "z": "3cbec5d5.54ea02", "wires": [ [] ] }, { - "id": "fc9bbbc9.76dd6", + "id": "6c137df8.722b8c", "type": "update", "name": "save te-link-attribute", "xml": " \n\n\n\n", "comments": "", "outputs": 1, - "x": 1662, - "y": 671, - "z": "42ade40f.4fa29c", + "x": 1548, + "y": 669, + "z": "3cbec5d5.54ea02", "wires": [ [] ] }, { - "id": "7a9fabbe.629c44", + "id": "740002f8.4aedac", "type": "update", "name": "update te-link-attribute", "xml": " \n\n\n\n", "comments": "", "outputs": 1, - "x": 2542, - "y": 456, - "z": "42ade40f.4fa29c", + "x": 2428, + "y": 454, + "z": "3cbec5d5.54ea02", "wires": [ [] ] }, { - "id": "a3570d8f.6b641", + "id": "f2fac409.beeaf8", "type": "save", "name": "save te-link-attribute relationship to logical-link in AAI", "xml": "\n\n\n\n\n", "comments": "", "outputs": 1, - "x": 2507, - "y": 802, - "z": "42ade40f.4fa29c", + "x": 2393, + "y": 800, + "z": "3cbec5d5.54ea02", "wires": [ [] ] }, { - "id": "1375d0c1.e8bf07", + "id": "ea1f1d76.87207", "type": "save", "name": "save te-link-attribute relationship to label-restriction", "xml": "\n\n\n\n\n", "comments": "", "outputs": 1, - "x": 2500, - "y": 848, - "z": "42ade40f.4fa29c", + "x": 2386, + "y": 846, + "z": "3cbec5d5.54ea02", "wires": [ [] ] }, { - "id": "864febfd.65faf", + "id": "fab9bbde.d7c01", "type": "save", "name": "save te-link-attribute relationship to label-restriction", "xml": "\n\n\n\n\n", "comments": "", "outputs": 1, - "x": 3597, - "y": 700, - "z": "42ade40f.4fa29c", + "x": 3483, + "y": 698, + "z": "3cbec5d5.54ea02", "wires": [ [] ] }, { - "id": "fed3d208.8682f8", + "id": "4bfdac8d.42ab7c", "type": "save", "name": "save te-link-attribute relationship to logical-link in AAI", "xml": "\n\n\n\n\n", "comments": "", "outputs": 1, - "x": 3604, - "y": 654, - "z": "42ade40f.4fa29c", + "x": 3490, + "y": 652, + "z": "3cbec5d5.54ea02", "wires": [ [] ] diff --git a/platform-logic/datachange/src/main/json/DataChange_update-network-to-aai.json b/platform-logic/datachange/src/main/json/DataChange_update-network-to-aai.json index 7b6731cb..d87fd490 100644 --- a/platform-logic/datachange/src/main/json/DataChange_update-network-to-aai.json +++ b/platform-logic/datachange/src/main/json/DataChange_update-network-to-aai.json @@ -1,20 +1,20 @@ [ { - "id": "ef88be3f.517f78", + "id": "b9fcda31.4ec79", "type": "dgstart", "name": "DGSTART", "outputs": 1, - "x": 105, - "y": 67, + "x": 113, + "y": 65.00650024414062, "z": "6d6b8a1f.be1cb4", "wires": [ [ - "74a7a837.229be" + "3760ce9c.1bf2e2" ] ] }, { - "id": "74a7a837.229be", + "id": "3760ce9c.1bf2e2", "type": "service-logic", "name": "DataChange ${project.version}", "module": "DataChange", @@ -22,879 +22,879 @@ "comments": "", "xml": "", "outputs": 1, - "x": 194.00003051757812, - "y": 157.88891220092773, + "x": 202.00003051757812, + "y": 155.89541244506836, "z": "6d6b8a1f.be1cb4", "wires": [ [ - "284dae72.737532" + "de74005b.f44ce8" ] ] }, { - "id": "284dae72.737532", + "id": "de74005b.f44ce8", "type": "method", "name": "update-network-to-aai", "xml": "\n", "comments": "", "outputs": 1, - "x": 230.1112518310547, - "y": 228.22223663330078, + "x": 238.1112518310547, + "y": 226.2287368774414, "z": "6d6b8a1f.be1cb4", "wires": [ [ - "da05320e.186d48" + "1541ad9c.69aa8a" ] ] }, { - "id": "da05320e.186d48", + "id": "1541ad9c.69aa8a", "type": "block", "name": "block : atomic", "xml": "\n", "atomic": "true", "comments": "", "outputs": 1, - "x": 455.33343505859375, - "y": 227.77792358398438, + "x": 463.33343505859375, + "y": 225.784423828125, "z": "6d6b8a1f.be1cb4", "wires": [ [ - "8c187a81.9e4d28", - "75113293.98ea0c", - "9937b93d.ff5938", - "55dde830.cc61b8", - "f7667eb6.ec8938" + "dbbcebe5.6f422", + "e66d9ed0.3d3d8", + "f1256a59.e632c", + "1dca15d7.0a7a3a", + "1c1d34a0.adaa8b" ] ] }, { - "id": "75113293.98ea0c", + "id": "e66d9ed0.3d3d8", "type": "save", "name": "save network-resource", "xml": "\n\n\n\n\n\n\n\n\n", "comments": "", "outputs": 1, - "x": 685.333251953125, - "y": 133.00001525878906, + "x": 693.333251953125, + "y": 131.0065155029297, "z": "6d6b8a1f.be1cb4", "wires": [ [] ] }, { - "id": "74f65e67.75c658", + "id": "40545c4b.9221f4", "type": "save", "name": "save pnf", "xml": "\n\n\n\n\n\n\n\n\n\n\n", "comments": "", "outputs": 1, - "x": 897.1111450195312, - "y": 223.111083984375, + "x": 905.1111450195312, + "y": 221.11758422851562, "z": "6d6b8a1f.be1cb4", "wires": [ [] ] }, { - "id": "9937b93d.ff5938", + "id": "f1256a59.e632c", "type": "for", "name": "for each node", "xml": "\n", "comments": "", "outputs": 1, - "x": 668.8888549804688, - "y": 203.33331298828125, + "x": 676.8888549804688, + "y": 201.33981323242188, "z": "6d6b8a1f.be1cb4", "wires": [ [ - "74f65e67.75c658", - "60e29b35.16fbd4", - "b27f201.393186", - "e83884ed.3fb2d8", - "7257c53.4f087bc", - "395bef40.08498", - "1392eb55.76adbd", - "e55192de.2cc998", - "a1ffb2f2.4b50b8" + "40545c4b.9221f4", + "eba2ef35.33c428", + "4817116d.5f593", + "466a40bd.9d277", + "1acdca56.b6e67e", + "3e1f14bc.ee90c4", + "6de7541f.0e2a24", + "8794be9f.289a08", + "1b6896a8.e62c19" ] ] }, { - "id": "60e29b35.16fbd4", + "id": "eba2ef35.33c428", "type": "set", "name": "set node", "xml": "\n\n\n\n", "comments": "", - "x": 902.111083984375, - "y": 119.22221374511719, + "x": 910.111083984375, + "y": 117.22871398925781, "z": "6d6b8a1f.be1cb4", "wires": [] }, { - "id": "e83884ed.3fb2d8", + "id": "466a40bd.9d277", "type": "save", "name": "save pnf relationship to network-resource in AAI", "xml": "\n\n\n\n", "comments": "", "outputs": 1, - "x": 993.7779541015625, - "y": 398.44447803497314, + "x": 1001.7779541015625, + "y": 396.45097827911377, "z": "6d6b8a1f.be1cb4", "wires": [ [] ] }, { - "id": "9c15e41a.6cfbc8", + "id": "3d4b777c.0e42f", "type": "for", "name": "for each termination point", "xml": "\n", "comments": "", "outputs": 1, - "x": 1279.4444580078125, - "y": 574.111083984375, + "x": 1287.4444580078125, + "y": 572.1175842285156, "z": "6d6b8a1f.be1cb4", "wires": [ [ - "3c657cae.66477c", - "2e1dc2b9.f23686", - "8c144095.b1eaf8", - "9abbad80.6c0f7", - "ef702ba5.ac71e" + "95dfcdd1.046e6", + "1ac320c7.c54f67", + "aa2f70cf.6e112", + "64896027.57fb78", + "fe275075.949f1" ] ] }, { - "id": "3c657cae.66477c", + "id": "95dfcdd1.046e6", "type": "set", "name": "set termination point", "xml": "\n\n", "comments": "", - "x": 1549.111328125, - "y": 557.0000610351562, + "x": 1557.111328125, + "y": 555.0065612792969, "z": "6d6b8a1f.be1cb4", "wires": [] }, { - "id": "8c144095.b1eaf8", + "id": "aa2f70cf.6e112", "type": "save", "name": "save p-interface", "xml": " \n\n\n\n\n\n\n\n\n\n\n\n", "comments": "", "outputs": 1, - "x": 1543.815185546875, - "y": 744.5556030273438, + "x": 1551.815185546875, + "y": 742.5621032714844, "z": "6d6b8a1f.be1cb4", "wires": [ [ - "3fc33363.5b82ec", - "34c813e4.f5477c" + "673078d4.a5cb68", + "5651def0.2c85b8" ] ] }, { - "id": "f6e5129a.8bd048", + "id": "6cce4024.476ad", "type": "save", "name": "save pnf relationship to p-interface in AAI", "xml": "\n\n\n\n", "comments": "", "outputs": 1, - "x": 1626.703857421875, - "y": 901.3333740234375, + "x": 1634.703857421875, + "y": 899.3398742675781, "z": "6d6b8a1f.be1cb4", "wires": [ [] ] }, { - "id": "2e1dc2b9.f23686", + "id": "1ac320c7.c54f67", "type": "set", "name": "set unique-ltpId", "xml": "\n\n", "comments": "", - "x": 1533.000244140625, - "y": 614.111083984375, + "x": 1541.000244140625, + "y": 612.1175842285156, "z": "6d6b8a1f.be1cb4", "wires": [] }, { - "id": "8c187a81.9e4d28", + "id": "dbbcebe5.6f422", "type": "execute", "name": "execute", "xml": "\n \n \n \n \n ", "comments": "", "outputs": 1, - "x": 641.9935302734375, - "y": 41.993499755859375, + "x": 649.9935302734375, + "y": 40, "z": "6d6b8a1f.be1cb4", "wires": [ [] ] }, { - "id": "b27f201.393186", + "id": "4817116d.5f593", "type": "save", "name": "save pnf relation with esr-thirdparty-sdnc", "xml": "\n\n\n\n\n", "comments": "", "outputs": 1, - "x": 975, - "y": 434.9934997558594, + "x": 983, + "y": 433, "z": "6d6b8a1f.be1cb4", "wires": [ [] ] }, { - "id": "3fc33363.5b82ec", + "id": "673078d4.a5cb68", "type": "success", "name": "success", "xml": "\n", "comments": "", "outputs": 1, - "x": 1715.499885559082, - "y": 731.7460784912109, + "x": 1723.499885559082, + "y": 729.7525787353516, "z": "6d6b8a1f.be1cb4", "wires": [ [ - "a873419b.bc81c" + "72e23ce3.0ceb8c" ] ] }, { - "id": "34c813e4.f5477c", + "id": "5651def0.2c85b8", "type": "failure", "name": "failure", "xml": "\n", "comments": "", "outputs": 1, - "x": 1709.1784744262695, - "y": 783.9603900909424, + "x": 1717.1784744262695, + "y": 781.966890335083, "z": "6d6b8a1f.be1cb4", "wires": [ [ - "66113f50.7819f8" + "936d0942.79b6" ] ] }, { - "id": "a873419b.bc81c", + "id": "72e23ce3.0ceb8c", "type": "block", "name": "block", "xml": "\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1866.0000457763672, - "y": 731.0000095367432, + "x": 1874.0000457763672, + "y": 729.0065097808838, "z": "6d6b8a1f.be1cb4", "wires": [ [] ] }, { - "id": "66113f50.7819f8", + "id": "936d0942.79b6", "type": "update", "name": "update p-interface", "xml": " \n\n\n\n\n\n\n\n\n\n", "comments": "", "outputs": 1, - "x": 1895, - "y": 785, + "x": 1903, + "y": 783.0065002441406, "z": "6d6b8a1f.be1cb4", "wires": [ [] ] }, { - "id": "c8e5472a.d10408", + "id": "7077dcc4.1aa314", "type": "save", "name": "save tunnel-termination-point", "xml": "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n", "comments": "", "outputs": 1, - "x": 1678, - "y": 331, + "x": 1686, + "y": 329.0065002441406, "z": "6d6b8a1f.be1cb4", "wires": [ [ - "11cb3cf8.02c3eb", - "1a336806.ba4bc8" + "ee093e46.66c7d8", + "e9c7ad6a.1577f" ] ] }, { - "id": "8b0a557c.b35cd", + "id": "3a45511d.adcf26", "type": "for", "name": "for each tunnel termination point", "xml": "\n", "comments": "", "outputs": 1, - "x": 1341, - "y": 319, + "x": 1349, + "y": 317.0065002441406, "z": "6d6b8a1f.be1cb4", "wires": [ [ - "58c4d943.63d2f", - "e7e93cd.8f563c", - "c8e5472a.d10408", - "7c00c858.c87ab8", - "1bd07bf.99e9784" + "2ea4deaf.40bdfa", + "458ce581.77bfe4", + "7077dcc4.1aa314", + "dad1a90d.61b018", + "7da29c03.1dbdf4" ] ] }, { - "id": "58c4d943.63d2f", + "id": "2ea4deaf.40bdfa", "type": "set", "name": "set tunnel termination point", "xml": "\n\n", "comments": "", - "x": 1676, - "y": 239, + "x": 1684, + "y": 237.00650024414062, "z": "6d6b8a1f.be1cb4", "wires": [] }, { - "id": "e7e93cd.8f563c", + "id": "458ce581.77bfe4", "type": "set", "name": "set unique-ttpId", "xml": "\n\n", "comments": "", - "x": 1634.888916015625, - "y": 277.111083984375, + "x": 1642.888916015625, + "y": 275.1175842285156, "z": "6d6b8a1f.be1cb4", "wires": [] }, { - "id": "11cb3cf8.02c3eb", + "id": "ee093e46.66c7d8", "type": "success", "name": "success", "xml": "\n", "comments": "", "outputs": 1, - "x": 1944, - "y": 317, + "x": 1952, + "y": 315.0065002441406, "z": "6d6b8a1f.be1cb4", "wires": [ [ - "9ad375c8.fab3e8" + "1b7d5a60.835d5e" ] ] }, { - "id": "1a336806.ba4bc8", + "id": "e9c7ad6a.1577f", "type": "failure", "name": "failure", "xml": "\n", "comments": "", "outputs": 1, - "x": 1937.6785888671875, - "y": 369.21431159973145, + "x": 1945.6785888671875, + "y": 367.22081184387207, "z": "6d6b8a1f.be1cb4", "wires": [ [ - "842e7e75.fc0558" + "652a4eb1.3c9f7" ] ] }, { - "id": "9ad375c8.fab3e8", + "id": "1b7d5a60.835d5e", "type": "block", "name": "block", "xml": "\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 2094.500160217285, - "y": 316.2539310455322, + "x": 2102.500160217285, + "y": 314.26043128967285, "z": "6d6b8a1f.be1cb4", "wires": [ [] ] }, { - "id": "842e7e75.fc0558", + "id": "652a4eb1.3c9f7", "type": "update", "name": "update tunnel-termination-point", "xml": "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n", "comments": "", "outputs": 1, - "x": 2175, - "y": 371, + "x": 2183, + "y": 369.0065002441406, "z": "6d6b8a1f.be1cb4", "wires": [ [] ] }, { - "id": "7257c53.4f087bc", + "id": "1acdca56.b6e67e", "type": "set", "name": "set local variables", "xml": "\n\n", "comments": "", - "x": 927, - "y": 166, + "x": 935, + "y": 164.00650024414062, "z": "6d6b8a1f.be1cb4", "wires": [] }, { - "id": "55dde830.cc61b8", + "id": "1dca15d7.0a7a3a", "type": "call", "name": "call update-network-links-to-aai", "xml": "\n", "comments": "", "outputs": 1, - "x": 611, - "y": 329, + "x": 619, + "y": 327.0065002441406, "z": "6d6b8a1f.be1cb4", "wires": [ [] ] }, { - "id": "b86a9ee9.558c2", + "id": "c87f71c.204801", "type": "save", "name": "save pnf-interface relationship to pnf in AAI", "xml": "\n\n\n\n\n", "comments": "", "outputs": 1, - "x": 1627, - "y": 844, + "x": 1635, + "y": 842.0065002441406, "z": "6d6b8a1f.be1cb4", "wires": [ [] ] }, { - "id": "7c00c858.c87ab8", + "id": "dad1a90d.61b018", "type": "save", "name": "save pnf relationship to tunnel termination point in AAI", - "xml": "\n\n\n\n\n", + "xml": "\n\n\n\n\n", "comments": "", "outputs": 1, - "x": 1749, - "y": 423, + "x": 1757, + "y": 421.0065002441406, "z": "6d6b8a1f.be1cb4", "wires": [ [ - "5d32d079.32cfb8", - "5c2d8774.9a9178" + "486bef2.804149", + "8297f8e3.32f2f" ] ] }, { - "id": "395bef40.08498", + "id": "3e1f14bc.ee90c4", "type": "switchNode", "name": "switch node ttp", "xml": "\n", "comments": "", "outputs": 1, - "x": 913, - "y": 295, + "x": 921, + "y": 293.0065002441406, "z": "6d6b8a1f.be1cb4", "wires": [ [ - "84bf875e.b8d51", - "cc6df2e.2398e9", - "f2d2c388.1aa578" + "3564e5a8.68c49a", + "fd68b5a4.a3a878", + "f36d0950.312798" ] ] }, { - "id": "5889c4ed.3fc544", + "id": "d6240165.9d9a1", "type": "block", "name": "block", "xml": "\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1261, - "y": 247, + "x": 1269, + "y": 245.00650024414062, "z": "6d6b8a1f.be1cb4", "wires": [ [] ] }, { - "id": "f2d2c388.1aa578", + "id": "f36d0950.312798", "type": "other", "name": "other", "xml": "\n", "comments": "", "outputs": 1, - "x": 1103, - "y": 318, + "x": 1111, + "y": 316.0065002441406, "z": "6d6b8a1f.be1cb4", "wires": [ [ - "8b0a557c.b35cd" + "3a45511d.adcf26" ] ] }, { - "id": "1392eb55.76adbd", + "id": "6de7541f.0e2a24", "type": "switchNode", "name": "switch node tp", "xml": "\n", "comments": "", "outputs": 1, - "x": 893, - "y": 550, + "x": 901, + "y": 548.0065002441406, "z": "6d6b8a1f.be1cb4", "wires": [ [ - "c5e649ab.cfe2e8", - "d7a3de29.b44a1", - "a21fbfb7.b6608" + "d28496d2.5ae628", + "74698dba.4a5d9c", + "f51e137e.4b4cd" ] ] }, { - "id": "c5e649ab.cfe2e8", + "id": "d28496d2.5ae628", "type": "other", "name": "Null", "xml": "\n", "comments": "", "outputs": 1, - "x": 1072, - "y": 502, + "x": 1080, + "y": 500.0065002441406, "z": "6d6b8a1f.be1cb4", "wires": [ [ - "3d51c59d.7acffa" + "1912a08f.2e751f" ] ] }, { - "id": "d7a3de29.b44a1", + "id": "74698dba.4a5d9c", "type": "other", "name": "other", "xml": "\n", "comments": "", "outputs": 1, - "x": 1071, - "y": 604, + "x": 1079, + "y": 602.0065002441406, "z": "6d6b8a1f.be1cb4", "wires": [ [ - "9c15e41a.6cfbc8" + "3d4b777c.0e42f" ] ] }, { - "id": "3d51c59d.7acffa", + "id": "1912a08f.2e751f", "type": "block", "name": "block", "xml": "\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1227, - "y": 502, + "x": 1235, + "y": 500.0065002441406, "z": "6d6b8a1f.be1cb4", "wires": [ [] ] }, { - "id": "e55192de.2cc998", + "id": "8794be9f.289a08", "type": "record", "name": "log file", "xml": " \n \n \n \n \n \n ", "comments": "", "outputs": 1, - "x": 891, - "y": 339, + "x": 899, + "y": 337.0065002441406, "z": "6d6b8a1f.be1cb4", "wires": [ [] ] }, { - "id": "84bf875e.b8d51", + "id": "3564e5a8.68c49a", "type": "other", "name": "Null", "xml": "\n", "comments": "", "outputs": 1, - "x": 1101, - "y": 181, + "x": 1109, + "y": 179.00650024414062, "z": "6d6b8a1f.be1cb4", "wires": [ [ - "5889c4ed.3fc544" + "d6240165.9d9a1" ] ] }, { - "id": "cc6df2e.2398e9", + "id": "fd68b5a4.a3a878", "type": "outcome", "name": "length 0", "xml": "\n", "comments": "", "outputs": 1, - "x": 1106, - "y": 256, + "x": 1114, + "y": 254.00650024414062, "z": "6d6b8a1f.be1cb4", "wires": [ [ - "5889c4ed.3fc544" + "d6240165.9d9a1" ] ] }, { - "id": "a21fbfb7.b6608", + "id": "f51e137e.4b4cd", "type": "outcome", "name": "length 0", "xml": "\n", "comments": "", "outputs": 1, - "x": 1082, - "y": 550, + "x": 1090, + "y": 548.0065002441406, "z": "6d6b8a1f.be1cb4", "wires": [ [ - "3d51c59d.7acffa" + "1912a08f.2e751f" ] ] }, { - "id": "a1ffb2f2.4b50b8", + "id": "1b6896a8.e62c19", "type": "set", "name": "unset node", "xml": "\n\n\n", "comments": "", - "x": 899, - "y": 68, + "x": 907, + "y": 66.00650024414062, "z": "6d6b8a1f.be1cb4", "wires": [] }, { - "id": "9abbad80.6c0f7", + "id": "64896027.57fb78", "type": "set", "name": "unset termination point", "xml": "\n\n", "comments": "", - "x": 1561, - "y": 500, + "x": 1569, + "y": 498.0065002441406, "z": "6d6b8a1f.be1cb4", "wires": [] }, { - "id": "1bd07bf.99e9784", + "id": "7da29c03.1dbdf4", "type": "set", "name": "unset tunnel termination point", "xml": "\n\n", "comments": "", - "x": 1676, - "y": 191, + "x": 1684, + "y": 189.00650024414062, "z": "6d6b8a1f.be1cb4", "wires": [] }, { - "id": "5d32d079.32cfb8", + "id": "486bef2.804149", "type": "success", "name": "success", "xml": "\n", "comments": "", "outputs": 1, - "x": 2081, - "y": 426, + "x": 2089, + "y": 424.0065002441406, "z": "6d6b8a1f.be1cb4", "wires": [ [ - "42b15971.2191b8" + "f859267c.20dd3" ] ] }, { - "id": "5c2d8774.9a9178", + "id": "8297f8e3.32f2f", "type": "failure", "name": "failure", "xml": "\n", "comments": "", "outputs": 1, - "x": 2078, - "y": 474, + "x": 2086, + "y": 472.0065002441406, "z": "6d6b8a1f.be1cb4", "wires": [ [ - "ad595c83.2160d" + "19a686f.52c17f9" ] ] }, { - "id": "42b15971.2191b8", + "id": "f859267c.20dd3", "type": "record", "name": "log file", "xml": " \n \n \n \n \n \n \n \n ", "comments": "", "outputs": 1, - "x": 2236, - "y": 427, + "x": 2244, + "y": 425.0065002441406, "z": "6d6b8a1f.be1cb4", "wires": [ [] ] }, { - "id": "ad595c83.2160d", + "id": "19a686f.52c17f9", "type": "record", "name": "log file", "xml": " \n \n \n \n \n \n \n \n\n ", "comments": "", "outputs": 1, - "x": 2237, - "y": 475, + "x": 2245, + "y": 473.0065002441406, "z": "6d6b8a1f.be1cb4", "wires": [ [] ] }, { - "id": "b9a378e9.3ee13", + "id": "c991cb25.a4c41", "type": "execute", "name": "execute Base64 Converter", "xml": "\n \n \n ", "comments": "", "outputs": 1, - "x": 2027, - "y": 669, + "x": 2035, + "y": 667.0065002441406, "z": "6d6b8a1f.be1cb4", "wires": [ [ - "1cdf8713.954a51", - "3754d4b.0357eac" + "dcbfdbac.4106e8", + "25f66573.5f2caa" ] ] }, { - "id": "ef702ba5.ac71e", + "id": "fe275075.949f1", "type": "switchNode", "name": "switch inter-domain-plug-id empty?", "xml": "\n\n", "comments": "", "outputs": 1, - "x": 1597, - "y": 670, + "x": 1605, + "y": 668.0065002441406, "z": "6d6b8a1f.be1cb4", "wires": [ [ - "95523b36.e61fe", - "a2f27028.9e578" + "2202ef19.0cb66", + "a44d5e08.8645a8" ] ] }, { - "id": "a2f27028.9e578", + "id": "a44d5e08.8645a8", "type": "outcomeTrue", "name": "true", "xml": "\n", "comments": "", "outputs": 1, - "x": 1824, - "y": 623, + "x": 1832, + "y": 621.0065002441406, "z": "6d6b8a1f.be1cb4", "wires": [ [ - "ce508a28.fe217" + "77ac957f.8f7e64" ] ] }, { - "id": "95523b36.e61fe", + "id": "2202ef19.0cb66", "type": "outcomeFalse", "name": "false", "xml": "\n", "comments": "", "outputs": 1, - "x": 1825, - "y": 669, + "x": 1833, + "y": 667.0065002441406, "z": "6d6b8a1f.be1cb4", "wires": [ [ - "b9a378e9.3ee13" + "c991cb25.a4c41" ] ] }, { - "id": "ce508a28.fe217", + "id": "77ac957f.8f7e64", "type": "set", "name": "unset tmp.decoded-plug-id", "xml": "\n\n", "comments": "", - "x": 2028, - "y": 623, + "x": 2036, + "y": 621.0065002441406, "z": "6d6b8a1f.be1cb4", "wires": [] }, { - "id": "1cdf8713.954a51", + "id": "dcbfdbac.4106e8", "type": "success", "name": "success", "xml": "\n", "comments": "", "outputs": 1, - "x": 2232, - "y": 646, + "x": 2240, + "y": 644.0065002441406, "z": "6d6b8a1f.be1cb4", "wires": [ [ - "611d993d.82c5c" + "21836a86.63b72e" ] ] }, { - "id": "3754d4b.0357eac", + "id": "25f66573.5f2caa", "type": "failure", "name": "failure", "xml": "\n", "comments": "", "outputs": 1, - "x": 2225.6785888671875, - "y": 698.2143115997314, + "x": 2233.6785888671875, + "y": 696.2208118438721, "z": "6d6b8a1f.be1cb4", "wires": [ [ - "495bfe4.4b1a" + "8297f536.6bb4a" ] ] }, { - "id": "611d993d.82c5c", + "id": "21836a86.63b72e", "type": "block", "name": "block", "xml": "\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 2373, - "y": 646, + "x": 2381, + "y": 644.0065002441406, "z": "6d6b8a1f.be1cb4", "wires": [ [] ] }, { - "id": "495bfe4.4b1a", + "id": "8297f536.6bb4a", "type": "set", "name": "unset tmp.decoded-plug-id", "xml": "\n\n", "comments": "", - "x": 2432, - "y": 698, + "x": 2440, + "y": 696.0065002441406, "z": "6d6b8a1f.be1cb4", "wires": [] }, { - "id": "f7667eb6.ec8938", + "id": "1c1d34a0.adaa8b", "type": "set", "name": "set tmp.network-if", "xml": "\n\n\n", "comments": "", - "x": 667, - "y": 83, + "x": 675, + "y": 81.00650024414062, "z": "6d6b8a1f.be1cb4", "wires": [] } diff --git a/platform-logic/datachange/src/main/json/DataChange_update-tp-ttp-relationship.json b/platform-logic/datachange/src/main/json/DataChange_update-tp-ttp-relationship.json index 1ef85f5b..a47bab0b 100644 --- a/platform-logic/datachange/src/main/json/DataChange_update-tp-ttp-relationship.json +++ b/platform-logic/datachange/src/main/json/DataChange_update-tp-ttp-relationship.json @@ -1,20 +1,20 @@ [ { - "id": "db76d876.619d4", + "id": "f3e0b928.e8c7e", "type": "dgstart", "name": "DGSTART", "outputs": 1, - "x": 107, - "y": 76, - "z": "ffd702ea.3cd72", + "x": 128, + "y": 83, + "z": "8966128c.40fc9", "wires": [ [ - "ac7d0d8e.d68168" + "2b8024f5.a0b3e4" ] ] }, { - "id": "ac7d0d8e.d68168", + "id": "2b8024f5.a0b3e4", "type": "service-logic", "name": "DataChange ${project.version}", "module": "DataChange", @@ -22,504 +22,540 @@ "comments": "", "xml": "", "outputs": 1, - "x": 196.00003051757812, - "y": 166.88891220092773, - "z": "ffd702ea.3cd72", + "x": 217.00003051757812, + "y": 173.88891220092773, + "z": "8966128c.40fc9", "wires": [ [ - "15add1ed.67bb06" + "e0b4218d.2d604" ] ] }, { - "id": "15add1ed.67bb06", + "id": "e0b4218d.2d604", "type": "method", "name": "method update-tp-ttp-relationship", "xml": "\n", "comments": "", "outputs": 1, - "x": 232.1112518310547, - "y": 237.22223663330078, - "z": "ffd702ea.3cd72", + "x": 253.1112518310547, + "y": 244.22223663330078, + "z": "8966128c.40fc9", "wires": [ [ - "2ef3d64c.d8633a" + "36afdba8.70bb5c" ] ] }, { - "id": "2ef3d64c.d8633a", + "id": "36afdba8.70bb5c", "type": "block", "name": "block : atomic", "xml": "\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 457.33343505859375, - "y": 236.77792358398438, - "z": "ffd702ea.3cd72", + "x": 478.33343505859375, + "y": 243.77792358398438, + "z": "8966128c.40fc9", "wires": [ [ - "929780.1985e88", - "25858afe.2b9bce", - "e912429a.04b788" + "63bd9611.390fd8", + "1ed8c21a.583ede", + "232a5f0a.159568", + "e63ab049.15d1f" ] ] }, { - "id": "25858afe.2b9bce", + "id": "1ed8c21a.583ede", "type": "for", "name": "for each node in network-eth", "xml": "\n", "comments": "", "outputs": 1, - "x": 689.8888549804688, - "y": 191.33331298828125, - "z": "ffd702ea.3cd72", + "x": 710.8888549804688, + "y": 198.33331298828125, + "z": "8966128c.40fc9", "wires": [ [ - "9ceedf0.da974a", - "2a93e407.ae18bc", - "e6e033d7.96653" + "d25c4b67.5fdd7", + "7e336092.2a08", + "d912c615.382f4", + "e1c780a1.bce018" ] ] }, { - "id": "9ceedf0.da974a", + "id": "d25c4b67.5fdd7", "type": "set", "name": "set node-eth", "xml": "\n", "comments": "", "x": 973.111083984375, - "y": 98.22221374511719, - "z": "ffd702ea.3cd72", + "y": 42.22221374511719, + "z": "8966128c.40fc9", "wires": [] }, { - "id": "79b02bc6.8ef74c", + "id": "68049.3760dfb7c", "type": "set", "name": "set termination point tp-eth", "xml": "\n\n", "comments": "", - "x": 1194.111328125, - "y": 225.00006103515625, - "z": "ffd702ea.3cd72", + "x": 1215.111328125, + "y": 232.00006103515625, + "z": "8966128c.40fc9", "wires": [] }, { - "id": "53e75306.b60214", + "id": "78ae2560.1cea4c", "type": "set", "name": "set unique-ltpethId", "xml": "\n\n", "comments": "", - "x": 1172.000244140625, - "y": 262.111083984375, - "z": "ffd702ea.3cd72", + "x": 1193.000244140625, + "y": 269.111083984375, + "z": "8966128c.40fc9", "wires": [] }, { - "id": "929780.1985e88", + "id": "63bd9611.390fd8", "type": "execute", "name": "execute set tmp.network-eth.network-id", - "xml": "\n \n \n \n \n ", + "xml": "\n \n \n \n \n ", "comments": "", "outputs": 1, - "x": 647.9935302734375, - "y": 55.993499755859375, - "z": "ffd702ea.3cd72", + "x": 668.9935302734375, + "y": 62.993499755859375, + "z": "8966128c.40fc9", "wires": [ [] ] }, { - "id": "2a93e407.ae18bc", + "id": "7e336092.2a08", "type": "set", "name": "set local variables", - "xml": "\n\n\n", + "xml": "\n\n", "comments": "", - "x": 972, - "y": 146, - "z": "ffd702ea.3cd72", + "x": 987, + "y": 97, + "z": "8966128c.40fc9", "wires": [] }, { - "id": "e912429a.04b788", + "id": "232a5f0a.159568", "type": "execute", "name": "execute set tmp.network-otn.network-id", - "xml": "\n \n \n \n \n ", + "xml": "\n \n \n \n \n ", "comments": "", "outputs": 1, - "x": 645, - "y": 95, - "z": "ffd702ea.3cd72", + "x": 666, + "y": 102, + "z": "8966128c.40fc9", "wires": [ [] ] }, { - "id": "8be3e429.ccb7d", + "id": "5ced7489.3fd33c", "type": "for", "name": "for each tunnel termination point in otn", "xml": "\n", "comments": "", "outputs": 1, - "x": 1549, - "y": 622, - "z": "ffd702ea.3cd72", + "x": 1570, + "y": 629, + "z": "8966128c.40fc9", "wires": [ [ - "f3d35e68.c9d718", - "3ad809f1.06ba16", - "4db37c69.2430a4", - "ec80108a.70e1d", - "6c3aac2e.471db4" + "c149dbcd.dbc5b", + "a007e2e5.f8d76", + "1e876a82.9683f5", + "a5938665.3779c8", + "a06a50c9.82a2f" ] ] }, { - "id": "f3d35e68.c9d718", + "id": "c149dbcd.dbc5b", "type": "set", "name": "set tunnel termination point", "xml": "\n\n", "comments": "", - "x": 1918, - "y": 334, - "z": "ffd702ea.3cd72", + "x": 1939, + "y": 341, + "z": "8966128c.40fc9", "wires": [] }, { - "id": "3ad809f1.06ba16", + "id": "a007e2e5.f8d76", "type": "set", "name": "set unique-ttpId", "xml": "\n\n", "comments": "", - "x": 1885.888916015625, - "y": 398.111083984375, - "z": "ffd702ea.3cd72", + "x": 1906.888916015625, + "y": 405.111083984375, + "z": "8966128c.40fc9", "wires": [] }, { - "id": "7c6c9bf4.1268f4", + "id": "b56a229e.94c8d8", "type": "set", "name": "set tp-inter-layer-lock-id", "xml": "\n\n", "comments": "", - "x": 1212, - "y": 302, - "z": "ffd702ea.3cd72", + "x": 1233, + "y": 309, + "z": "8966128c.40fc9", "wires": [] }, { - "id": "38915841.38d1e", + "id": "91b08f38.b7b1f", "type": "for", "name": "for each node in network-otn", "xml": "\n", "comments": "", "outputs": 1, - "x": 1230, - "y": 351, - "z": "ffd702ea.3cd72", + "x": 1251, + "y": 358, + "z": "8966128c.40fc9", "wires": [ [ - "b1b6d531.8e8428", - "591e31d0.de7628", - "e2cb35d4.99da", - "32e4e342.a9f04c" + "2a04c22a.d38706", + "747557f8.e08f6", + "23d7e732.31c878", + "7fec5669.9d797", + "5525a122.db022" ] ] }, { - "id": "b1b6d531.8e8428", + "id": "2a04c22a.d38706", "type": "set", "name": "set node-otn", "xml": "\n", "comments": "", - "x": 1524, - "y": 321, - "z": "ffd702ea.3cd72", + "x": 1545, + "y": 328, + "z": "8966128c.40fc9", "wires": [] }, { - "id": "591e31d0.de7628", + "id": "747557f8.e08f6", "type": "set", "name": "set local variables", - "xml": "\n\n\n", + "xml": "\n\n", "comments": "", - "x": 1522.888916015625, - "y": 368.7777862548828, - "z": "ffd702ea.3cd72", + "x": 1543.888916015625, + "y": 375.7777862548828, + "z": "8966128c.40fc9", "wires": [] }, { - "id": "4db37c69.2430a4", + "id": "1e876a82.9683f5", "type": "set", "name": "set ttp-inter-layer-lock-id", "xml": "\n\n", "comments": "", - "x": 1910, - "y": 452, - "z": "ffd702ea.3cd72", + "x": 1931, + "y": 459, + "z": "8966128c.40fc9", "wires": [] }, { - "id": "ec80108a.70e1d", + "id": "a5938665.3779c8", "type": "switchNode", "name": "switch tp-inter-layer-lock-id", "xml": "\n", "comments": "", "outputs": 1, - "x": 1917, - "y": 508, - "z": "ffd702ea.3cd72", + "x": 1938, + "y": 515, + "z": "8966128c.40fc9", "wires": [ [ - "cf4f4a72.7d5168" + "48b284bc.31f88c" ] ] }, { - "id": "cf4f4a72.7d5168", + "id": "48b284bc.31f88c", "type": "outcome", "name": "ttp-inter-layer-lock-id", "xml": "\n", "comments": "", "outputs": 1, - "x": 1975, - "y": 604, - "z": "ffd702ea.3cd72", + "x": 1996, + "y": 611, + "z": "8966128c.40fc9", "wires": [ [ - "3d7797fd.32b9a8" + "d5168225.118b5" ] ] }, { - "id": "3d7797fd.32b9a8", + "id": "d5168225.118b5", "type": "save", "name": "save p-interface relationship to ttp in AAI", "xml": "\n\n\n\n\n", "comments": "", "outputs": 1, - "x": 2293, - "y": 604, - "z": "ffd702ea.3cd72", + "x": 2314, + "y": 611, + "z": "8966128c.40fc9", "wires": [ [] ] }, { - "id": "b8fd2648.6f854", + "id": "679b8e41.9ed698", "type": "set", "name": "unset termination point tp-eth", "xml": "\n\n", "comments": "", - "x": 1189, - "y": 187.99349975585938, - "z": "ffd702ea.3cd72", + "x": 1210, + "y": 194.99349975585938, + "z": "8966128c.40fc9", "wires": [] }, { - "id": "6c3aac2e.471db4", + "id": "a06a50c9.82a2f", "type": "set", "name": "unset tunnel termination point", "xml": "\n\n", "comments": "", - "x": 1926, - "y": 280.9934997558594, - "z": "ffd702ea.3cd72", + "x": 1947, + "y": 287.9934997558594, + "z": "8966128c.40fc9", "wires": [] }, { - "id": "e6e033d7.96653", + "id": "d912c615.382f4", "type": "switchNode", "name": "switch node-eth tp", "xml": "\n", "comments": "", "outputs": 1, - "x": 556, - "y": 370, - "z": "ffd702ea.3cd72", + "x": 577, + "y": 377, + "z": "8966128c.40fc9", "wires": [ [ - "80e4765d.fcdaa8", - "a8cca188.f375d", - "b96aa4a5.384fe8" + "a5220607.a1fd88", + "ed33421.4d77fc", + "60e52ea8.adce88" ] ] }, { - "id": "80e4765d.fcdaa8", + "id": "a5220607.a1fd88", "type": "other", "name": "Null", "xml": "\n", "comments": "", "outputs": 1, - "x": 735, - "y": 322, - "z": "ffd702ea.3cd72", + "x": 756, + "y": 329, + "z": "8966128c.40fc9", "wires": [ [ - "adea3129.2af79" + "f8847f3a.3586c" ] ] }, { - "id": "adea3129.2af79", + "id": "f8847f3a.3586c", "type": "block", "name": "block", "xml": "\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 890, - "y": 322, - "z": "ffd702ea.3cd72", + "x": 911, + "y": 329, + "z": "8966128c.40fc9", "wires": [ [] ] }, { - "id": "b96aa4a5.384fe8", + "id": "60e52ea8.adce88", "type": "outcome", "name": "length 0", "xml": "\n", "comments": "", "outputs": 1, - "x": 745, - "y": 370, - "z": "ffd702ea.3cd72", + "x": 766, + "y": 377, + "z": "8966128c.40fc9", "wires": [ [ - "adea3129.2af79" + "f8847f3a.3586c" ] ] }, { - "id": "a8cca188.f375d", + "id": "ed33421.4d77fc", "type": "other", "name": "other", "xml": "\n", "comments": "", "outputs": 1, - "x": 734, - "y": 424, - "z": "ffd702ea.3cd72", + "x": 755, + "y": 431, + "z": "8966128c.40fc9", "wires": [ [ - "2c29c804.a15ee" + "4137593c.5397c" ] ] }, { - "id": "2c29c804.a15ee", + "id": "4137593c.5397c", "type": "for", "name": "for each termination point", "xml": "\n", "comments": "", "outputs": 1, - "x": 942.4444580078125, - "y": 394.111083984375, - "z": "ffd702ea.3cd72", + "x": 963.4444580078125, + "y": 401.111083984375, + "z": "8966128c.40fc9", "wires": [ [ - "b8fd2648.6f854", - "79b02bc6.8ef74c", - "53e75306.b60214", - "7c6c9bf4.1268f4", - "38915841.38d1e" + "679b8e41.9ed698", + "68049.3760dfb7c", + "78ae2560.1cea4c", + "b56a229e.94c8d8", + "91b08f38.b7b1f" ] ] }, { - "id": "e2cb35d4.99da", + "id": "23d7e732.31c878", "type": "set", "name": "unset node-otn", "xml": "\n\n\n\n", "comments": "", - "x": 1525, - "y": 270, - "z": "ffd702ea.3cd72", + "x": 1546, + "y": 277, + "z": "8966128c.40fc9", "wires": [] }, { - "id": "32e4e342.a9f04c", + "id": "7fec5669.9d797", "type": "switchNode", "name": "switch node-otn ttp", "xml": "\n", "comments": "", "outputs": 1, - "x": 1122, - "y": 601, - "z": "ffd702ea.3cd72", + "x": 1143, + "y": 608, + "z": "8966128c.40fc9", "wires": [ [ - "571c7e22.88577", - "c4c843ca.dc868", - "dcc7ee12.1af12" + "c2495d37.4f1a88", + "4a7d6e3.4a2c99", + "e5a8fd10.f52c58" ] ] }, { - "id": "571c7e22.88577", + "id": "c2495d37.4f1a88", "type": "other", "name": "Null", "xml": "\n", "comments": "", "outputs": 1, - "x": 1310, - "y": 487, - "z": "ffd702ea.3cd72", + "x": 1331, + "y": 494, + "z": "8966128c.40fc9", "wires": [ [ - "3d4d0383.b594e4" + "50aa44cc.08445c" ] ] }, { - "id": "c4c843ca.dc868", + "id": "4a7d6e3.4a2c99", "type": "outcome", "name": "length 0", "xml": "\n", "comments": "", "outputs": 1, - "x": 1315, - "y": 562, - "z": "ffd702ea.3cd72", + "x": 1336, + "y": 569, + "z": "8966128c.40fc9", "wires": [ [ - "3d4d0383.b594e4" + "50aa44cc.08445c" ] ] }, { - "id": "dcc7ee12.1af12", + "id": "e5a8fd10.f52c58", "type": "other", "name": "other", "xml": "\n", "comments": "", "outputs": 1, - "x": 1312, - "y": 624, - "z": "ffd702ea.3cd72", + "x": 1333, + "y": 631, + "z": "8966128c.40fc9", "wires": [ [ - "8be3e429.ccb7d" + "5ced7489.3fd33c" ] ] }, { - "id": "3d4d0383.b594e4", + "id": "50aa44cc.08445c", "type": "block", "name": "block", "xml": "\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1470, - "y": 553, - "z": "ffd702ea.3cd72", + "x": 1491, + "y": 560, + "z": "8966128c.40fc9", "wires": [ [] ] + }, + { + "id": "e1c780a1.bce018", + "type": "set", + "name": "set local variables", + "xml": "\n\n", + "comments": "", + "x": 989, + "y": 153, + "z": "8966128c.40fc9", + "wires": [] + }, + { + "id": "e63ab049.15d1f", + "type": "set", + "name": "set local variables", + "xml": "\n\n\n\n", + "comments": "", + "x": 658, + "y": 144, + "z": "8966128c.40fc9", + "wires": [] + }, + { + "id": "5525a122.db022", + "type": "set", + "name": "set local variables", + "xml": "\n\n", + "comments": "", + "x": 1544, + "y": 425, + "z": "8966128c.40fc9", + "wires": [] } ] \ No newline at end of file diff --git a/platform-logic/datachange/src/main/xml/DataChange_update-network-links-to-aai.xml b/platform-logic/datachange/src/main/xml/DataChange_update-network-links-to-aai.xml index ab50abd3..f870e369 100644 --- a/platform-logic/datachange/src/main/xml/DataChange_update-network-links-to-aai.xml +++ b/platform-logic/datachange/src/main/xml/DataChange_update-network-links-to-aai.xml @@ -1,271 +1,287 @@ - - + + - + - - - - - + + + + + - - + + - - - + + + - - + + - + - - + + - - - - + + + + - - + + - + - - + + - - - - - + + + + + - - - - + + + + - + - - - + + + - - - + + + - - - - - + + + + + - - - - - - - - + + + + + + + + - - + + + - --> - - - - - - - - + - - - - - - - - + + + + + + + + - + - - - - - - - - + + + + + + + + - - - + + + - - - + + + - - + + - - + + - - + + - + - + - - - - - - - - - + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - + + + + + - - - - - + + + + + - - - - - - + + + + + + + - - - - - + + + + + - - - + + + - - - + + + - - + + - - + + - - + + - + - + - - - - - - - - - + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - + + + + + - - - - - + + + + + @@ -274,88 +290,96 @@ - - - - - - + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - + + + + + + + + + - - - + + + - - - + + + - - + + - - + + - - + + - + - + - - - - - - - - - + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - + + + + + - - - - - + + + + + diff --git a/platform-logic/datachange/src/main/xml/DataChange_update-network-to-aai.xml b/platform-logic/datachange/src/main/xml/DataChange_update-network-to-aai.xml index 839e15de..5a0255de 100644 --- a/platform-logic/datachange/src/main/xml/DataChange_update-network-to-aai.xml +++ b/platform-logic/datachange/src/main/xml/DataChange_update-network-to-aai.xml @@ -1,113 +1,118 @@ - - + + - + - + - - - - - - + + + + + + - + - + - - + + - + - - - - - - + + + + + + - - - + + + - - + + - - + + - + - + - + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - + - - - - - - - + + + + + + + @@ -115,91 +120,94 @@ - - - - - + + + + + - - - - - + + + + + - - - - - + + + + + - - - + + + - - + + - - + + - + - + - + - - + + - + - - - + + + - - + + - + - + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + @@ -207,7 +215,7 @@ - + \ No newline at end of file diff --git a/platform-logic/datachange/src/main/xml/DataChange_update-tp-ttp-relationship.xml b/platform-logic/datachange/src/main/xml/DataChange_update-tp-ttp-relationship.xml index b9dbae7a..90396852 100644 --- a/platform-logic/datachange/src/main/xml/DataChange_update-tp-ttp-relationship.xml +++ b/platform-logic/datachange/src/main/xml/DataChange_update-tp-ttp-relationship.xml @@ -1,88 +1,99 @@ - - + + - + - + - + - + - + + + + + - + - - + - - - + + + + + + - - + + - - + + - + - + - + - + - + + + + + + - - - + - + - - + - - - + + + - - + + - - + + - + - + - + - + - - - - - - - + + + + + + + diff --git a/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-create-otn-tunnel.json b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-create-otn-tunnel.json index 26e9f8fe..8b19b0e4 100644 --- a/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-create-otn-tunnel.json +++ b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-create-otn-tunnel.json @@ -1,20 +1,20 @@ [ { - "id": "2d787bd1.a214b4", + "id": "317d0413.97b404", "type": "dgstart", "name": "DGSTART", "outputs": 1, - "x": 92, - "y": 22, - "z": "17040f2b.d4a821", + "x": 125, + "y": 61, + "z": "3b47dc40.0a0c44", "wires": [ [ - "99a6e8f9.6615a8" + "56043ae0.d8ae54" ] ] }, { - "id": "99a6e8f9.6615a8", + "id": "56043ae0.d8ae54", "type": "service-logic", "name": "GENERIC-RESOURCE-API ${project.version}", "module": "GENERIC-RESOURCE-API", @@ -22,427 +22,697 @@ "comments": "", "xml": "", "outputs": 1, - "x": 206, - "y": 125.00003051757812, - "z": "17040f2b.d4a821", + "x": 239, + "y": 164.00003051757812, + "z": "3b47dc40.0a0c44", "wires": [ [ - "d3f739cf.6d5a28" + "1b0e9fc8.fec538" ] ] }, { - "id": "d3f739cf.6d5a28", + "id": "1b0e9fc8.fec538", "type": "method", "name": "sotn-create-otn-tunnel", "xml": "\n", "comments": "", "outputs": 1, - "x": 217.0001220703125, - "y": 297, - "z": "17040f2b.d4a821", + "x": 250.0001220703125, + "y": 336, + "z": "3b47dc40.0a0c44", "wires": [ [ - "eb49715b.e15e8" + "c6ff1d9b.4f5f78" ] ] }, { - "id": "acad5285.a3e1a", + "id": "95a2379b.0d1ce", "type": "comment", "name": "get cross-domain-link information", "info": "", "comments": "", - "x": 449.5001220703125, - "y": 31.286468505859375, - "z": "17040f2b.d4a821", + "x": 482.5001220703125, + "y": 70.28646850585938, + "z": "3b47dc40.0a0c44", "wires": [] }, { - "id": "eb49715b.e15e8", + "id": "c6ff1d9b.4f5f78", "type": "block", "name": "block : atomic", "xml": "", "atomic": "true", "outputs": 1, - "x": 336.9688720703125, - "y": 425.74163818359375, - "z": "17040f2b.d4a821", + "x": 369.9688720703125, + "y": 464.74163818359375, + "z": "3b47dc40.0a0c44", "wires": [ [ - "96ed9e8f.b90f", - "f1e66bd.f624698", - "386c8b8a.515584" + "26b2f75.3503708", + "f64991bb.7d2d3", + "f13f2135.894b48" ] ] }, { - "id": "96ed9e8f.b90f", + "id": "26b2f75.3503708", "type": "switchNode", "name": "switch prop.sdncRestApi.token_id", "xml": "\n\n", "comments": "", "outputs": 1, - "x": 586, - "y": 625, - "z": "17040f2b.d4a821", + "x": 616, + "y": 1203, + "z": "3b47dc40.0a0c44", "wires": [ [ - "f9d6c529.483238", - "aec39761.70cfc8" + "6717edba.dd315c", + "9d26d203.bf1448" ] ] }, { - "id": "f9d6c529.483238", + "id": "6717edba.dd315c", "type": "other", "name": "Null", "xml": "\n", "comments": "", "outputs": 1, - "x": 882.8438110351562, - "y": 580.1218872070312, - "z": "17040f2b.d4a821", + "x": 912.8438110351562, + "y": 1158.1218872070312, + "z": "3b47dc40.0a0c44", "wires": [ [ - "cb912ed0.0c0a3" + "84d1cb1a.eb2fc8" ] ] }, { - "id": "aec39761.70cfc8", + "id": "9d26d203.bf1448", "type": "other", "name": "other", "xml": "\n", "comments": "", "outputs": 1, - "x": 881.5, - "y": 659, - "z": "17040f2b.d4a821", + "x": 911.5, + "y": 1237, + "z": "3b47dc40.0a0c44", "wires": [ [ - "a260c7eb.1e65d8" + "2182e897.132d8" ] ] }, { - "id": "a260c7eb.1e65d8", + "id": "2182e897.132d8", "type": "execute", - "name": "execute RestconfApiCallNode Create ethernet Service with token", + "name": "execute RestconfApiCallNode Create OTN tunnel with token", "xml": "\n\n\n\n\n\n\n\n\n\n\n\n", "comments": "", "outputs": 1, - "x": 1193, - "y": 661, - "z": "17040f2b.d4a821", + "x": 1223, + "y": 1239, + "z": "3b47dc40.0a0c44", "wires": [ [ - "b31b1f14.b450e", - "31c0814c.e11a0e" + "1b911a1d.a19f46", + "ab8d3cb8.cfa08" ] ] }, { - "id": "cb912ed0.0c0a3", + "id": "84d1cb1a.eb2fc8", "type": "execute", - "name": "execute RestconfApiCallNode Create ethernet Service without token", + "name": "execute RestconfApiCallNode Creat OTN tunnel without token", "xml": "\n\n\n\n\n\n\n\n\n\n\n", "comments": "", "outputs": 1, - "x": 1205, - "y": 584, - "z": "17040f2b.d4a821", + "x": 1235, + "y": 1162, + "z": "3b47dc40.0a0c44", "wires": [ [ - "31c0814c.e11a0e", - "b31b1f14.b450e" + "ab8d3cb8.cfa08", + "1b911a1d.a19f46" ] ] }, { - "id": "b31b1f14.b450e", + "id": "1b911a1d.a19f46", "type": "success", "name": "success", "xml": "\n", "comments": "", "outputs": 1, - "x": 1626.5, - "y": 652, - "z": "17040f2b.d4a821", + "x": 1656.5, + "y": 1230, + "z": "3b47dc40.0a0c44", "wires": [ [ - "6b799b05.9369c4" + "21fe6b2e.6608f4" ] ] }, { - "id": "6b799b05.9369c4", + "id": "21fe6b2e.6608f4", "type": "block", "name": "block : atomic", "xml": "", "atomic": "true", "comments": "", "outputs": 1, - "x": 1821, - "y": 645, - "z": "17040f2b.d4a821", + "x": 1851, + "y": 1223, + "z": "3b47dc40.0a0c44", "wires": [ [] ] }, { - "id": "401bdd4e.60ff34", + "id": "3680634b.3b9a5c", "type": "returnFailure", "name": "return failure", "xml": "\n\t\n\t\n \n", "comments": "", - "x": 1795.5, - "y": 583, - "z": "17040f2b.d4a821", + "x": 1825.5, + "y": 1161, + "z": "3b47dc40.0a0c44", "wires": [] }, { - "id": "31c0814c.e11a0e", + "id": "ab8d3cb8.cfa08", "type": "failure", "name": "failure", "xml": "\n", "comments": "", "outputs": 1, - "x": 1611.5, - "y": 587, - "z": "17040f2b.d4a821", + "x": 1641.5, + "y": 1165, + "z": "3b47dc40.0a0c44", "wires": [ [ - "401bdd4e.60ff34" + "3680634b.3b9a5c" ] ] }, { - "id": "f1e66bd.f624698", + "id": "161d9ba6.9cb994", "type": "switchNode", "name": "switch eth topo's provider-id", "xml": "\n", "comments": "", "outputs": 1, - "x": 594, - "y": 173, - "z": "17040f2b.d4a821", + "x": 627, + "y": 212, + "z": "3b47dc40.0a0c44", "wires": [ [ - "daa01201.b40fe", - "ffd4b2da.f2213" + "5e06ab69.dbc5bc", + "85ad793.798f588" ] ] }, { - "id": "daa01201.b40fe", + "id": "5e06ab69.dbc5bc", "type": "outcome", "name": "domain A's OTN topo's provider ID", - "xml": "\n\u0001", + "xml": "", "comments": "", "outputs": 1, - "x": 897.285888671875, - "y": 108.82177734375, - "z": "17040f2b.d4a821", + "x": 930.285888671875, + "y": 147.82177734375, + "z": "3b47dc40.0a0c44", "wires": [ [ - "647bcb79.cd9c24" + "319f4a6b.cd0bbe" ] ] }, { - "id": "647bcb79.cd9c24", + "id": "319f4a6b.cd0bbe", "type": "block", "name": "block : atomic", "xml": "", "atomic": "true", "outputs": 1, - "x": 1154.117431640625, - "y": 107.34027099609375, - "z": "17040f2b.d4a821", + "x": 1187.117431640625, + "y": 146.34027099609375, + "z": "3b47dc40.0a0c44", "wires": [ [ - "7c841c48.339f24" + "a3bb1ab9.1257c" ] ] }, { - "id": "ffd4b2da.f2213", + "id": "85ad793.798f588", "type": "outcome", "name": "domain B's OTN topo's provider ID", - "xml": "\n\u0001", + "xml": "", "comments": "", "outputs": 1, - "x": 895, - "y": 212, - "z": "17040f2b.d4a821", + "x": 928, + "y": 251, + "z": "3b47dc40.0a0c44", "wires": [ [ - "ada6a164.5b7e9" + "91623acb.3dd5b" ] ] }, { - "id": "7c841c48.339f24", + "id": "a3bb1ab9.1257c", "type": "set", "name": "set otn domain node", "xml": "\n\n", "comments": "", - "x": 1359, - "y": 106, - "z": "17040f2b.d4a821", + "x": 1392, + "y": 145, + "z": "3b47dc40.0a0c44", "wires": [] }, { - "id": "ada6a164.5b7e9", + "id": "91623acb.3dd5b", "type": "block", "name": "block : atomic", "xml": "", "atomic": "true", "outputs": 1, - "x": 1150, - "y": 209, - "z": "17040f2b.d4a821", + "x": 1183, + "y": 248, + "z": "3b47dc40.0a0c44", "wires": [ [ - "24ca0ba6.6ddfe4" + "95015654.a72998" ] ] }, { - "id": "24ca0ba6.6ddfe4", + "id": "95015654.a72998", "type": "set", "name": "set otn domain node", "xml": "\n\n", "comments": "", - "x": 1354.882568359375, - "y": 207.65972900390625, - "z": "17040f2b.d4a821", + "x": 1387.882568359375, + "y": 246.65972900390625, + "z": "3b47dc40.0a0c44", "wires": [] }, { - "id": "386c8b8a.515584", + "id": "990d58ad.7400d8", "type": "switchNode", "name": "switch eth node ID", "xml": "\n", "comments": "", "outputs": 1, - "x": 600, - "y": 427, - "z": "17040f2b.d4a821", + "x": 639, + "y": 711, + "z": "3b47dc40.0a0c44", "wires": [ [ - "d91602b.4cd09", - "c018f42b.2b1a68" + "2ce24094.f713b", + "7ec071d2.b7a1f8" ] ] }, { - "id": "d91602b.4cd09", + "id": "2ce24094.f713b", "type": "outcome", "name": "source eth node", - "xml": "\n\u0001", + "xml": "", "comments": "", "outputs": 1, - "x": 840.285888671875, - "y": 349.82177734375, - "z": "17040f2b.d4a821", + "x": 879.285888671875, + "y": 632.82177734375, + "z": "3b47dc40.0a0c44", "wires": [ [ - "fd2adb67.e7ca38" + "dd4b02f7.01e688" ] ] }, { - "id": "fd2adb67.e7ca38", + "id": "dd4b02f7.01e688", "type": "block", "name": "block : atomic", "xml": "", "atomic": "true", "outputs": 1, - "x": 1044.117431640625, - "y": 349.34027099609375, - "z": "17040f2b.d4a821", + "x": 1083.117431640625, + "y": 632.3402709960938, + "z": "3b47dc40.0a0c44", "wires": [ [ - "ad11583e.e14ea8" + "aa1fe07a.cf8d18" ] ] }, { - "id": "17b601bf.a39ace", + "id": "ddb0a3f1.d5a138", "type": "block", "name": "block : atomic", "xml": "", "atomic": "true", "outputs": 1, - "x": 1046, - "y": 469, - "z": "17040f2b.d4a821", + "x": 1085, + "y": 752, + "z": "3b47dc40.0a0c44", "wires": [ [ - "97fd4aa8.fd21b8" + "da3e33dd.52f4e8" ] ] }, { - "id": "c018f42b.2b1a68", + "id": "7ec071d2.b7a1f8", "type": "outcome", "name": "dest eth node", - "xml": "\n\u0001", + "xml": "", "comments": "", "outputs": 1, - "x": 841, - "y": 469, - "z": "17040f2b.d4a821", + "x": 880, + "y": 752, + "z": "3b47dc40.0a0c44", "wires": [ [ - "17b601bf.a39ace" + "ddb0a3f1.d5a138" ] ] }, { - "id": "ad11583e.e14ea8", + "id": "aa1fe07a.cf8d18", "type": "set", "name": "set attachment_param", "xml": "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n", "comments": "", - "x": 1286, - "y": 350, - "z": "17040f2b.d4a821", + "x": 1325, + "y": 633, + "z": "3b47dc40.0a0c44", "wires": [] }, { - "id": "4add26c3.ec74e8", + "id": "163a9a7c.f94c4e", "type": "comment", "name": "cross domain OTN node is the dest of OTN tunnel", "info": "", "comments": "", - "x": 945, - "y": 306, - "z": "17040f2b.d4a821", + "x": 984, + "y": 589, + "z": "3b47dc40.0a0c44", "wires": [] }, { - "id": "15de3156.c96c3f", + "id": "295b6b41.b99cfc", "type": "comment", "name": "cross domain OTN node is the source of OTN tunnel", "info": "", "comments": "", - "x": 954, - "y": 429, - "z": "17040f2b.d4a821", + "x": 993, + "y": 712, + "z": "3b47dc40.0a0c44", + "wires": [] + }, + { + "id": "da3e33dd.52f4e8", + "type": "set", + "name": "set attachment_param", + "xml": "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n", + "comments": "", + "x": 1333, + "y": 757, + "z": "3b47dc40.0a0c44", + "wires": [] + }, + { + "id": "78e806c9.b8028", + "type": "failure", + "name": "true", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 877, + "y": 828, + "z": "3b47dc40.0a0c44", + "wires": [ + [ + "a1380a33.f7da" + ] + ] + }, + { + "id": "f64991bb.7d2d3", + "type": "execute", + "name": "uni-tp-id contains src-pnf-name", + "xml": "\n \n \n", + "comments": "", + "outputs": 1, + "x": 663, + "y": 827, + "z": "3b47dc40.0a0c44", + "wires": [ + [ + "78e806c9.b8028", + "c58e7233.0e544" + ] + ] + }, + { + "id": "c58e7233.0e544", + "type": "failure", + "name": "false", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 878, + "y": 876, + "z": "3b47dc40.0a0c44", + "wires": [ + [ + "716e2d25.6fe90c" + ] + ] + }, + { + "id": "716e2d25.6fe90c", + "type": "execute", + "name": "uni-tp-id contains dst-pnf-name", + "xml": "\n \n \n", + "comments": "", + "outputs": 1, + "x": 1087, + "y": 874, + "z": "3b47dc40.0a0c44", + "wires": [ + [ + "b2082b04.764078" + ] + ] + }, + { + "id": "b2082b04.764078", + "type": "failure", + "name": "true", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 1301, + "y": 875, + "z": "3b47dc40.0a0c44", + "wires": [ + [ + "facf7dd6.b833c" + ] + ] + }, + { + "id": "a1380a33.f7da", + "type": "block", + "name": "block : atomic", + "xml": "", + "atomic": "true", + "outputs": 1, + "x": 1057, + "y": 825, + "z": "3b47dc40.0a0c44", + "wires": [ + [ + "77be498b.1e80d" + ] + ] + }, + { + "id": "facf7dd6.b833c", + "type": "block", + "name": "block : atomic", + "xml": "", + "atomic": "true", + "outputs": 1, + "x": 1470, + "y": 872, + "z": "3b47dc40.0a0c44", + "wires": [ + [ + "5ad550e4.a3ef2" + ] + ] + }, + { + "id": "2fce99ef.66ce96", + "type": "failure", + "name": "true", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 858, + "y": 373, + "z": "3b47dc40.0a0c44", + "wires": [ + [ + "62b7c2e9.915bfc" + ] + ] + }, + { + "id": "f13f2135.894b48", + "type": "execute", + "name": "uni-tp-id contains domain-A.network-id", + "xml": "\n \n \n", + "comments": "", + "outputs": 1, + "x": 623, + "y": 372, + "z": "3b47dc40.0a0c44", + "wires": [ + [ + "2fce99ef.66ce96", + "c8a39e1a.853cd" + ] + ] + }, + { + "id": "c8a39e1a.853cd", + "type": "failure", + "name": "false", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 830, + "y": 423, + "z": "3b47dc40.0a0c44", + "wires": [ + [ + "9c03510d.95d8f8" + ] + ] + }, + { + "id": "84bd363f.cecab", + "type": "failure", + "name": "true", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 1282, + "y": 420, + "z": "3b47dc40.0a0c44", + "wires": [ + [ + "319183ef.947ad4" + ] + ] + }, + { + "id": "62b7c2e9.915bfc", + "type": "block", + "name": "block : atomic", + "xml": "", + "atomic": "true", + "outputs": 1, + "x": 1038, + "y": 370, + "z": "3b47dc40.0a0c44", + "wires": [ + [ + "feb246e9.3add2" + ] + ] + }, + { + "id": "feb246e9.3add2", + "type": "set", + "name": "set otn domain node", + "xml": "\n\n", + "comments": "", + "x": 1242.882568359375, + "y": 368.65972900390625, + "z": "3b47dc40.0a0c44", + "wires": [] + }, + { + "id": "319183ef.947ad4", + "type": "block", + "name": "block : atomic", + "xml": "", + "atomic": "true", + "outputs": 1, + "x": 1451, + "y": 417, + "z": "3b47dc40.0a0c44", + "wires": [ + [ + "5f5c2180.97a72" + ] + ] + }, + { + "id": "5f5c2180.97a72", + "type": "set", + "name": "set otn domain node", + "xml": "\n\n", + "comments": "", + "x": 1655.882568359375, + "y": 415.65972900390625, + "z": "3b47dc40.0a0c44", + "wires": [] + }, + { + "id": "77be498b.1e80d", + "type": "set", + "name": "set attachment_param", + "xml": "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n", + "comments": "", + "x": 1269, + "y": 823, + "z": "3b47dc40.0a0c44", "wires": [] }, { - "id": "97fd4aa8.fd21b8", + "id": "5ad550e4.a3ef2", "type": "set", "name": "set attachment_param", "xml": "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n", "comments": "", - "x": 1294, - "y": 474, - "z": "17040f2b.d4a821", + "x": 1669, + "y": 872, + "z": "3b47dc40.0a0c44", "wires": [] + }, + { + "id": "9c03510d.95d8f8", + "type": "execute", + "name": "uni-tp-id contains domain-B.network-id", + "xml": "\n \n \n", + "comments": "", + "outputs": 1, + "x": 1059, + "y": 423, + "z": "3b47dc40.0a0c44", + "wires": [ + [ + "84bd363f.cecab" + ] + ] } ] \ No newline at end of file diff --git a/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-get-otn-tunnel-path-from-oof.json b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-get-otn-tunnel-path-from-oof.json index 10463711..58005857 100644 --- a/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-get-otn-tunnel-path-from-oof.json +++ b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-get-otn-tunnel-path-from-oof.json @@ -1,1239 +1,1360 @@ -[ - { - "id": "ca266b03.5b0c68", - "type": "dgstart", - "name": "DGSTART", - "outputs": 1, - "x": 91.4998779296875, - "y": 34, - "z": "cb55ab48.d781c8", - "wires": [ - [ - "9db70ac2.5a0448" - ] - ] - }, - { - "id": "9db70ac2.5a0448", - "type": "service-logic", - "name": "GENERIC-RESOURCE-API ${project.version}", - "module": "GENERIC-RESOURCE-API", - "version": "${project.version}", - "comments": "", - "xml": "", - "outputs": 1, - "x": 216.4998779296875, - "y": 360.00001525878906, - "z": "cb55ab48.d781c8", - "wires": [ - [ - "f6e8674b.eb6ef8" - ] - ] - }, - { - "id": "f6e8674b.eb6ef8", - "type": "method", - "name": "sotn-get-otn-tunnel-path-from-oof", - "xml": "\n", - "comments": "", - "outputs": 1, - "x": 280.5, - "y": 453, - "z": "cb55ab48.d781c8", - "wires": [ - [ - "d8a649df.dd5438" - ] - ] - }, - { - "id": "4cb8a9dc.c82628", - "type": "execute", - "name": "execute RestApiCallNode getPath from OOF", - "xml": "\n\n\n\n\n\n\n\n\n\n\n\n", - "comments": "", - "outputs": 1, - "x": 763.4729614257812, - "y": 111.99600219726562, - "z": "cb55ab48.d781c8", - "wires": [ - [ - "c9ad9647.3c4fa8", - "65b028f1.fd8198" - ] - ] - }, - { - "id": "c9ad9647.3c4fa8", - "type": "success", - "name": "success", - "xml": "\n", - "comments": "", - "outputs": 1, - "x": 1003.4731025695801, - "y": 135.9959716796875, - "z": "cb55ab48.d781c8", - "wires": [ - [ - "43f1fecc.bf7f" - ] - ] - }, - { - "id": "b1305a70.64e458", - "type": "returnFailure", - "name": "return failure", - "xml": "\n\t\n\t\n \n", - "comments": "", - "x": 1142.4731369018555, - "y": 84.99606323242188, - "z": "cb55ab48.d781c8", - "wires": [] - }, - { - "id": "65b028f1.fd8198", - "type": "failure", - "name": "failure", - "xml": "\n", - "comments": "", - "outputs": 1, - "x": 1002.4728889465332, - "y": 84.99606227874756, - "z": "cb55ab48.d781c8", - "wires": [ - [ - "b1305a70.64e458" - ] - ] - }, - { - "id": "13911536.3440bb", - "type": "comment", - "name": "OTN tunnel path computation", - "info": "TODO: check input parameters -- they should be\nthe source and destination of ETH node+tp.", - "comments": "", - "x": 734.9767608642578, - "y": 68.00000190734863, - "z": "cb55ab48.d781c8", - "wires": [] - }, - { - "id": "7480efc5.dbe2e", - "type": "for", - "name": "for vidx..otn-oof.otn-links_length[]", - "xml": "", - "comments": "", - "outputs": 1, - "x": 754.4727783203125, - "y": 421.2457275390625, - "z": "cb55ab48.d781c8", - "wires": [ - [ - "b98c91e0.3766f" - ] - ] - }, - { - "id": "689331c8.a7329", - "type": "comment", - "name": "Loop through OTN links", - "info": "", - "comments": "", - "x": 837.9730834960938, - "y": 500.74609375, - "z": "cb55ab48.d781c8", - "wires": [] - }, - { - "id": "b98c91e0.3766f", - "type": "block", - "name": "block : atomic", - "xml": "", - "atomic": "true", - "outputs": 1, - "x": 859, - "y": 612.2864990234375, - "z": "cb55ab48.d781c8", - "wires": [ - [ - "3a76e5ee.5f99aa", - "a8939d2.521b76" - ] - ] - }, - { - "id": "3a76e5ee.5f99aa", - "type": "get-resource", - "name": "get-resource cross-link", - "xml": "\n\n\n", - "comments": "", - "outputs": 1, - "x": 1126, - "y": 532.2864685058594, - "z": "cb55ab48.d781c8", - "wires": [ - [ - "74ae6f25.c8093", - "d101f4ee.f9f8d8", - "7558125c.21685c" - ] - ] - }, - { - "id": "74ae6f25.c8093", - "type": "success", - "name": "success", - "xml": "\n", - "comments": "", - "outputs": 1, - "x": 1356.5, - "y": 477.2864685058594, - "z": "cb55ab48.d781c8", - "wires": [ - [ - "a0d35b9e.4c4448" - ] - ] - }, - { - "id": "d101f4ee.f9f8d8", - "type": "not-found", - "name": "not-found", - "xml": "\n", - "comments": "", - "outputs": 1, - "x": 1367.5, - "y": 534.2864685058594, - "z": "cb55ab48.d781c8", - "wires": [ - [ - "aab3f9be.7515c8" - ] - ] - }, - { - "id": "7558125c.21685c", - "type": "other", - "name": "other", - "xml": "\n", - "comments": "", - "outputs": 1, - "x": 1361.5, - "y": 584.2864685058594, - "z": "cb55ab48.d781c8", - "wires": [ - [ - "c5929dad.e1e45" - ] - ] - }, - { - "id": "aab3f9be.7515c8", - "type": "returnFailure", - "name": "return failure", - "xml": "\n\t\n\t\n \n\t\n\t\n \n\n", - "comments": "", - "x": 2318, - "y": 396.2864685058594, - "z": "cb55ab48.d781c8", - "wires": [] - }, - { - "id": "c5a99f90.0d85b", - "type": "comment", - "name": "get cross-domain-link information", - "info": "", - "comments": "", - "x": 1127, - "y": 493.2864685058594, - "z": "cb55ab48.d781c8", - "wires": [] - }, - { - "id": "a8939d2.521b76", - "type": "set", - "name": "set otn-oof.link-name", - "xml": "\n", - "comments": "", - "x": 1108.5, - "y": 442.2864685058594, - "z": "cb55ab48.d781c8", - "wires": [] - }, - { - "id": "43f1fecc.bf7f", - "type": "block", - "name": "block", - "xml": "\n", - "atomic": "false", - "comments": "", - "outputs": 1, - "x": 1148.5001487731934, - "y": 133.74145698547363, - "z": "cb55ab48.d781c8", - "wires": [ - [] - ] - }, - { - "id": "d8a649df.dd5438", - "type": "block", - "name": "block : atomic", - "xml": "", - "atomic": "true", - "outputs": 1, - "x": 521.4687614440918, - "y": 379.74163722991943, - "z": "cb55ab48.d781c8", - "wires": [ - [ - "4cb8a9dc.c82628", - "7480efc5.dbe2e" - ] - ] - }, - { - "id": "a0d35b9e.4c4448", - "type": "switchNode", - "name": "test cross-domain-link", - "xml": "\n", - "comments": "", - "outputs": 1, - "x": 1562, - "y": 476, - "z": "cb55ab48.d781c8", - "wires": [ - [ - "9c05dfa6.ba207" - ] - ] - }, - { - "id": "9c05dfa6.ba207", - "type": "outcome", - "name": "outcome cross-domain-link", - "xml": "\n", - "comments": "", - "outputs": 1, - "x": 1809, - "y": 477, - "z": "cb55ab48.d781c8", - "wires": [ - [ - "ff68def.188c12" - ] - ] - }, - { - "id": "1ed1e43f.527cac", - "type": "break", - "name": "break", - "xml": "\n", - "comments": "", - "x": 2154, - "y": 955, - "z": "cb55ab48.d781c8", - "wires": [] - }, - { - "id": "ff68def.188c12", - "type": "block", - "name": "block : atomic", - "xml": "", - "atomic": "true", - "outputs": 1, - "x": 2028, - "y": 479, - "z": "cb55ab48.d781c8", - "wires": [ - [ - "1ed1e43f.527cac", - "51d46963.f916e8", - "44b19c4e.886594", - "5702d427.f65a4c" - ] - ] - }, - { - "id": "2017012b.18bf6e", - "type": "comment", - "name": "setup variables", - "info": "", - "comments": "", - "x": 2286, - "y": 335, - "z": "cb55ab48.d781c8", - "wires": [] - }, - { - "id": "44b19c4e.886594", - "type": "get-resource", - "name": "get-resource src tp", - "xml": "\n\n\n", - "comments": "", - "outputs": 1, - "x": 2315, - "y": 485, - "z": "cb55ab48.d781c8", - "wires": [ - [ - "675b31ba.fc29c", - "e7ba827c.7802e", - "3d3ce0b1.c355d" - ] - ] - }, - { - "id": "675b31ba.fc29c", - "type": "success", - "name": "success", - "xml": "\n", - "comments": "", - "outputs": 1, - "x": 2548.5, - "y": 446, - "z": "cb55ab48.d781c8", - "wires": [ - [ - "8f945f43.0f6a1", - "35d184a7.0348bc" - ] - ] - }, - { - "id": "e7ba827c.7802e", - "type": "not-found", - "name": "not-found", - "xml": "\n", - "comments": "", - "outputs": 1, - "x": 2545.5, - "y": 504, - "z": "cb55ab48.d781c8", - "wires": [ - [ - "9bcbfa8e.5a3ae8" - ] - ] - }, - { - "id": "3d3ce0b1.c355d", - "type": "other", - "name": "other", - "xml": "\n", - "comments": "", - "outputs": 1, - "x": 2548.5, - "y": 556, - "z": "cb55ab48.d781c8", - "wires": [ - [ - "c82ee5b.1546f18" - ] - ] - }, - { - "id": "9bcbfa8e.5a3ae8", - "type": "returnFailure", - "name": "return failure", - "xml": "\n\t\n\t\n \n\t\n\t\n \n", - "comments": "", - "x": 2749, - "y": 393, - "z": "cb55ab48.d781c8", - "wires": [] - }, - { - "id": "35d184a7.0348bc", - "type": "get-resource", - "name": "get-resource src pnf", - "xml": "\n\n\n", - "comments": "", - "outputs": 1, - "x": 2739, - "y": 448, - "z": "cb55ab48.d781c8", - "wires": [ - [ - "9ea9cbf0.fa9328", - "aa8e1680.d1d798", - "dd38a5b5.866808" - ] - ] - }, - { - "id": "9ea9cbf0.fa9328", - "type": "success", - "name": "success", - "xml": "\n", - "comments": "", - "outputs": 1, - "x": 3022.5, - "y": 401, - "z": "cb55ab48.d781c8", - "wires": [ - [ - "899a7ec6.41ab2" - ] - ] - }, - { - "id": "aa8e1680.d1d798", - "type": "not-found", - "name": "not-found", - "xml": "\n", - "comments": "", - "outputs": 1, - "x": 3014.5, - "y": 456, - "z": "cb55ab48.d781c8", - "wires": [ - [ - "56667146.5a8cd" - ] - ] - }, - { - "id": "dd38a5b5.866808", - "type": "other", - "name": "other", - "xml": "\n", - "comments": "", - "outputs": 1, - "x": 3019.5, - "y": 513, - "z": "cb55ab48.d781c8", - "wires": [ - [ - "49c4c4a9.a9af7c" - ] - ] - }, - { - "id": "56667146.5a8cd", - "type": "returnFailure", - "name": "return failure", - "xml": "\n\t\n\t\n \n\t\n\t\n \n", - "comments": "", - "x": 4234, - "y": 262, - "z": "cb55ab48.d781c8", - "wires": [] - }, - { - "id": "6baf1c09.23f524", - "type": "get-resource", - "name": "get-resource src TTP", - "xml": "\n\n\n", - "comments": "", - "outputs": 1, - "x": 4223, - "y": 333, - "z": "cb55ab48.d781c8", - "wires": [ - [ - "e53fa55a.80c878" - ] - ] - }, - { - "id": "e53fa55a.80c878", - "type": "success", - "name": "success", - "xml": "\n", - "comments": "", - "outputs": 1, - "x": 4414.5, - "y": 330, - "z": "cb55ab48.d781c8", - "wires": [ - [ - "fb4eb6f8.67d008" - ] - ] - }, - { - "id": "fb4eb6f8.67d008", - "type": "set", - "name": "set domain A node ttp-id", - "xml": "\n\n", - "comments": "", - "x": 4627, - "y": 329, - "z": "cb55ab48.d781c8", - "wires": [] - }, - { - "id": "151d93fd.7167ec", - "type": "block", - "name": "block : atomic", - "xml": "", - "atomic": "true", - "outputs": 1, - "x": 4019, - "y": 512, - "z": "cb55ab48.d781c8", - "wires": [ - [ - "fb4c025e.b4687", - "2b826247.b8392e" - ] - ] - }, - { - "id": "a6f18660.f8abe8", - "type": "outcome", - "name": "tunnel-termination-point", - "xml": "\n", - "comments": "", - "outputs": 1, - "x": 3815.16845703125, - "y": 325.48150634765625, - "z": "cb55ab48.d781c8", - "wires": [ - [ - "45ebcf03.0e118" - ] - ] - }, - { - "id": "1ff26720.4f6889", - "type": "for", - "name": "for each relationship", - "xml": "\n", - "comments": "", - "outputs": 1, - "x": 3381.882568359375, - "y": 398.65972900390625, - "z": "cb55ab48.d781c8", - "wires": [ - [ - "89b5166.0c594e8" - ] - ] - }, - { - "id": "89b5166.0c594e8", - "type": "switchNode", - "name": "switch related-to", - "xml": "\n", - "comments": "", - "outputs": 1, - "x": 3607.882568359375, - "y": 398.65972900390625, - "z": "cb55ab48.d781c8", - "wires": [ - [ - "a6f18660.f8abe8", - "376f0574.e1601a" - ] - ] - }, - { - "id": "899a7ec6.41ab2", - "type": "block", - "name": "block", - "xml": "\n", - "atomic": "false", - "comments": "", - "outputs": 1, - "x": 3166.88232421875, - "y": 398.6556701660156, - "z": "cb55ab48.d781c8", - "wires": [ - [ - "1ff26720.4f6889", - "29ff2ed5.ef4af2" - ] - ] - }, - { - "id": "29ff2ed5.ef4af2", - "type": "set", - "name": "set domain A node-id and tpn", - "xml": "\n\n\n", - "comments": "", - "x": 3426, - "y": 309, - "z": "cb55ab48.d781c8", - "wires": [] - }, - { - "id": "376f0574.e1601a", - "type": "outcome", - "name": "network-resource", - "xml": "\n", - "comments": "", - "outputs": 1, - "x": 3806, - "y": 511, - "z": "cb55ab48.d781c8", - "wires": [ - [ - "151d93fd.7167ec" - ] - ] - }, - { - "id": "fb4c025e.b4687", - "type": "set", - "name": "set domain A network-id", - "xml": "\n\n", - "comments": "", - "x": 4254, - "y": 442, - "z": "cb55ab48.d781c8", - "wires": [] - }, - { - "id": "45ebcf03.0e118", - "type": "block", - "name": "block : atomic", - "xml": "", - "atomic": "true", - "outputs": 1, - "x": 4017, - "y": 321, - "z": "cb55ab48.d781c8", - "wires": [ - [ - "3a58b291.1cf89e", - "6baf1c09.23f524" - ] - ] - }, - { - "id": "2b826247.b8392e", - "type": "get-resource", - "name": "get-resource src network-resource", - "xml": "\n\n\n", - "comments": "", - "outputs": 1, - "x": 4262, - "y": 523, - "z": "cb55ab48.d781c8", - "wires": [ - [ - "f37dd233.a3308" - ] - ] - }, - { - "id": "f37dd233.a3308", - "type": "success", - "name": "success", - "xml": "\n", - "comments": "", - "outputs": 1, - "x": 4494.5, - "y": 519, - "z": "cb55ab48.d781c8", - "wires": [ - [ - "5f1b14c5.d2a03c" - ] - ] - }, - { - "id": "5f1b14c5.d2a03c", - "type": "set", - "name": "set domain A network-id, topo-id, client-id, etc", - "xml": "\n\n\n\n\n\n\n\n", - "comments": "", - "x": 4736, - "y": 513, - "z": "cb55ab48.d781c8", - "wires": [] - }, - { - "id": "5702d427.f65a4c", - "type": "get-resource", - "name": "get-resource dst tp", - "xml": "\n\n\n", - "comments": "", - "outputs": 1, - "x": 2269, - "y": 851, - "z": "cb55ab48.d781c8", - "wires": [ - [ - "a50293a4.5e79e", - "b4058651.f77518", - "b61d9ed.988616" - ] - ] - }, - { - "id": "a50293a4.5e79e", - "type": "success", - "name": "success", - "xml": "\n", - "comments": "", - "outputs": 1, - "x": 2502.5, - "y": 812, - "z": "cb55ab48.d781c8", - "wires": [ - [ - "46502cec.4be0b4", - "a897aaea.70dd38" - ] - ] - }, - { - "id": "b4058651.f77518", - "type": "not-found", - "name": "not-found", - "xml": "\n", - "comments": "", - "outputs": 1, - "x": 2499.5, - "y": 870, - "z": "cb55ab48.d781c8", - "wires": [ - [ - "da3111af.853e5" - ] - ] - }, - { - "id": "b61d9ed.988616", - "type": "other", - "name": "other", - "xml": "\n", - "comments": "", - "outputs": 1, - "x": 2502.5, - "y": 922, - "z": "cb55ab48.d781c8", - "wires": [ - [ - "c09ee4e6.15ed68" - ] - ] - }, - { - "id": "c09ee4e6.15ed68", - "type": "returnFailure", - "name": "return failure", - "xml": "\n\t\n\t\n \n\t\n\t\n \n\n\n", - "comments": "", - "outputs": 1, - "x": 2693, - "y": 814, - "z": "cb55ab48.d781c8", - "wires": [ - [ - "b6f4d1fe.0b8da", - "46d13a0d.575974", - "94eeb806.b26748" - ] - ] - }, - { - "id": "46502cec.4be0b4", - "type": "set", - "name": "set tmp.dst-pnf-name", - "xml": "\n\n", - "comments": "", - "x": 2703, - "y": 759, - "z": "cb55ab48.d781c8", - "wires": [] - }, - { - "id": "94eeb806.b26748", - "type": "other", - "name": "other", - "xml": "\n", - "comments": "", - "outputs": 1, - "x": 2973.5, - "y": 879, - "z": "cb55ab48.d781c8", - "wires": [ - [ - "efc946ae.7bf158" - ] - ] - }, - { - "id": "46d13a0d.575974", - "type": "not-found", - "name": "not-found", - "xml": "\n", - "comments": "", - "outputs": 1, - "x": 2968.5, - "y": 822, - "z": "cb55ab48.d781c8", - "wires": [ - [ - "feb7d1d7.3486e" - ] - ] - }, - { - "id": "b6f4d1fe.0b8da", - "type": "success", - "name": "success", - "xml": "\n", - "comments": "", - "outputs": 1, - "x": 2976.5, - "y": 767, - "z": "cb55ab48.d781c8", - "wires": [ - [ - "100cc1d.c89dc3e" - ] - ] - }, - { - "id": "feb7d1d7.3486e", - "type": "returnFailure", - "name": "return failure", - "xml": "\n\t\n\t\n \n\t\n\t\n \n", - "comments": "", - "outputs": 1, - "x": 3335.882568359375, - "y": 764.6597290039062, - "z": "cb55ab48.d781c8", - "wires": [ - [ - "c77ddef5.18c3e" - ] - ] - }, - { - "id": "c77ddef5.18c3e", - "type": "switchNode", - "name": "switch related-to", - "xml": "\n", - "comments": "", - "outputs": 1, - "x": 3561.882568359375, - "y": 764.6597290039062, - "z": "cb55ab48.d781c8", - "wires": [ - [ - "3576c9a1.155776", - "131550c4.86635f" - ] - ] - }, - { - "id": "b6c39e63.6b538", - "type": "set", - "name": "set domain B node-id and tpn", - "xml": "\n\n\n", - "comments": "", - "x": 3380, - "y": 675, - "z": "cb55ab48.d781c8", - "wires": [] - }, - { - "id": "3f07ba63.1a2cc6", - "type": "block", - "name": "block : atomic", - "xml": "", - "atomic": "true", - "outputs": 1, - "x": 3973, - "y": 878, - "z": "cb55ab48.d781c8", - "wires": [ - [ - "68ee333a.5e149c", - "57b260c0.16164" - ] - ] - }, - { - "id": "3576c9a1.155776", - "type": "outcome", - "name": "tunnel-termination-point", - "xml": "\n", - "comments": "", - "outputs": 1, - "x": 3769.16845703125, - "y": 691.4815063476562, - "z": "cb55ab48.d781c8", - "wires": [ - [ - "63e95b18.c47c14" - ] - ] - }, - { - "id": "131550c4.86635f", - "type": "outcome", - "name": "network-resource", - "xml": "\n", - "comments": "", - "outputs": 1, - "x": 3760, - "y": 877, - "z": "cb55ab48.d781c8", - "wires": [ - [ - "3f07ba63.1a2cc6" - ] - ] - }, - { - "id": "63e95b18.c47c14", - "type": "block", - "name": "block : atomic", - "xml": "", - "atomic": "true", - "outputs": 1, - "x": 3971, - "y": 687, - "z": "cb55ab48.d781c8", - "wires": [ - [ - "e883466f.992618", - "f5edbf24.92d52" - ] - ] - }, - { - "id": "e883466f.992618", - "type": "set", - "name": "set domain B node ttp-id", - "xml": "\n\n", - "comments": "", - "x": 4188, - "y": 628, - "z": "cb55ab48.d781c8", - "wires": [] - }, - { - "id": "f5edbf24.92d52", - "type": "get-resource", - "name": "get-resource dst TTP", - "xml": "\n\n\n", - "comments": "", - "outputs": 1, - "x": 4177, - "y": 699, - "z": "cb55ab48.d781c8", - "wires": [ - [ - "70320551.17869c" - ] - ] - }, - { - "id": "70320551.17869c", - "type": "success", - "name": "success", - "xml": "\n", - "comments": "", - "outputs": 1, - "x": 4368.5, - "y": 696, - "z": "cb55ab48.d781c8", - "wires": [ - [ - "78931a0a.3bac14" - ] - ] - }, - { - "id": "78931a0a.3bac14", - "type": "set", - "name": "set domain B node ttp-id", - "xml": "\n\n", - "comments": "", - "x": 4581, - "y": 695, - "z": "cb55ab48.d781c8", - "wires": [] - }, - { - "id": "68ee333a.5e149c", - "type": "set", - "name": "set domain B network-id", - "xml": "\n\n", - "comments": "", - "x": 4208, - "y": 808, - "z": "cb55ab48.d781c8", - "wires": [] - }, - { - "id": "57b260c0.16164", - "type": "get-resource", - "name": "get-resource dst network-resource", - "xml": "\n\n\n", - "comments": "", - "outputs": 1, - "x": 4216, - "y": 889, - "z": "cb55ab48.d781c8", - "wires": [ - [ - "acb8778c.80c2b8" - ] - ] - }, - { - "id": "acb8778c.80c2b8", - "type": "success", - "name": "success", - "xml": "\n", - "comments": "", - "outputs": 1, - "x": 4448.5, - "y": 885, - "z": "cb55ab48.d781c8", - "wires": [ - [ - "24fd155e.59dcba" - ] - ] - }, - { - "id": "24fd155e.59dcba", - "type": "set", - "name": "set domain B network-id, topo-id, client-id, etc", - "xml": "\n\n\n\n\n\n\n\n", - "comments": "", - "x": 4690, - "y": 879, - "z": "cb55ab48.d781c8", - "wires": [] - } +[ + { + "id": "aa75113b.2c42b8", + "type": "dgstart", + "name": "DGSTART", + "outputs": 1, + "x": 136, + "y": 78, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "ab15dc15.738968" + ] + ] + }, + { + "id": "ab15dc15.738968", + "type": "service-logic", + "name": "GENERIC-RESOURCE-API ${project.version}", + "module": "GENERIC-RESOURCE-API", + "version": "${project.version}", + "comments": "", + "xml": "", + "outputs": 1, + "x": 261, + "y": 404.00001525878906, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "a46085e4.dea2f" + ] + ] + }, + { + "id": "a46085e4.dea2f", + "type": "method", + "name": "sotn-get-otn-tunnel-path-from-oof", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 325.0001220703125, + "y": 497, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "7d5a0cd3.c6dfbc" + ] + ] + }, + { + "id": "f51f5245.de05e8", + "type": "execute", + "name": "execute RestApiCallNode getPath from OOF", + "xml": "\n\n\n\n\n\n\n\n\n\n\n\n", + "comments": "", + "outputs": 1, + "x": 807.9730834960938, + "y": 155.99600219726562, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "8059dde9.1ce2e", + "dd740bdc.617d78" + ] + ] + }, + { + "id": "8059dde9.1ce2e", + "type": "success", + "name": "success", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 1047.9732246398926, + "y": 179.9959716796875, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "35b68c0d.85ca94" + ] + ] + }, + { + "id": "6c823726.8cfc2", + "type": "returnFailure", + "name": "return failure", + "xml": "\n\t\n\t\n \n", + "comments": "", + "x": 1186.973258972168, + "y": 128.99606323242188, + "z": "5b68e0d.bd97b2", + "wires": [] + }, + { + "id": "dd740bdc.617d78", + "type": "failure", + "name": "failure", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 1046.9730110168457, + "y": 128.99606227874756, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "6c823726.8cfc2" + ] + ] + }, + { + "id": "1cad6ca3.0c0a23", + "type": "comment", + "name": "OTN tunnel path computation", + "info": "TODO: check input parameters -- they should be\nthe source and destination of ETH node+tp.", + "comments": "", + "x": 779.4768829345703, + "y": 112.00000190734863, + "z": "5b68e0d.bd97b2", + "wires": [] + }, + { + "id": "500e653c.02a91c", + "type": "for", + "name": "for vidx..otn-oof.solutions_length[]", + "xml": "", + "comments": "", + "outputs": 1, + "x": 798.972900390625, + "y": 465.2457275390625, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "6dab679f.e9004" + ] + ] + }, + { + "id": "df52b38a.7717c", + "type": "comment", + "name": "Loop through OTN links", + "info": "", + "comments": "", + "x": 882.4732055664062, + "y": 544.74609375, + "z": "5b68e0d.bd97b2", + "wires": [] + }, + { + "id": "6dab679f.e9004", + "type": "block", + "name": "block : atomic", + "xml": "", + "atomic": "true", + "outputs": 1, + "x": 903.5001220703125, + "y": 656.2864990234375, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "58b38e8f.68cb58", + "31a7d8e8.5f496" + ] + ] + }, + { + "id": "58b38e8f.68cb58", + "type": "get-resource", + "name": "get-resource cross-link", + "xml": "\n\n \n\n\n", + "comments": "", + "outputs": 1, + "x": 1170.5001220703125, + "y": 576.2864685058594, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "a7dfe4ca.7050a8", + "147899e8.194c7e", + "bd646a50.9ca6d" + ] + ] + }, + { + "id": "bd646a50.9ca6d", + "type": "success", + "name": "success", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 1362.0001220703125, + "y": 521.2864685058594, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "7d949923.feaea8" + ] + ] + }, + { + "id": "a7dfe4ca.7050a8", + "type": "not-found", + "name": "not-found", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 1389.0001220703125, + "y": 756.2864990234375, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "6604b8e.b3db548" + ] + ] + }, + { + "id": "147899e8.194c7e", + "type": "other", + "name": "other", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 1383.0001220703125, + "y": 806.2864990234375, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "61e58c1.1c151f4" + ] + ] + }, + { + "id": "6604b8e.b3db548", + "type": "returnFailure", + "name": "return failure", + "xml": "\n\t\n\t\n \n\t\n\t\n \n\n\n\n\n\n\n", + "comments": "", + "x": 2362.5001220703125, + "y": 440.2864685058594, + "z": "5b68e0d.bd97b2", + "wires": [] + }, + { + "id": "a01c1aa6.b32a", + "type": "comment", + "name": "get cross-domain-link information", + "info": "", + "comments": "", + "x": 1171.5001220703125, + "y": 537.2864685058594, + "z": "5b68e0d.bd97b2", + "wires": [] + }, + { + "id": "31a7d8e8.5f496", + "type": "set", + "name": "set otn-oof.link-name", + "xml": "\n", + "comments": "", + "x": 1153.0001220703125, + "y": 486.2864685058594, + "z": "5b68e0d.bd97b2", + "wires": [] + }, + { + "id": "35b68c0d.85ca94", + "type": "block", + "name": "block", + "xml": "\n", + "atomic": "false", + "comments": "", + "outputs": 1, + "x": 1193.0002708435059, + "y": 177.74145698547363, + "z": "5b68e0d.bd97b2", + "wires": [ + [] + ] + }, + { + "id": "7d5a0cd3.c6dfbc", + "type": "block", + "name": "block : atomic", + "xml": "", + "atomic": "true", + "outputs": 1, + "x": 565.9688835144043, + "y": 423.74163722991943, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "500e653c.02a91c", + "f51f5245.de05e8" + ] + ] + }, + { + "id": "40299798.13bc", + "type": "switchNode", + "name": "test cross-domain-link", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 1677.5001220703125, + "y": 521, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "53a2c424.a12b74" + ] + ] + }, + { + "id": "53a2c424.a12b74", + "type": "outcome", + "name": "outcome cross-domain", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 1913.5001220703125, + "y": 522, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "7c9bf405.132f7c" + ] + ] + }, + { + "id": "dd179bba.27e578", + "type": "break", + "name": "break", + "xml": "\n", + "comments": "", + "x": 2198.5001220703125, + "y": 999, + "z": "5b68e0d.bd97b2", + "wires": [] + }, + { + "id": "7c9bf405.132f7c", + "type": "block", + "name": "block : atomic", + "xml": "", + "atomic": "true", + "outputs": 1, + "x": 2116.5001220703125, + "y": 523, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "dd179bba.27e578", + "3a661a62.460126", + "a736e107.ab857", + "51dd454b.e64094" + ] + ] + }, + { + "id": "b97c4b80.2182d", + "type": "comment", + "name": "setup variables", + "info": "", + "comments": "", + "x": 2330.5001220703125, + "y": 379, + "z": "5b68e0d.bd97b2", + "wires": [] + }, + { + "id": "a736e107.ab857", + "type": "get-resource", + "name": "get-resource src tp", + "xml": "\n \n \n\n\n", + "comments": "", + "outputs": 1, + "x": 2359.5001220703125, + "y": 529, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "30082dde.5085da", + "a603f43.0659d88", + "ed057305.d13bc" + ] + ] + }, + { + "id": "30082dde.5085da", + "type": "success", + "name": "success", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 2593.0001220703125, + "y": 490, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "b104de88.84b78" + ] + ] + }, + { + "id": "a603f43.0659d88", + "type": "not-found", + "name": "not-found", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 2590.0001220703125, + "y": 548, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "8496f5b4.9321e8" + ] + ] + }, + { + "id": "ed057305.d13bc", + "type": "other", + "name": "other", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 2593.0001220703125, + "y": 600, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "1dbdbb79.fd0ced" + ] + ] + }, + { + "id": "8496f5b4.9321e8", + "type": "returnFailure", + "name": "return failure", + "xml": "\n\t\n\t\n \n\t\n\t\n \n", + "comments": "", + "x": 2872.5, + "y": 445, + "z": "5b68e0d.bd97b2", + "wires": [] + }, + { + "id": "a5379b59.d56668", + "type": "get-resource", + "name": "get-resource src pnf", + "xml": "\n \n \n\n\n", + "comments": "", + "outputs": 1, + "x": 2871.5, + "y": 488, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "fc1e5cdb.f87da8", + "c1dbffa0.3a6ef8", + "e17cdd49.4fcf08" + ] + ] + }, + { + "id": "fc1e5cdb.f87da8", + "type": "success", + "name": "success", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 3067.0001220703125, + "y": 445, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "372db61f.e21a7a" + ] + ] + }, + { + "id": "c1dbffa0.3a6ef8", + "type": "not-found", + "name": "not-found", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 3059.0001220703125, + "y": 500, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "8f21b6ce.dd76a" + ] + ] + }, + { + "id": "e17cdd49.4fcf08", + "type": "other", + "name": "other", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 3064.0001220703125, + "y": 557, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "e804e037.dd4f" + ] + ] + }, + { + "id": "8f21b6ce.dd76a", + "type": "returnFailure", + "name": "return failure", + "xml": "\n\t\n\t\n \n\t\n\t\n \n", + "comments": "", + "x": 4278.5001220703125, + "y": 306, + "z": "5b68e0d.bd97b2", + "wires": [] + }, + { + "id": "1b6b3639.216dba", + "type": "get-resource", + "name": "get-resource src TTP", + "xml": "\n\n\n", + "comments": "", + "outputs": 1, + "x": 4267.5001220703125, + "y": 377, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "ac3848e1.acfdf8" + ] + ] + }, + { + "id": "ac3848e1.acfdf8", + "type": "success", + "name": "success", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 4459.0001220703125, + "y": 374, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "ebf0e7da.b09cb" + ] + ] + }, + { + "id": "ebf0e7da.b09cb", + "type": "set", + "name": "set domain A node ttp-id", + "xml": "\n\n", + "comments": "", + "x": 4671.5001220703125, + "y": 373, + "z": "5b68e0d.bd97b2", + "wires": [] + }, + { + "id": "ae40696e.4ae89", + "type": "block", + "name": "block : atomic", + "xml": "", + "atomic": "true", + "outputs": 1, + "x": 4063.5001220703125, + "y": 556, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "a860374.60c54c8", + "f3ee54c1.b5d84" + ] + ] + }, + { + "id": "577de1c9.7d7528", + "type": "outcome", + "name": "tunnel-termination-point", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 3859.6685791015625, + "y": 369.48150634765625, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "2ec73e0f.7a316a" + ] + ] + }, + { + "id": "3f827e10.2f07d2", + "type": "for", + "name": "for each relationship", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 3426.3826904296875, + "y": 442.65972900390625, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "7df05538.ae1e24" + ] + ] + }, + { + "id": "7df05538.ae1e24", + "type": "switchNode", + "name": "switch related-to", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 3652.3826904296875, + "y": 442.65972900390625, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "577de1c9.7d7528", + "1569d56e.fb5f8b" + ] + ] + }, + { + "id": "372db61f.e21a7a", + "type": "block", + "name": "block", + "xml": "\n", + "atomic": "false", + "comments": "", + "outputs": 1, + "x": 3211.3824462890625, + "y": 442.6556701660156, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "3f827e10.2f07d2", + "9cbdf6a0.b391f" + ] + ] + }, + { + "id": "9cbdf6a0.b391f", + "type": "set", + "name": "set domain A node-id and tpn", + "xml": "\n\n\n", + "comments": "", + "x": 3470.5001220703125, + "y": 353, + "z": "5b68e0d.bd97b2", + "wires": [] + }, + { + "id": "1569d56e.fb5f8b", + "type": "outcome", + "name": "network-resource", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 3850.5001220703125, + "y": 555, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "ae40696e.4ae89" + ] + ] + }, + { + "id": "a860374.60c54c8", + "type": "set", + "name": "set domain A network-id", + "xml": "\n\n", + "comments": "", + "x": 4298.5001220703125, + "y": 486, + "z": "5b68e0d.bd97b2", + "wires": [] + }, + { + "id": "2ec73e0f.7a316a", + "type": "block", + "name": "block : atomic", + "xml": "", + "atomic": "true", + "outputs": 1, + "x": 4061.5001220703125, + "y": 365, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "e0784723.78ca28", + "1b6b3639.216dba" + ] + ] + }, + { + "id": "f3ee54c1.b5d84", + "type": "get-resource", + "name": "get-resource src network-resource", + "xml": "\n\n\n", + "comments": "", + "outputs": 1, + "x": 4306.5001220703125, + "y": 567, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "9ea34049.8c12a8" + ] + ] + }, + { + "id": "9ea34049.8c12a8", + "type": "success", + "name": "success", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 4539.0001220703125, + "y": 563, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "c512a46.74a5bd8" + ] + ] + }, + { + "id": "c512a46.74a5bd8", + "type": "set", + "name": "set domain A network-id, topo-id, client-id, etc", + "xml": "\n\n\n\n\n\n\n\n", + "comments": "", + "x": 4780.5001220703125, + "y": 557, + "z": "5b68e0d.bd97b2", + "wires": [] + }, + { + "id": "51dd454b.e64094", + "type": "get-resource", + "name": "get-resource dst tp", + "xml": "\n \n \n\n\n", + "comments": "", + "outputs": 1, + "x": 2313.5001220703125, + "y": 895, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "a793d2c3.cd625", + "8024d4d5.2b62d8", + "765b5b90.f1ecd4" + ] + ] + }, + { + "id": "a793d2c3.cd625", + "type": "success", + "name": "success", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 2547.0001220703125, + "y": 856, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "75eb9694.598e48" + ] + ] + }, + { + "id": "8024d4d5.2b62d8", + "type": "not-found", + "name": "not-found", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 2544.0001220703125, + "y": 914, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "612d2397.585244" + ] + ] + }, + { + "id": "765b5b90.f1ecd4", + "type": "other", + "name": "other", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 2547.0001220703125, + "y": 966, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "a08bb92f.3f7318" + ] + ] + }, + { + "id": "a08bb92f.3f7318", + "type": "returnFailure", + "name": "return failure", + "xml": "\n\t\n\t\n \n\t\n\t\n \n\n \n", + "comments": "", + "outputs": 1, + "x": 2825.5, + "y": 859, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "3389e479.7caf4c", + "a22904b1.12c91", + "3f4df7a2.550db8" + ] + ] + }, + { + "id": "fbc3aa3e.92a1d", + "type": "set", + "name": "set tmp.dst-pnf-name", + "xml": "\n\n", + "comments": "", + "x": 2830.5, + "y": 807, + "z": "5b68e0d.bd97b2", + "wires": [] + }, + { + "id": "3f4df7a2.550db8", + "type": "other", + "name": "other", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 3018.0001220703125, + "y": 923, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "a7bbc350.7f29" + ] + ] + }, + { + "id": "a22904b1.12c91", + "type": "not-found", + "name": "not-found", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 3013.0001220703125, + "y": 866, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "a788922c.a2883" + ] + ] + }, + { + "id": "3389e479.7caf4c", + "type": "success", + "name": "success", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 3021.0001220703125, + "y": 811, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "b1d95d9.2f8af2" + ] + ] + }, + { + "id": "a788922c.a2883", + "type": "returnFailure", + "name": "return failure", + "xml": "\n\t\n\t\n \n\t\n\t\n \n", + "comments": "", + "outputs": 1, + "x": 3380.3826904296875, + "y": 808.6597290039062, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "ba0c1a8c.88af28" + ] + ] + }, + { + "id": "ba0c1a8c.88af28", + "type": "switchNode", + "name": "switch related-to", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 3606.3826904296875, + "y": 808.6597290039062, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "799147c0.a8a33", + "f903181b.00f37" + ] + ] + }, + { + "id": "861cb0b.d019fd", + "type": "set", + "name": "set domain B node-id and tpn", + "xml": "\n\n\n", + "comments": "", + "x": 3424.5001220703125, + "y": 719, + "z": "5b68e0d.bd97b2", + "wires": [] + }, + { + "id": "802f4f2.687563", + "type": "block", + "name": "block : atomic", + "xml": "", + "atomic": "true", + "outputs": 1, + "x": 4017.5001220703125, + "y": 922, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "d4d32344.490fe8", + "1ab02c14.0e8e64" + ] + ] + }, + { + "id": "799147c0.a8a33", + "type": "outcome", + "name": "tunnel-termination-point", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 3813.6685791015625, + "y": 735.4815063476562, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "9e4db8b6.012fb" + ] + ] + }, + { + "id": "f903181b.00f37", + "type": "outcome", + "name": "network-resource", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 3804.5001220703125, + "y": 921, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "802f4f2.687563" + ] + ] + }, + { + "id": "9e4db8b6.012fb", + "type": "block", + "name": "block : atomic", + "xml": "", + "atomic": "true", + "outputs": 1, + "x": 4015.5001220703125, + "y": 731, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "99609484.86254", + "f094147a.c54bb8" + ] + ] + }, + { + "id": "99609484.86254", + "type": "set", + "name": "set domain B node ttp-id", + "xml": "\n\n", + "comments": "", + "x": 4232.5001220703125, + "y": 672, + "z": "5b68e0d.bd97b2", + "wires": [] + }, + { + "id": "f094147a.c54bb8", + "type": "get-resource", + "name": "get-resource dst TTP", + "xml": "\n\n\n", + "comments": "", + "outputs": 1, + "x": 4221.5001220703125, + "y": 743, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "96cf01de.ff5148" + ] + ] + }, + { + "id": "96cf01de.ff5148", + "type": "success", + "name": "success", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 4413.0001220703125, + "y": 740, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "5bd66639.66f16" + ] + ] + }, + { + "id": "5bd66639.66f16", + "type": "set", + "name": "set domain B node ttp-id", + "xml": "\n\n", + "comments": "", + "x": 4625.5001220703125, + "y": 739, + "z": "5b68e0d.bd97b2", + "wires": [] + }, + { + "id": "d4d32344.490fe8", + "type": "set", + "name": "set domain B network-id", + "xml": "\n\n", + "comments": "", + "x": 4252.5001220703125, + "y": 852, + "z": "5b68e0d.bd97b2", + "wires": [] + }, + { + "id": "1ab02c14.0e8e64", + "type": "get-resource", + "name": "get-resource dst network-resource", + "xml": "\n\n\n", + "comments": "", + "outputs": 1, + "x": 4260.5001220703125, + "y": 933, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "e204fe22.e747c8" + ] + ] + }, + { + "id": "e204fe22.e747c8", + "type": "success", + "name": "success", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 4493.0001220703125, + "y": 929, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "c2250516.6a88f" + ] + ] + }, + { + "id": "c2250516.6a88f", + "type": "set", + "name": "set domain B network-id, topo-id, client-id, etc", + "xml": "\n\n\n\n\n\n\n\n", + "comments": "", + "x": 4734.5001220703125, + "y": 923, + "z": "5b68e0d.bd97b2", + "wires": [] + }, + { + "id": "b104de88.84b78", + "type": "block", + "name": "block", + "xml": "\n", + "atomic": "false", + "comments": "", + "outputs": 1, + "x": 2682, + "y": 366, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "a5379b59.d56668" + ] + ] + }, + { + "id": "75eb9694.598e48", + "type": "block", + "name": "block", + "xml": "\n", + "atomic": "false", + "comments": "", + "outputs": 1, + "x": 2637, + "y": 744, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "670f7157.4b83f" + ] + ] + }, + { + "id": "c0faec82.816fb8", + "type": "switchNode", + "name": "test $vidx", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 1622, + "y": 602, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "b7d58fe7.9f74b8", + "dc6562ba.9ee77" + ] + ] + }, + { + "id": "b7d58fe7.9f74b8", + "type": "outcome", + "name": "outcome first", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 1787, + "y": 580, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "197e1ba0.21ad04" + ] + ] + }, + { + "id": "dc6562ba.9ee77", + "type": "outcome", + "name": "outcome last", + "xml": "\n", + "comments": "", + "outputs": 1, + "x": 1786, + "y": 641, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "1e901248.1aaca6" + ] + ] + }, + { + "id": "197e1ba0.21ad04", + "type": "set", + "name": "set oofsolutions-first info", + "xml": "\n\n\n\n\n\n", + "comments": "", + "x": 1980, + "y": 582, + "z": "5b68e0d.bd97b2", + "wires": [] + }, + { + "id": "1e901248.1aaca6", + "type": "set", + "name": "set oofsolutions last info", + "xml": "\n\n\n", + "comments": "", + "x": 1979, + "y": 640, + "z": "5b68e0d.bd97b2", + "wires": [] + }, + { + "id": "7d949923.feaea8", + "type": "block", + "name": "block", + "xml": "\n", + "atomic": "false", + "comments": "", + "outputs": 1, + "x": 1496, + "y": 523, + "z": "5b68e0d.bd97b2", + "wires": [ + [ + "40299798.13bc", + "c0faec82.816fb8" + ] + ] + } ] \ No newline at end of file diff --git a/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-get-vf-module-uni-param.json b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-get-vf-module-uni-param.json index 811602d5..119b8fda 100644 --- a/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-get-vf-module-uni-param.json +++ b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-get-vf-module-uni-param.json @@ -1,36 +1,36 @@ [ { - "id": "92076785.102998", + "id": "9fd2e6b.eda7a18", "type": "for", "name": "for each sotn-get-request-input-param", "xml": "\n", "comments": "", "outputs": 1, - "x": 257, - "y": 366.6666383743286, - "z": "12466ca0.33d983", + "x": 323, + "y": 423.6666383743286, + "z": "f05faea.fedcdd", "wires": [ [ - "1481334b.aa109d" + "61a5fd01.4ba864" ] ] }, { - "id": "d17e9aae.69c2d8", + "id": "78b38914.249678", "type": "dgstart", "name": "DGSTART", "outputs": 1, - "x": 89.3332290649414, - "y": 29, - "z": "12466ca0.33d983", + "x": 155.3332290649414, + "y": 86, + "z": "f05faea.fedcdd", "wires": [ [ - "28ba91d2.47447e" + "2dca576b.96f79" ] ] }, { - "id": "28ba91d2.47447e", + "id": "2dca576b.96f79", "type": "service-logic", "name": "GENERIC-RESOURCE-API ${project.version}", "module": "GENERIC-RESOURCE-API", @@ -38,206 +38,206 @@ "comments": "", "xml": "", "outputs": 1, - "x": 234.33323287963867, - "y": 110.0000171661377, - "z": "12466ca0.33d983", + "x": 300.3332328796387, + "y": 167.0000171661377, + "z": "f05faea.fedcdd", "wires": [ [ - "bfc0526a.9023d" + "be702e8f.3597d" ] ] }, { - "id": "bfc0526a.9023d", + "id": "be702e8f.3597d", "type": "method", "name": "sotn-get-vf-module-uni-param", "xml": "\n", "comments": "", "outputs": 1, - "x": 222.3333511352539, - "y": 198, - "z": "12466ca0.33d983", + "x": 288.3333511352539, + "y": 255, + "z": "f05faea.fedcdd", "wires": [ [ - "b8fc2441.d8f338" + "66dbd2c2.e849f4" ] ] }, { - "id": "b8fc2441.d8f338", + "id": "66dbd2c2.e849f4", "type": "block", "name": "block : atomic", "xml": "\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 229.33324432373047, - "y": 284.0000581741333, - "z": "12466ca0.33d983", + "x": 295.33324432373047, + "y": 341.0000581741333, + "z": "f05faea.fedcdd", "wires": [ [ - "92076785.102998" + "9fd2e6b.eda7a18" ] ] }, { - "id": "1481334b.aa109d", + "id": "61a5fd01.4ba864", "type": "block", "name": "block", "xml": "\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 513.2326469421387, - "y": 369.0103905200958, - "z": "12466ca0.33d983", + "x": 579.2326469421387, + "y": 426.0103905200958, + "z": "f05faea.fedcdd", "wires": [ [ - "397c4a4d.4ed016", - "2bdd888b.6d1ef8", - "595a4395.a6883c", - "ea4e21ab.628e5" + "5dbf7bde.42db34", + "74aefc5a.45af6c", + "7bedb246.58597c", + "a67a2d36.3001e" ] ] }, { - "id": "397c4a4d.4ed016", + "id": "5dbf7bde.42db34", "type": "returnSuccess", "name": "return success", "xml": "\n\n\n\n", "comments": "", - "x": 733.7332763671875, - "y": 478.0107421875, - "z": "12466ca0.33d983", + "x": 799.7332763671875, + "y": 535.0107421875, + "z": "f05faea.fedcdd", "wires": [] }, { - "id": "595a4395.a6883c", + "id": "7bedb246.58597c", "type": "switchNode", - "name": "switch tpId", - "xml": "\n", + "name": "switch tp-id", + "xml": "\n", "comments": "", "outputs": 1, - "x": 735.7326431274414, - "y": 296.01042914390564, - "z": "12466ca0.33d983", + "x": 801.7326431274414, + "y": 353.01042914390564, + "z": "f05faea.fedcdd", "wires": [ [ - "7907fc56.fc4374" + "2c679a4f.e5d4f6" ] ] }, { - "id": "7907fc56.fc4374", + "id": "2c679a4f.e5d4f6", "type": "outcomeTrue", "name": "true", "xml": "\n", "comments": "", "outputs": 1, - "x": 910.7330360412598, - "y": 294.01051592826843, - "z": "12466ca0.33d983", + "x": 976.7330360412598, + "y": 351.01051592826843, + "z": "f05faea.fedcdd", "wires": [ [ - "6a4f5caf.0f6f14" + "8c700565.606b5" ] ] }, { - "id": "6a4f5caf.0f6f14", + "id": "8c700565.606b5", "type": "set", - "name": "set tpId", - "xml": "\n\n", + "name": "set tp-id", + "xml": "\n\n", "comments": "", - "x": 1085.7331199645996, - "y": 295.61056327819824, - "z": "12466ca0.33d983", + "x": 1151.7331199645996, + "y": 352.61056327819824, + "z": "f05faea.fedcdd", "wires": [] }, { - "id": "2bdd888b.6d1ef8", + "id": "74aefc5a.45af6c", "type": "switchNode", "name": "switch id", "xml": "\n", "comments": "", "outputs": 1, - "x": 719.7319984436035, - "y": 247.3970763683319, - "z": "12466ca0.33d983", + "x": 785.7319984436035, + "y": 304.3970763683319, + "z": "f05faea.fedcdd", "wires": [ [ - "7b22e7e.bf6e718" + "4134909c.9e2bb" ] ] }, { - "id": "7b22e7e.bf6e718", + "id": "4134909c.9e2bb", "type": "outcomeTrue", "name": "true", "xml": "\n", "comments": "", "outputs": 1, - "x": 911.7319221496582, - "y": 247.39708304405212, - "z": "12466ca0.33d983", + "x": 977.7319221496582, + "y": 304.3970830440521, + "z": "f05faea.fedcdd", "wires": [ [ - "ab2d859f.6acac8" + "9aa99334.9686f" ] ] }, { - "id": "ab2d859f.6acac8", + "id": "9aa99334.9686f", "type": "set", "name": "set id", "xml": "\n\n", "comments": "", - "x": 1055.7321891784668, - "y": 246.99721121788025, - "z": "12466ca0.33d983", + "x": 1121.7321891784668, + "y": 303.99721121788025, + "z": "f05faea.fedcdd", "wires": [] }, { - "id": "ea4e21ab.628e5", + "id": "a67a2d36.3001e", "type": "switchNode", "name": "switch cVLAN", "xml": "\n", "comments": "", "outputs": 1, - "x": 738, - "y": 374, - "z": "12466ca0.33d983", + "x": 804, + "y": 431, + "z": "f05faea.fedcdd", "wires": [ [ - "c123c0b4.3c868" + "acaffd98.694c98" ] ] }, { - "id": "c123c0b4.3c868", + "id": "acaffd98.694c98", "type": "outcomeTrue", "name": "true", "xml": "\n", "comments": "", "outputs": 1, - "x": 906, - "y": 371, - "z": "12466ca0.33d983", + "x": 972, + "y": 428, + "z": "f05faea.fedcdd", "wires": [ [ - "5bf6b706.8b8148" + "abb07b4b.b62dc8" ] ] }, { - "id": "5bf6b706.8b8148", + "id": "abb07b4b.b62dc8", "type": "set", "name": "set cVLAN", "xml": "\n\n", "comments": "", - "x": 1081.0000839233398, - "y": 372.6000473499298, - "z": "12466ca0.33d983", + "x": 1147.0000839233398, + "y": 429.6000473499298, + "z": "f05faea.fedcdd", "wires": [] } ] \ No newline at end of file diff --git a/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-activate.json b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-activate.json index dd1ba06d..95961a02 100644 --- a/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-activate.json +++ b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-activate.json @@ -1,20 +1,20 @@ [ { - "id": "f06d79a.4f13a08", + "id": "c0a79856.b8a9a8", "type": "dgstart", "name": "DGSTART", "outputs": 1, - "x": 120, - "y": 66, - "z": "62554968.e321b8", + "x": 129, + "y": 75, + "z": "498236f1.856f48", "wires": [ [ - "e698fb0d.22ccb" + "f23fb4.004e985" ] ] }, { - "id": "e698fb0d.22ccb", + "id": "f23fb4.004e985", "type": "service-logic", "name": "GENERIC-RESOURCE-API ${project.version}", "module": "GENERIC-RESOURCE-API", @@ -22,350 +22,346 @@ "comments": "", "xml": "", "outputs": 1, - "x": 251.2856903076172, - "y": 115.23810863494873, - "z": "62554968.e321b8", + "x": 260.2856903076172, + "y": 124.23810863494873, + "z": "498236f1.856f48", "wires": [ [ - "c77e5b12.74fa8" + "16bd01d7.cde55e" ] ] }, { - "id": "c77e5b12.74fa8", + "id": "16bd01d7.cde55e", "type": "method", "name": "method sotn-vf-operation-l2vpn-activate", "xml": "\n", "comments": "", "outputs": 1, - "x": 254.42861938476562, - "y": 200.00003242492676, - "z": "62554968.e321b8", + "x": 263.4286193847656, + "y": 209.00003242492676, + "z": "498236f1.856f48", "wires": [ [ - "dc8a4134.633b38" + "4bca7263.f9b50c" ] ] }, { - "id": "dc8a4134.633b38", + "id": "4bca7263.f9b50c", "type": "block", "name": "block : atomic", "xml": "", "atomic": "true", "outputs": 1, - "x": 622.2380447387695, - "y": 414.66666814964265, - "z": "62554968.e321b8", + "x": 631.2380447387695, + "y": 423.66666814964265, + "z": "498236f1.856f48", "wires": [ [ - "6485c0f8.91ce08", - "a02d1e2f.e50b18", - "c0d6a6a1.052f28", - "aff44c8.fd218b", - "cdefed21.97b52", - "ef33383b.0eb5c8", - "6bb0bfe6.f5358" + "89ba9e4f.322f08", + "b6b036c1.4e053", + "a1814ef6.4e6ba" ] ] }, { - "id": "6485c0f8.91ce08", + "id": "213a5120.a6687e", "type": "set", "name": "set vnf-level-oper-status to Active", "xml": "\n\n\n", "comments": "", - "x": 1037.3850173950195, - "y": 601.6705513000488, - "z": "62554968.e321b8", + "x": 1046.3850173950195, + "y": 610.6705513000488, + "z": "498236f1.856f48", "wires": [] }, { - "id": "a02d1e2f.e50b18", + "id": "89ba9e4f.322f08", "type": "returnSuccess", "name": "return success", "xml": "\n\n\n\n", "comments": "", - "x": 957.5717086791992, - "y": 727.5970888137817, - "z": "62554968.e321b8", + "x": 966.5717086791992, + "y": 736.5970888137817, + "z": "498236f1.856f48", "wires": [] }, { - "id": "c0d6a6a1.052f28", + "id": "b6b036c1.4e053", "type": "set", "name": "set vnf-index and vnf-object-path", - "xml": "\n\n", + "xml": "\n\n\n\n\n\n", "comments": "", - "x": 1043.571662902832, - "y": 549.5968055725098, - "z": "62554968.e321b8", + "x": 1052.571662902832, + "y": 558.5968055725098, + "z": "498236f1.856f48", "wires": [] }, { - "id": "aff44c8.fd218b", + "id": "951505a8.4ab128", "type": "switchNode", "name": "switch service-data.vnfs.vnf_length", "xml": "\n", "comments": "", "outputs": 1, - "x": 1052.0000610351562, - "y": 304.00000545661896, - "z": "62554968.e321b8", + "x": 1061.0000610351562, + "y": 313.00000545661896, + "z": "498236f1.856f48", "wires": [ [ - "c419b86f.420228", - "5e5514b0.5b9124", - "dab73261.53c13" + "298b7800.074bc", + "302f9230.c82bc6", + "3ee80cd1.702c9c" ] ] }, { - "id": "dab73261.53c13", + "id": "3ee80cd1.702c9c", "type": "outcome", "name": "0", "xml": "\n", "comments": "", "outputs": 1, - "x": 1310.9689559936523, - "y": 265.96876499336213, - "z": "62554968.e321b8", + "x": 1319.9689559936523, + "y": 274.96876499336213, + "z": "498236f1.856f48", "wires": [ [ - "ac6cfd44.a241c" + "bc487c7b.4684b8" ] ] }, { - "id": "ac6cfd44.a241c", + "id": "bc487c7b.4684b8", "type": "returnFailure", "name": "return failure", "xml": "\n\t\n\t\n \n", "comments": "", - "x": 1465.7778434753418, - "y": 284.88903352897614, - "z": "62554968.e321b8", + "x": 1474.7778434753418, + "y": 293.88903352897614, + "z": "498236f1.856f48", "wires": [] }, { - "id": "c419b86f.420228", + "id": "298b7800.074bc", "type": "other", "name": "Null", "xml": "\n", "comments": "", "outputs": 1, - "x": 1304.0000953674316, - "y": 305.00008651893586, - "z": "62554968.e321b8", + "x": 1313.0000953674316, + "y": 314.00008651893586, + "z": "498236f1.856f48", "wires": [ [ - "ac6cfd44.a241c" + "bc487c7b.4684b8" ] ] }, { - "id": "5e5514b0.5b9124", + "id": "302f9230.c82bc6", "type": "other", "name": "other", "xml": "\n", "comments": "", "outputs": 1, - "x": 1297.000503540039, - "y": 338.0000903336331, - "z": "62554968.e321b8", + "x": 1306.000503540039, + "y": 347.0000903336331, + "z": "498236f1.856f48", "wires": [ [ - "639a074f.493e98" + "3aa4324.564e84e" ] ] }, { - "id": "639a074f.493e98", + "id": "3aa4324.564e84e", "type": "block", "name": "block : atomic", "xml": "", "atomic": "true", "outputs": 1, - "x": 1444.2700462341309, - "y": 338.55473539512604, - "z": "62554968.e321b8", + "x": 1453.2700462341309, + "y": 347.55473539512604, + "z": "498236f1.856f48", "wires": [ [ - "6fa946fa.ca1978" + "ea8cd4e1.da014" ] ] }, { - "id": "6fa946fa.ca1978", + "id": "ea8cd4e1.da014", "type": "for", "name": "for vidx..service-data.vnfs.vnf_length[]", "xml": "\n", "comments": "", "outputs": 1, - "x": 1690.2861633300781, - "y": 345.4286558357999, - "z": "62554968.e321b8", + "x": 1699.2861633300781, + "y": 354.4286558357999, + "z": "498236f1.856f48", "wires": [ [ - "154eb41a.640b64" + "6be80779.f9067" ] ] }, { - "id": "154eb41a.640b64", + "id": "6be80779.f9067", "type": "block", "name": "block", "xml": "\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1909.6357955932617, - "y": 344.9687359062955, - "z": "62554968.e321b8", + "x": 1918.6357955932617, + "y": 353.9687359062955, + "z": "498236f1.856f48", "wires": [ [ - "330022d0.830a2e" + "e37eb61b.35117" ] ] }, { - "id": "330022d0.830a2e", + "id": "e37eb61b.35117", "type": "switchNode", "name": "switch vnfid found", - "xml": "\n\n", + "xml": "\n\n\n\n", "comments": "", "outputs": 1, - "x": 2063.7153930664062, - "y": 344.67881796043366, - "z": "62554968.e321b8", + "x": 2072.7153930664062, + "y": 353.67881796043366, + "z": "498236f1.856f48", "wires": [ [ - "fcbe4c85.417af" + "b5cfadba.1f4aa" ] ] }, { - "id": "fcbe4c85.417af", + "id": "b5cfadba.1f4aa", "type": "outcomeTrue", "name": "true", "xml": "\n", "comments": "", "outputs": 1, - "x": 2239.6675148010254, - "y": 344.57150003593415, - "z": "62554968.e321b8", + "x": 2248.6675148010254, + "y": 353.57150003593415, + "z": "498236f1.856f48", "wires": [ [ - "2fb9529b.c7be6e" + "bd36402c.584f38" ] ] }, { - "id": "2fb9529b.c7be6e", + "id": "bd36402c.584f38", "type": "set", "name": "set tmp.vidx and ctx.vnf-data", "xml": "\n\n\n", "comments": "", - "x": 2449.1998901367188, - "y": 346.3216001717374, - "z": "62554968.e321b8", + "x": 2458.1998901367188, + "y": 355.3216001717374, + "z": "498236f1.856f48", "wires": [] }, { - "id": "cdefed21.97b52", + "id": "a1814ef6.4e6ba", "type": "save", "name": "update AnAI - l2vpn.operational-status", "xml": "\n", "comments": "", "outputs": 1, - "x": 1063.0000228881836, - "y": 668.0103769302368, - "z": "62554968.e321b8", + "x": 1072.0000228881836, + "y": 677.0103769302368, + "z": "498236f1.856f48", "wires": [ [] ] }, { - "id": "ef33383b.0eb5c8", + "id": "fa4a7cef.4c643", "type": "set", "name": "copy input data to service data", "xml": "\n\n\n", "comments": "", - "x": 1042.0001373291016, - "y": 499.010338306427, - "z": "62554968.e321b8", + "x": 1051.0001373291016, + "y": 508.010338306427, + "z": "498236f1.856f48", "wires": [] }, { - "id": "6bb0bfe6.f5358", + "id": "d491e887.81b538", "type": "switchNode", "name": "switch vnf-level-oper-status", "xml": "\n", "comments": "", "outputs": 1, - "x": 1028.75, - "y": 404.00390815734863, - "z": "62554968.e321b8", + "x": 1037.75, + "y": 413.00390815734863, + "z": "498236f1.856f48", "wires": [ [ - "5c7bc43a.bb701c", - "b67194e3.094198" + "2e735695.8a522a", + "9667f59f.7676c8" ] ] }, { - "id": "5c7bc43a.bb701c", + "id": "2e735695.8a522a", "type": "outcome", "name": "outcome Created", "xml": "\n", "comments": "", "outputs": 1, - "x": 1274.583293914795, - "y": 405.1150059700012, - "z": "62554968.e321b8", + "x": 1283.583293914795, + "y": 414.1150059700012, + "z": "498236f1.856f48", "wires": [ [ - "914253cd.1c469" + "a29cc418.229998" ] ] }, { - "id": "b67194e3.094198", + "id": "9667f59f.7676c8", "type": "other", "name": "other", "xml": "\n", "comments": "", "outputs": 1, - "x": 1252.5833129882812, - "y": 455.115017414093, - "z": "62554968.e321b8", + "x": 1261.5833129882812, + "y": 464.115017414093, + "z": "498236f1.856f48", "wires": [ [ - "b6453bfb.a302f" + "aa583cbc.e62958" ] ] }, { - "id": "b6453bfb.a302f", + "id": "aa583cbc.e62958", "type": "returnFailure", "name": "return failure", "xml": "\n\t\n\t\n ", "comments": "", - "x": 1412.083080291748, - "y": 458.1150164604187, - "z": "62554968.e321b8", + "x": 1421.083080291748, + "y": 467.1150164604187, + "z": "498236f1.856f48", "wires": [] }, { - "id": "914253cd.1c469", + "id": "a29cc418.229998", "type": "block", "name": "block : atomic", "xml": "", "atomic": "true", "outputs": 1, - "x": 1484.8896675109863, - "y": 416.4401812553406, - "z": "62554968.e321b8", + "x": 1493.8896675109863, + "y": 425.4401812553406, + "z": "498236f1.856f48", "wires": [ [] ] diff --git a/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-create.json b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-create.json index 951a18f4..1f85f4c8 100644 --- a/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-create.json +++ b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-create.json @@ -1,20 +1,35 @@ [ { - "id": "ed294889.e18cd8", - "type": "dgstart", - "name": "DGSTART", + "id": "7b71bd92.fd2814", + "type": "block", + "name": "block : atomic", + "xml": "\n", + "atomic": "false", + "comments": "", "outputs": 1, - "x": 117, - "y": 57, - "z": "a8db409e.810378", + "x": 459, + "y": 325.0000009536743, + "z": "8baeaca1.28233", "wires": [ [ - "d573cd56.a0362" + "cd94e5aa.ecbb7", + "2023e2ef.c2aaae", + "b67caacf.835018", + "dc45507c.2c758", + "404d2254.b54cb4", + "f8f7ecd5.33f1b", + "192e11b1.7d71e6", + "a92fbbfb.a65698", + "19fc51d8.0cda46", + "14342bec.b0bb44", + "eaf312a9.dac698", + "657f9098.60c5e8", + "d49f5116.ef68d8" ] ] }, { - "id": "d573cd56.a0362", + "id": "9fc16420.cc4ed8", "type": "service-logic", "name": "GENERIC-RESOURCE-API ${project.version}", "module": "GENERIC-RESOURCE-API", @@ -22,466 +37,511 @@ "comments": "", "xml": "", "outputs": 1, - "x": 248.2856903076172, - "y": 106.23810863494873, - "z": "a8db409e.810378", + "x": 301.00001525878906, + "y": 108.99999237060547, + "z": "8baeaca1.28233", "wires": [ [ - "ab294e07.a9e7f" + "5abbcf9c.c62d48" ] ] }, { - "id": "ab294e07.a9e7f", + "id": "5abbcf9c.c62d48", "type": "method", - "name": "method sotn-vf-operation-l2vpn-create", + "name": "sotn-vf-operation-l2vpn-create", "xml": "\n", "comments": "", "outputs": 1, - "x": 251.42861938476562, - "y": 191.00003242492676, - "z": "a8db409e.810378", + "x": 300.00001525878906, + "y": 208.99999237060547, + "z": "8baeaca1.28233", "wires": [ [ - "3b2ee2be.0d5776" + "7b71bd92.fd2814" ] ] }, { - "id": "3b2ee2be.0d5776", - "type": "block", - "name": "block : atomic", - "xml": "", - "atomic": "true", + "id": "ad2ea8c5.fcd77", + "type": "dgstart", + "name": "DGSTART", "outputs": 1, - "x": 664.2380447387695, - "y": 394.6666717529297, - "z": "a8db409e.810378", + "x": 130.50001525878906, + "y": 20, + "z": "8baeaca1.28233", "wires": [ [ - "7075470e.ead518", - "a887fb8.23d1908", - "c96cd735.589ad8", - "6d0e8b42.1f8964", - "49bfb25c.1c60ac", - "3b8acefc.66b31a", - "6eb961ad.5ae338", - "adbadf0e.275b3", - "c0c21f0e.1b5958", - "f1922be.86c2058", - "d0ca9568.fe847", - "5bbdffcc.b3f3b8" + "9fc16420.cc4ed8" ] ] }, { - "id": "a887fb8.23d1908", - "type": "set", - "name": "set vnf-level-oper-status to Created", - "xml": "\n\n\n\n", + "id": "2023e2ef.c2aaae", + "type": "for", + "name": "for loop idx - VF input parameters", + "xml": "\n\n", "comments": "", - "x": 1086.3848571777344, - "y": 758.6706044944003, - "z": "a8db409e.810378", - "wires": [] + "outputs": 1, + "x": 834.2502317428589, + "y": 333.66668009757996, + "z": "8baeaca1.28233", + "wires": [ + [ + "cf0ba013.1e08c8" + ] + ] }, { - "id": "7075470e.ead518", - "type": "set", - "name": "copy input data to service data", - "xml": "\n\n\n\n\n\n\n\n", + "id": "cf0ba013.1e08c8", + "type": "block", + "name": "block", + "xml": "\n", + "atomic": "false", "comments": "", - "x": 1078.2380447387695, - "y": 653.6668565543368, - "z": "a8db409e.810378", - "wires": [] + "outputs": 1, + "x": 1049.0285749435425, + "y": 331.2222640514374, + "z": "8baeaca1.28233", + "wires": [ + [ + "38f94a22.124166", + "7ae6315a.90c6e8" + ] + ] }, { - "id": "49bfb25c.1c60ac", + "id": "38f94a22.124166", "type": "execute", - "name": "execute generate-vnf-index", - "xml": "\n\n", + "name": "execute split parameterName", + "xml": "\n\n\n\n", "comments": "", "outputs": 1, - "x": 1066.571548461914, - "y": 603.3334405692294, - "z": "a8db409e.810378", + "x": 1245.2847776412964, + "y": 308.97040247917175, + "z": "8baeaca1.28233", "wires": [ [] ] }, { - "id": "c0c21f0e.1b5958", + "id": "7ae6315a.90c6e8", "type": "set", - "name": "set vnf-index to service data", - "xml": "\n\n", + "name": "set parameterName", + "xml": "\n\n", + "comments": "", + "x": 1214.7292051315308, + "y": 345.97051882743835, + "z": "8baeaca1.28233", + "wires": [] + }, + { + "id": "5639a33f.aee984", + "type": "comment", + "name": "Take the parameter names by removing prefix", + "info": "", "comments": "", - "x": 1077.5716247558594, - "y": 710.3334443839267, - "z": "a8db409e.810378", + "x": 1218.250433921814, + "y": 268.33334851264954, + "z": "8baeaca1.28233", "wires": [] }, { - "id": "c96cd735.589ad8", + "id": "cd94e5aa.ecbb7", "type": "switchNode", - "name": "switch service-data.vnfs.vnf_length", - "xml": "\n", + "name": "switch vf-modules.vf-module_length", + "xml": "\n", "comments": "", "outputs": 1, - "x": 1093.5713653564453, - "y": 273.3333633216098, - "z": "a8db409e.810378", + "x": 816.0000305175781, + "y": 187.00001692771912, + "z": "8baeaca1.28233", "wires": [ [ - "9138e1fa.f1d37", - "bf45ff7d.c852e" + "543dc8c7.d54a4", + "7bbfeaa9.0bd62c" ] ] }, { - "id": "9138e1fa.f1d37", + "id": "543dc8c7.d54a4", "type": "other", - "name": "NULL", + "name": "Null", "xml": "\n", "comments": "", "outputs": 1, - "x": 1328.2857513427734, - "y": 268.47618367988616, - "z": "a8db409e.810378", + "x": 1047.0000410079956, + "y": 163.00001406669617, + "z": "8baeaca1.28233", "wires": [ [ - "4dbced61.ca9034" + "be09761b.de8e3" ] ] }, { - "id": "4dbced61.ca9034", - "type": "set", - "name": "set vnf-index=0", - "xml": "\n\n", - "comments": "", - "x": 1488.5714569091797, - "y": 268.47627523262054, - "z": "a8db409e.810378", - "wires": [] - }, - { - "id": "bf45ff7d.c852e", + "id": "7bbfeaa9.0bd62c", "type": "other", "name": "other", "xml": "\n", "comments": "", "outputs": 1, - "x": 1324.7142906188965, - "y": 301.7620151313022, - "z": "a8db409e.810378", + "x": 1047.0000410079956, + "y": 203.00001406669617, + "z": "8baeaca1.28233", "wires": [ [ - "dbddb28c.bce1e8" + "655e11f8.e1faa8" ] ] }, { - "id": "33a0ff35.932e78", + "id": "be09761b.de8e3", "type": "set", - "name": "set vnf-index = vnf_length", - "xml": "\n\n", + "name": "set vf-index", + "xml": "\n\n", "comments": "", - "x": 1717.571533203125, - "y": 280.0477407248691, - "z": "a8db409e.810378", + "x": 1189.5000410079956, + "y": 163.00001406669617, + "z": "8baeaca1.28233", "wires": [] }, { - "id": "36e21bba.2e2ef4", - "type": "for", - "name": "for each existing VNF", - "xml": "\n", + "id": "655e11f8.e1faa8", + "type": "block", + "name": "block", + "xml": "\n", + "atomic": "false", "comments": "", "outputs": 1, - "x": 1706.0001525878906, - "y": 315.04771259147674, - "z": "a8db409e.810378", + "x": 1191.3570852279663, + "y": 202.93652606010437, + "z": "8baeaca1.28233", "wires": [ [ - "7dde789c.f76928" + "4b883294.d65484", + "b58a8196.c8fd18" ] ] }, { - "id": "dbddb28c.bce1e8", - "type": "block", - "name": "block", - "xml": "\n", - "atomic": "false", + "id": "b58a8196.c8fd18", + "type": "set", + "name": "set vf-index", + "xml": "\n\n\n\n", + "comments": "", + "x": 1344.0555601119995, + "y": 172.5556247527711, + "z": "8baeaca1.28233", + "wires": [] + }, + { + "id": "4b883294.d65484", + "type": "for", + "name": "for each existing vf-index", + "xml": "\n", "comments": "", "outputs": 1, - "x": 1459.4285736083984, - "y": 303.76198461372405, - "z": "a8db409e.810378", + "x": 1400.4840650558472, + "y": 225.7777545452118, + "z": "8baeaca1.28233", "wires": [ [ - "33a0ff35.932e78", - "36e21bba.2e2ef4" + "46919469.ed5074" ] ] }, { - "id": "7dde789c.f76928", + "id": "23d12f2a.b840a8", + "type": "comment", + "name": "make sure this network doesn't exist already", + "info": "", + "comments": "", + "x": 1624.1347951889038, + "y": 184.03181195259094, + "z": "8baeaca1.28233", + "wires": [] + }, + { + "id": "46919469.ed5074", "type": "switchNode", - "name": "switch vnf-information.vnf-id == service-data.vnfs.vnf[].vnf-id", - "xml": "\n", + "name": "switch vf-module-id found", + "xml": "\n", "comments": "", "outputs": 1, - "x": 2099.285888671875, - "y": 315.61919668037444, - "z": "a8db409e.810378", + "x": 1675.7697858810425, + "y": 225.34925723075867, + "z": "8baeaca1.28233", "wires": [ [ - "5924827c.34c2fc" + "9a5788e3.06116" ] ] }, { - "id": "5924827c.34c2fc", + "id": "9a5788e3.06116", "type": "outcomeTrue", "name": "true", "xml": "\n", "comments": "", "outputs": 1, - "x": 2380.571590423584, - "y": 314.19060209114105, - "z": "a8db409e.810378", + "x": 1576.4999837875366, + "y": 283.9206883907318, + "z": "8baeaca1.28233", "wires": [ [ - "46ba128f.50acd4" + "1914f90.a238b87" ] ] }, { - "id": "88b8e912.2900e8", - "type": "comment", - "name": "make sure this vnf-id doesn't exist already", - "info": "", + "id": "1914f90.a238b87", + "type": "returnFailure", + "name": "return failure", + "xml": "\n\t\n\t\n \n", "comments": "", - "x": 2068.4285049438477, - "y": 279.1905887397006, - "z": "a8db409e.810378", + "x": 1724.2500867843628, + "y": 283.7778804595582, + "z": "8baeaca1.28233", "wires": [] }, { - "id": "6d0e8b42.1f8964", + "id": "f8f7ecd5.33f1b", "type": "set", - "name": "set new vnf_length", - "xml": "\n\n", + "name": "copy input data to service data", + "xml": "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n", "comments": "", - "x": 1038.571548461914, - "y": 551.3334372313693, - "z": "a8db409e.810378", + "x": 829.8532209396362, + "y": 636.4962680339813, + "z": "8baeaca1.28233", "wires": [] }, { - "id": "3b8acefc.66b31a", - "type": "returnSuccess", - "name": "return success", - "xml": "\n\n\n\n", + "id": "404d2254.b54cb4", + "type": "execute", + "name": "execute generate-vf-module-index", + "xml": "\n\n", + "comments": "", + "outputs": 1, + "x": 841.1867933273315, + "y": 589.1629703044891, + "z": "8baeaca1.28233", + "wires": [ + [] + ] + }, + { + "id": "dc45507c.2c758", + "type": "set", + "name": "set new vf-module_length", + "xml": "\n", "comments": "", - "x": 1025.5715103149414, - "y": 1021.5969560416415, - "z": "a8db409e.810378", + "x": 813.1868543624878, + "y": 540.1629703044891, + "z": "8baeaca1.28233", "wires": [] }, { - "id": "6eb961ad.5ae338", + "id": "b67caacf.835018", "type": "set", - "name": "set vnf-index and vnf-object-path", - "xml": "\n\n", + "name": "set vf-module-request-input.", + "xml": "\n\n", "comments": "", - "x": 1079.5715408325195, - "y": 799.5968749793246, - "z": "a8db409e.810378", + "x": 813.1863813400269, + "y": 486.15425848960876, + "z": "8baeaca1.28233", "wires": [] }, { - "id": "46ba128f.50acd4", - "type": "returnFailure", - "name": "return failure", - "xml": "\n\t\n\t\n \n", + "id": "192e11b1.7d71e6", + "type": "set", + "name": "set vf-module-level-oper-status", + "xml": "\n\n\n", "comments": "", - "x": 2509.1429595947266, - "y": 365.1906163962558, - "z": "a8db409e.810378", + "x": 823.5002088546753, + "y": 734.0000891089439, + "z": "8baeaca1.28233", "wires": [] }, { - "id": "adbadf0e.275b3", + "id": "eaf312a9.dac698", "type": "save", - "name": "save AnAI - l2vpn.operational-status", - "xml": "\n\n", + "name": "save connectivity resource in AAI", + "xml": "\n\n\n\n\n\n\n\n\n\n\n\n", "comments": "", "outputs": 1, - "x": 1134.5458450317383, - "y": 909.247092035599, - "z": "a8db409e.810378", + "x": 830.0000696182251, + "y": 779.5000369548798, + "z": "8baeaca1.28233", "wires": [ [] ] }, { - "id": "204db5a4.c326da", - "type": "comment", - "name": "TODO: change AAI models", - "info": "", + "id": "a92fbbfb.a65698", + "type": "returnSuccess", + "name": "return success", + "xml": "\n\n\n\n", "comments": "", - "x": 1068.1821060180664, - "y": 868.9743078025058, - "z": "a8db409e.810378", + "x": 777.7225427627563, + "y": 872.6739275455475, + "z": "8baeaca1.28233", "wires": [] }, { - "id": "e76c21c2.4a838", - "type": "execute", - "name": "execute split parameterName", - "xml": "\n\n\n\n", + "id": "19fc51d8.0cda46", + "type": "for", + "name": "for loop i - Network input parameters", + "xml": "\n", "comments": "", "outputs": 1, - "x": 1494.7395935058594, - "y": 362.7500076564029, - "z": "a8db409e.810378", + "x": 841.2539472579956, + "y": 422.5039279460907, + "z": "8baeaca1.28233", "wires": [ - [] + [ + "757b8d75.3d0a94" + ] ] }, { - "id": "11945653.6c33ba", + "id": "757b8d75.3d0a94", "type": "block", "name": "block", "xml": "\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1298.4833908081055, - "y": 367.0018806727603, - "z": "a8db409e.810378", + "x": 1128.476824760437, + "y": 422.7262418270111, + "z": "8baeaca1.28233", "wires": [ [ - "e76c21c2.4a838", - "e0fb04c6.a15c88" + "8a7ad1b3.ba99a8", + "597f978e.f5f578" ] ] }, { - "id": "f1922be.86c2058", - "type": "for", - "name": "for loop idx - VNF input parameters", - "xml": "\n", + "id": "8a7ad1b3.ba99a8", + "type": "switchNode", + "name": "switch name", + "xml": "\n\n", "comments": "", "outputs": 1, - "x": 1083.7050476074219, - "y": 369.4462967189029, - "z": "a8db409e.810378", + "x": 1316.6986684799194, + "y": 405.05954599380493, + "z": "8baeaca1.28233", "wires": [ [ - "11945653.6c33ba" + "f3762745.5848d8" ] ] }, { - "id": "d0ca9568.fe847", - "type": "set", - "name": "set vnf-request-input.", - "xml": "\n\n", - "comments": "", - "x": 1040.7046813964844, - "y": 439.7710037501529, - "z": "a8db409e.810378", - "wires": [] - }, - { - "id": "e0fb04c6.a15c88", - "type": "set", - "name": "set parameterName", - "xml": "\n\n", - "comments": "", - "x": 1471.7395935058594, - "y": 408.7500076564029, - "z": "a8db409e.810378", - "wires": [] - }, - { - "id": "5bbdffcc.b3f3b8", - "type": "for", - "name": "for each sdwan-get-request-input-param", - "xml": "\n", + "id": "597f978e.f5f578", + "type": "switchNode", + "name": "switch topology", + "xml": "", "comments": "", "outputs": 1, - "x": 1096.7395935058594, - "y": 491.7500076564029, - "z": "a8db409e.810378", + "x": 1327.5383291244507, + "y": 445.0595440864563, + "z": "8baeaca1.28233", "wires": [ [ - "e0f56e7c.d34a1" + "751a61f6.1024c8" ] ] }, { - "id": "e0f56e7c.d34a1", - "type": "block", - "name": "block", - "xml": "\n", - "atomic": "false", + "id": "f3762745.5848d8", + "type": "outcomeTrue", + "name": "true", + "xml": "\n", "comments": "", "outputs": 1, - "x": 1322.9722595214844, - "y": 490.0937576564029, - "z": "a8db409e.810378", + "x": 1503.6986684799194, + "y": 401.05954599380493, + "z": "8baeaca1.28233", "wires": [ [ - "5be518f3.e26978" + "254d198b.dac90e" ] ] }, { - "id": "5be518f3.e26978", - "type": "switchNode", - "name": "switch vnf name", - "xml": "\n", + "id": "751a61f6.1024c8", + "type": "outcomeTrue", + "name": "true", + "xml": "\n", "comments": "", "outputs": 1, - "x": 1479.4722595214844, - "y": 488.09381869155914, - "z": "a8db409e.810378", + "x": 1497.5383291244507, + "y": 441.0595440864563, + "z": "8baeaca1.28233", "wires": [ [ - "3bfa8dc2.ee3a5a" + "bd2b112e.cf89f" ] ] }, { - "id": "3bfa8dc2.ee3a5a", - "type": "outcomeTrue", - "name": "true", - "xml": "\n", + "id": "254d198b.dac90e", + "type": "set", + "name": "set name", + "xml": "\n\n\n", + "comments": "", + "x": 1653.6987981796265, + "y": 399.6595525741577, + "z": "8baeaca1.28233", + "wires": [] + }, + { + "id": "bd2b112e.cf89f", + "type": "set", + "name": "set topology", + "xml": "\n\n", + "comments": "", + "x": 1684.8717699050903, + "y": 439.5207009315491, + "z": "8baeaca1.28233", + "wires": [] + }, + { + "id": "14342bec.b0bb44", + "type": "set", + "name": "set vf-module-object-path", + "xml": "\n\n\n\n\n", + "comments": "", + "x": 815.5000867843628, + "y": 685.0313085913658, + "z": "8baeaca1.28233", + "wires": [] + }, + { + "id": "657f9098.60c5e8", + "type": "save", + "name": "save service relationship in AAI", + "xml": "\n\n\n\n\n\n\n", "comments": "", "outputs": 1, - "x": 1640.4726257324219, - "y": 488.0938797267154, - "z": "a8db409e.810378", + "x": 830.000147819519, + "y": 827.0001780986786, + "z": "8baeaca1.28233", "wires": [ - [ - "5f201fd1.6acc3" - ] + [] ] }, { - "id": "5f201fd1.6acc3", + "id": "d49f5116.ef68d8", "type": "set", - "name": "set vnf name", - "xml": "\n\n", + "name": "set vnf-index", + "xml": "\n\n\n\n", "comments": "", - "x": 1798.4727478027344, - "y": 486.69391634780914, - "z": "a8db409e.810378", + "x": 739, + "y": 124, + "z": "8baeaca1.28233", "wires": [] } ] \ No newline at end of file diff --git a/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-activate.json b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-activate.json index b8646972..658a04cd 100644 --- a/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-activate.json +++ b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-activate.json @@ -1,20 +1,20 @@ [ { - "id": "ea193d8f.e165e", + "id": "7a5b2247.76a96c", "type": "dgstart", "name": "DGSTART", "outputs": 1, - "x": 112, - "y": 70, - "z": "5c3e2071.30fcf", + "x": 115, + "y": 61, + "z": "9b26c8a0.a64c1", "wires": [ [ - "45143e5e.12cef" + "8f393b9e.9e17b" ] ] }, { - "id": "45143e5e.12cef", + "id": "8f393b9e.9e17b", "type": "service-logic", "name": "GENERIC-RESOURCE-API ${project.version}", "module": "GENERIC-RESOURCE-API", @@ -22,1333 +22,1342 @@ "comments": "", "xml": "", "outputs": 1, - "x": 243.2856903076172, - "y": 119.23810863494873, - "z": "5c3e2071.30fcf", + "x": 246.2856903076172, + "y": 110.23810863494873, + "z": "9b26c8a0.a64c1", "wires": [ [ - "22fb039d.719e1c" + "eff67602.0d4e4" ] ] }, { - "id": "22fb039d.719e1c", + "id": "eff67602.0d4e4", "type": "method", "name": "method sotn-vf-operation-uni-activate", "xml": "\n", "comments": "", "outputs": 1, - "x": 246.42861938476562, - "y": 204.00003242492676, - "z": "5c3e2071.30fcf", + "x": 249.42861938476562, + "y": 195.00003242492676, + "z": "9b26c8a0.a64c1", "wires": [ [ - "bbe79441.cda0b" + "c03d71cc.6719d8" ] ] }, { - "id": "8dca40ca.b6cbc8", + "id": "b1251334.94c658", "type": "switchNode", "name": "switch vf-modules.vf-module_length", "xml": "\n", "comments": "", "outputs": 1, - "x": 718.9959564208984, - "y": 384.99998915195465, - "z": "5c3e2071.30fcf", + "x": 721.9959564208984, + "y": 375.99998915195465, + "z": "9b26c8a0.a64c1", "wires": [ [ - "66f88853.0801a8", - "5f34a2a5.ce0fbc", - "37779f9b.3e84f8" + "2185890c.41cf5e", + "7887ee8e.f7ad9", + "bf0b3d3b.de1c1" ] ] }, { - "id": "bbe79441.cda0b", + "id": "c03d71cc.6719d8", "type": "block", "name": "block : atomic", "xml": "", "atomic": "true", "outputs": 1, - "x": 337.6626205444336, - "y": 489.66670763492584, - "z": "5c3e2071.30fcf", + "x": 340.6626205444336, + "y": 480.66670763492584, + "z": "9b26c8a0.a64c1", "wires": [ [ - "8dca40ca.b6cbc8", - "b28368bd.88b17", - "91b62864.f184c8", - "b0f3fc53.5db61", - "b5422f78.9d3e4", - "f2975c47.fb694", - "aeddedc2.f06158", - "5950f717.b81e28" + "b1251334.94c658", + "e40d5cd3.6df488", + "77bef901.3c81f", + "f1780b76.81d518", + "5733466d.dcbb88", + "6d51d616.88647", + "aab160b4.f76088", + "48dc3a93.b23a44", + "672fc75a.1e91b" ] ] }, { - "id": "91b62864.f184c8", + "id": "77bef901.3c81f", "type": "for", "name": "for each vnf", "xml": "\n", "comments": "", "outputs": 1, - "x": 684.0273170471191, - "y": 255.269144654274, - "z": "5c3e2071.30fcf", + "x": 687.0273170471191, + "y": 246.269144654274, + "z": "9b26c8a0.a64c1", "wires": [ [ - "3d5e06d8.9791c2" + "c9d21017.2aa0b8" ] ] }, { - "id": "b28368bd.88b17", + "id": "e40d5cd3.6df488", "type": "switchNode", "name": "switch vnf_length", "xml": "\n", "comments": "", "outputs": 1, - "x": 688.9959716796875, - "y": 194.00001394748688, - "z": "5c3e2071.30fcf", + "x": 691.9959716796875, + "y": 185.00001394748688, + "z": "9b26c8a0.a64c1", "wires": [ [ - "746b74df.fbc48c" + "eb024dbb.2172c" ] ] }, { - "id": "746b74df.fbc48c", + "id": "eb024dbb.2172c", "type": "outcome", "name": "NULL", "xml": "\n", "comments": "", "outputs": 1, - "x": 868.9959526062012, - "y": 193.0000034570694, - "z": "5c3e2071.30fcf", + "x": 871.9959526062012, + "y": 184.0000034570694, + "z": "9b26c8a0.a64c1", "wires": [ [ - "62ebea71.fce5b4" + "9467f8cc.185d38" ] ] }, { - "id": "62ebea71.fce5b4", + "id": "9467f8cc.185d38", "type": "returnFailure", "name": "return failure", "xml": "\n\t\n\t\n \n", "comments": "", - "x": 1018.4246788024902, - "y": 194.14292109012604, - "z": "5c3e2071.30fcf", + "x": 1021.4246788024902, + "y": 185.14292109012604, + "z": "9b26c8a0.a64c1", "wires": [] }, { - "id": "3d5e06d8.9791c2", + "id": "c9d21017.2aa0b8", "type": "switchNode", "name": "switch this vnf-id == input vnf-id", "xml": " \n", "comments": "", "outputs": 1, - "x": 906.9959678649902, - "y": 256.00000965595245, - "z": "5c3e2071.30fcf", + "x": 909.9959678649902, + "y": 247.00000965595245, + "z": "9b26c8a0.a64c1", "wires": [ [ - "fccff52.827ec08" + "5eb86cb5.aa0e34" ] ] }, { - "id": "fccff52.827ec08", + "id": "5eb86cb5.aa0e34", "type": "outcomeTrue", "name": "true", "xml": "\n", "comments": "", "outputs": 1, - "x": 1121.9959526062012, - "y": 254.0000034570694, - "z": "5c3e2071.30fcf", + "x": 1124.9959526062012, + "y": 245.0000034570694, + "z": "9b26c8a0.a64c1", "wires": [ [ - "fc0c6263.7f4b58" + "eb010427.42f398" ] ] }, { - "id": "46df70e6.cbb32", + "id": "8fe487a9.faab98", "type": "set", "name": "set vnf-index", "xml": "\n\n", "comments": "", - "x": 1462.9959716796875, - "y": 222, - "z": "5c3e2071.30fcf", + "x": 1465.9959716796875, + "y": 213, + "z": "9b26c8a0.a64c1", "wires": [] }, { - "id": "5f34a2a5.ce0fbc", + "id": "7887ee8e.f7ad9", "type": "outcome", "name": "NULL", "xml": "\n", "comments": "", "outputs": 1, - "x": 978.9959716796875, - "y": 409, - "z": "5c3e2071.30fcf", + "x": 981.9959716796875, + "y": 400, + "z": "9b26c8a0.a64c1", "wires": [ [ - "b65ac05a.92d3b8" + "6182e795.96a958" ] ] }, { - "id": "66f88853.0801a8", + "id": "2185890c.41cf5e", "type": "outcome", "name": "0", "xml": "\n", "comments": "", "outputs": 1, - "x": 975.9959716796875, - "y": 337, - "z": "5c3e2071.30fcf", + "x": 978.9959716796875, + "y": 328, + "z": "9b26c8a0.a64c1", "wires": [ [ - "b65ac05a.92d3b8" + "6182e795.96a958" ] ] }, { - "id": "b65ac05a.92d3b8", + "id": "6182e795.96a958", "type": "returnFailure", "name": "return failure", "xml": "\n\t\n\t\n \n", "comments": "", - "x": 1147.9959716796875, - "y": 371, - "z": "5c3e2071.30fcf", + "x": 1150.9959716796875, + "y": 362, + "z": "9b26c8a0.a64c1", "wires": [] }, { - "id": "37779f9b.3e84f8", + "id": "bf0b3d3b.de1c1", "type": "other", "name": "other", "xml": "\n", "comments": "", "outputs": 1, - "x": 940.9959487915039, - "y": 479.9999986886978, - "z": "5c3e2071.30fcf", + "x": 943.9959487915039, + "y": 470.9999986886978, + "z": "9b26c8a0.a64c1", "wires": [ [ - "8619e619.b5b6f" + "f14d9e8b.d52ee8" ] ] }, { - "id": "b4807db5.ce3f18", + "id": "13dbecad.5f9583", "type": "set", "name": "set vf-module_length", "xml": "\n\n\n", "comments": "", - "x": 1294.995964050293, - "y": 478.0000126361847, - "z": "5c3e2071.30fcf", + "x": 1297.995964050293, + "y": 469.0000126361847, + "z": "9b26c8a0.a64c1", "wires": [] }, { - "id": "8619e619.b5b6f", + "id": "f14d9e8b.d52ee8", "type": "block", "name": "block : atomic", "xml": "", "atomic": "true", "outputs": 1, - "x": 1101.995994567871, - "y": 476.99999010562897, - "z": "5c3e2071.30fcf", + "x": 1104.995994567871, + "y": 467.99999010562897, + "z": "9b26c8a0.a64c1", "wires": [ [ - "b4807db5.ce3f18", - "b7112b63.fa666" + "13dbecad.5f9583", + "76e7a061.215fe" ] ] }, { - "id": "b7112b63.fa666", + "id": "76e7a061.215fe", "type": "for", "name": "for each existing vf-index", "xml": "\n", "comments": "", "outputs": 1, - "x": 1313.9959335327148, - "y": 530.9999891519547, - "z": "5c3e2071.30fcf", + "x": 1316.9959335327148, + "y": 521.9999891519547, + "z": "9b26c8a0.a64c1", "wires": [ [ - "207d79b0.f0396e" + "4d4229cc.870928" ] ] }, { - "id": "207d79b0.f0396e", + "id": "4d4229cc.870928", "type": "switchNode", "name": "switch vf-module-id found", "xml": "\n", "comments": "", "outputs": 1, - "x": 1556.995948791504, - "y": 525.9999986886978, - "z": "5c3e2071.30fcf", + "x": 1559.995948791504, + "y": 516.9999986886978, + "z": "9b26c8a0.a64c1", "wires": [ [ - "f2b976ec.55b34" + "235f500c.adb2d8" ] ] }, { - "id": "f2b976ec.55b34", + "id": "235f500c.adb2d8", "type": "outcomeTrue", "name": "true", "xml": "\n", "comments": "", "outputs": 1, - "x": 1754.9959774017334, - "y": 513.000005364418, - "z": "5c3e2071.30fcf", + "x": 1757.9959774017334, + "y": 504.00000536441803, + "z": "9b26c8a0.a64c1", "wires": [ [ - "eab205c1.ee7e8" + "b98c0673.7d62f8" ] ] }, { - "id": "eab205c1.ee7e8", + "id": "b98c0673.7d62f8", "type": "block", "name": "block : atomic", "xml": "", "atomic": "true", "outputs": 1, - "x": 1906.995948791504, - "y": 514.9999986886978, - "z": "5c3e2071.30fcf", + "x": 1909.995948791504, + "y": 505.9999986886978, + "z": "9b26c8a0.a64c1", "wires": [ [ - "7cce5705.9b51", - "b161a727.31db88", - "8cc64f67.5de4c" + "9c359698.db3d68", + "1962516c.e21167" ] ] }, { - "id": "7cce5705.9b51", + "id": "9c359698.db3d68", "type": "set", "name": "set tmp.vidx and ctx.vnf-data", "xml": "\n\n\n", "comments": "", - "x": 2134.996063232422, - "y": 457.0000025033951, - "z": "5c3e2071.30fcf", + "x": 2137.996063232422, + "y": 448.0000025033951, + "z": "9b26c8a0.a64c1", "wires": [] }, { - "id": "b161a727.31db88", + "id": "1962516c.e21167", "type": "set", "name": "set vf-module-request-input.", "xml": "\n\n\n", "comments": "", - "x": 2138.996063232422, - "y": 511.0000025033951, - "z": "5c3e2071.30fcf", + "x": 2141.996063232422, + "y": 502.0000025033951, + "z": "9b26c8a0.a64c1", "wires": [] }, { - "id": "b0f3fc53.5db61", + "id": "f1780b76.81d518", "type": "returnSuccess", "name": "return success", "xml": "\n\n\n\n", "comments": "", - "x": 612.9961547851562, - "y": 1684.501220703125, - "z": "5c3e2071.30fcf", + "x": 615.9961547851562, + "y": 1675.501220703125, + "z": "9b26c8a0.a64c1", "wires": [] }, { - "id": "8cc64f67.5de4c", + "id": "29a9aeb.30d1952", "type": "call", "name": "call sotn-get-vf-module-uni-param", "xml": "\n", "comments": "", "outputs": 1, - "x": 2169.45108795166, - "y": 562.0104948282242, - "z": "5c3e2071.30fcf", + "x": 2172.45108795166, + "y": 553.0104948282242, + "z": "9b26c8a0.a64c1", "wires": [ [] ] }, { - "id": "b5422f78.9d3e4", + "id": "5733466d.dcbb88", "type": "execute", "name": "execute Properties", "xml": "\n \n \n", "comments": "", "outputs": 1, - "x": 698.9959564208984, - "y": 324.5039049386978, - "z": "5c3e2071.30fcf", + "x": 701.9959564208984, + "y": 315.5039049386978, + "z": "9b26c8a0.a64c1", "wires": [ [] ] }, { - "id": "fc0c6263.7f4b58", + "id": "eb010427.42f398", "type": "block", "name": "block : atomic", "xml": "", "atomic": "true", "outputs": 1, - "x": 1285, - "y": 264, - "z": "5c3e2071.30fcf", + "x": 1288, + "y": 255, + "z": "9b26c8a0.a64c1", "wires": [ [ - "46df70e6.cbb32", - "868e2384.9bd088" + "8fe487a9.faab98", + "c2b0533e.d5b1d" ] ] }, { - "id": "868e2384.9bd088", + "id": "c2b0533e.d5b1d", "type": "set", "name": "set tmp.vnf-id", "xml": "\n\n", "comments": "", - "x": 1470, - "y": 279, - "z": "5c3e2071.30fcf", + "x": 1473, + "y": 270, + "z": "9b26c8a0.a64c1", "wires": [] }, { - "id": "5950f717.b81e28", + "id": "48dc3a93.b23a44", "type": "get-resource", "name": "get-resource generic-vnf", - "xml": "\n\n\n", + "xml": "\n\n\n\n", "comments": "", "outputs": 1, - "x": 591, - "y": 543, - "z": "5c3e2071.30fcf", + "x": 594, + "y": 534, + "z": "9b26c8a0.a64c1", "wires": [ [ - "25602afb.1d9cfe" + "28391a2c.3321fe" ] ] }, { - "id": "8bfca5dd.ccec38", + "id": "6a811cc0.b174ac", "type": "block", "name": "block", "xml": "\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 821, - "y": 591, - "z": "5c3e2071.30fcf", + "x": 824, + "y": 582, + "z": "9b26c8a0.a64c1", "wires": [ [ - "3fb86113.9bfd2e", - "cea6f99d.9fa3f8" + "1afc6101.b3a3ff", + "6ac23f85.2f3a38" ] ] }, { - "id": "cea6f99d.9fa3f8", + "id": "6ac23f85.2f3a38", "type": "for", "name": "for each relationship in gen-vnf", "xml": "\n", "comments": "", "outputs": 1, - "x": 1033, - "y": 594, - "z": "5c3e2071.30fcf", + "x": 1036, + "y": 585, + "z": "9b26c8a0.a64c1", "wires": [ [ - "380b3b11.1fc39c" + "5e0bc542.fea784" ] ] }, { - "id": "380b3b11.1fc39c", + "id": "5e0bc542.fea784", "type": "switchNode", "name": "switch related-to", - "xml": "\n", + "xml": "\n", "comments": "", "outputs": 1, - "x": 1259, - "y": 598, - "z": "5c3e2071.30fcf", + "x": 1262, + "y": 589, + "z": "9b26c8a0.a64c1", "wires": [ [ - "6ce242f7.50a224" + "ad3f5adb.0bf5b8" ] ] }, { - "id": "6ce242f7.50a224", + "id": "ad3f5adb.0bf5b8", "type": "outcome", "name": "uni", "xml": "\n", "comments": "", "outputs": 1, - "x": 1448.285888671875, - "y": 606.82177734375, - "z": "5c3e2071.30fcf", + "x": 1451.285888671875, + "y": 597.82177734375, + "z": "9b26c8a0.a64c1", "wires": [ [ - "8f0c299e.76aa68" + "4a0655ab.fa2fa4" ] ] }, { - "id": "8f0c299e.76aa68", + "id": "4a0655ab.fa2fa4", "type": "block", "name": "block : atomic", "xml": "", "atomic": "true", "outputs": 1, - "x": 1623.117431640625, - "y": 609.3402709960938, - "z": "5c3e2071.30fcf", + "x": 1626.117431640625, + "y": 600.3402709960938, + "z": "9b26c8a0.a64c1", "wires": [ [ - "9cc6d571.b014d8", - "8d29ebb2.4924b", - "1b814ca6.da0c53" + "2cd069f4.1bd85e", + "e85654b4.901fd", + "596112fe.dbc0a4" ] ] }, { - "id": "9cc6d571.b014d8", + "id": "2cd069f4.1bd85e", "type": "set", "name": "set tmp.unis.uni[].tpId", - "xml": "\n\n\n", + "xml": "\n\n\n\n", "comments": "", - "x": 1840.117431640625, - "y": 607.3402709960938, - "z": "5c3e2071.30fcf", + "x": 1843.117431640625, + "y": 598.3402709960938, + "z": "9b26c8a0.a64c1", "wires": [] }, { - "id": "3fb86113.9bfd2e", + "id": "1afc6101.b3a3ff", "type": "switchNode", "name": "switch number of unis less than two", "xml": "\n", "comments": "", "outputs": 1, - "x": 1008, - "y": 758, - "z": "5c3e2071.30fcf", + "x": 1011, + "y": 749, + "z": "9b26c8a0.a64c1", "wires": [ [ - "ca909120.1610f" + "3398154f.dabcca" ] ] }, { - "id": "6807aab1.3361f4", + "id": "f0dacaa2.3f6d9", "type": "returnSuccess", "name": "return success", "xml": "\n\n\n\n\n", "comments": "", - "x": 1416, - "y": 760, - "z": "5c3e2071.30fcf", + "x": 1419, + "y": 751, + "z": "9b26c8a0.a64c1", "wires": [] }, { - "id": "ca909120.1610f", + "id": "3398154f.dabcca", "type": "outcomeTrue", "name": "true", "xml": "\n", "comments": "", "outputs": 1, - "x": 1224, - "y": 759, - "z": "5c3e2071.30fcf", + "x": 1227, + "y": 750, + "z": "9b26c8a0.a64c1", "wires": [ [ - "6807aab1.3361f4" + "f0dacaa2.3f6d9" ] ] }, { - "id": "8d29ebb2.4924b", + "id": "e85654b4.901fd", "type": "execute", "name": "execute split tpId to get pnf-name", "xml": "\n\n\n\n", "comments": "", "outputs": 1, - "x": 1879, - "y": 682, - "z": "5c3e2071.30fcf", + "x": 1882, + "y": 673, + "z": "9b26c8a0.a64c1", "wires": [ [ - "8df25e56.70ef2", - "5281d33f.6cf23c" + "fb92d303.a6d858", + "3b07d667.72d91a" ] ] }, { - "id": "5281d33f.6cf23c", + "id": "3b07d667.72d91a", "type": "failure", "name": "success", "xml": "\n", "comments": "", "outputs": 1, - "x": 2102, - "y": 637, - "z": "5c3e2071.30fcf", + "x": 2105, + "y": 628, + "z": "9b26c8a0.a64c1", "wires": [ [ - "98c7bac7.1f7b2" + "9111f685.17b2e8" ] ] }, { - "id": "8df25e56.70ef2", + "id": "fb92d303.a6d858", "type": "failure", "name": "failure", "xml": "\n", "comments": "", "outputs": 1, - "x": 2104, - "y": 701, - "z": "5c3e2071.30fcf", + "x": 2107, + "y": 692, + "z": "9b26c8a0.a64c1", "wires": [ [ - "538dd561.19c994" + "1432f6d2.d75751" ] ] }, { - "id": "98c7bac7.1f7b2", + "id": "9111f685.17b2e8", "type": "set", "name": "set ipAddress prefixLength", "xml": "\n\n", "comments": "", - "x": 2324, - "y": 639, - "z": "5c3e2071.30fcf", + "x": 2327, + "y": 630, + "z": "9b26c8a0.a64c1", "wires": [] }, { - "id": "538dd561.19c994", + "id": "1432f6d2.d75751", "type": "returnFailure", "name": "return failure", "xml": "\n\n\n", "comments": "", - "x": 2263, - "y": 720, - "z": "5c3e2071.30fcf", + "x": 2266, + "y": 711, + "z": "9b26c8a0.a64c1", "wires": [] }, { - "id": "1b814ca6.da0c53", + "id": "596112fe.dbc0a4", "type": "get-resource", "name": "get-resource pnf", "xml": "\n\n\n\n\n\n\n", "comments": "", "outputs": 1, - "x": 1809, - "y": 819, - "z": "5c3e2071.30fcf", + "x": 1812, + "y": 810, + "z": "9b26c8a0.a64c1", "wires": [ [ - "a9afb163.16d81" + "51c3744a.753414" ] ] }, { - "id": "6d7469b.d065118", + "id": "796d1bdc.d65e9c", "type": "block", "name": "block", "xml": "", "atomic": "false", "comments": "", "outputs": 1, - "x": 2168.88232421875, - "y": 827.6556396484375, - "z": "5c3e2071.30fcf", + "x": 2171.88232421875, + "y": 818.6556396484375, + "z": "9b26c8a0.a64c1", "wires": [ [ - "d8ebfcdc.d7e228", - "e363b1ad.6cf518" + "9e81136f.40f158", + "3a607f75.56a9d" ] ] }, { - "id": "d8ebfcdc.d7e228", + "id": "9e81136f.40f158", "type": "set", "name": "set node-id", "xml": "\n\n", "comments": "", - "x": 2348, - "y": 781, - "z": "5c3e2071.30fcf", + "x": 2351, + "y": 772, + "z": "9b26c8a0.a64c1", "wires": [] }, { - "id": "e363b1ad.6cf518", + "id": "3a607f75.56a9d", "type": "for", "name": "for each relationship in pnf", "xml": "\n", "comments": "", "outputs": 1, - "x": 2360.882568359375, - "y": 867.6597290039062, - "z": "5c3e2071.30fcf", + "x": 2363.882568359375, + "y": 858.6597290039062, + "z": "9b26c8a0.a64c1", "wires": [ [ - "95c7940c.2b5948" + "709c4d83.a869b4" ] ] }, { - "id": "95c7940c.2b5948", + "id": "709c4d83.a869b4", "type": "switchNode", "name": "switch related-to", "xml": "\n", "comments": "", "outputs": 1, - "x": 2586.882568359375, - "y": 867.6597290039062, - "z": "5c3e2071.30fcf", + "x": 2589.882568359375, + "y": 858.6597290039062, + "z": "9b26c8a0.a64c1", "wires": [ [ - "a1776b53.b80d", - "af94fb8e.80dfb8" + "8cbba6bb.ad862", + "dd673476.c308f" ] ] }, { - "id": "af94fb8e.80dfb8", + "id": "dd673476.c308f", "type": "outcome", "name": "network-resource", "xml": "\n", "comments": "", "outputs": 1, - "x": 2785, - "y": 980, - "z": "5c3e2071.30fcf", + "x": 2788, + "y": 971, + "z": "9b26c8a0.a64c1", "wires": [ [ - "127afd4b.34da43" + "2c8cb3cb.28eeec" ] ] }, { - "id": "127afd4b.34da43", + "id": "2c8cb3cb.28eeec", "type": "block", "name": "block : atomic", "xml": "", "atomic": "true", "outputs": 1, - "x": 2998, - "y": 981, - "z": "5c3e2071.30fcf", + "x": 3001, + "y": 972, + "z": "9b26c8a0.a64c1", "wires": [ [ - "9a33ae38.4ad288", - "b1e1b5aa.ff6b18" + "8af5221c.7c91b", + "47206fa6.e312e" ] ] }, { - "id": "9a33ae38.4ad288", + "id": "8af5221c.7c91b", "type": "set", "name": "set network-id", "xml": "\n\n", "comments": "", - "x": 3233, - "y": 911, - "z": "5c3e2071.30fcf", + "x": 3236, + "y": 902, + "z": "9b26c8a0.a64c1", "wires": [] }, { - "id": "b1e1b5aa.ff6b18", + "id": "47206fa6.e312e", "type": "get-resource", "name": "get-resource network-resource", "xml": "\n\n\n", "comments": "", "outputs": 1, - "x": 3241, - "y": 992, - "z": "5c3e2071.30fcf", + "x": 3244, + "y": 983, + "z": "9b26c8a0.a64c1", "wires": [ [ - "7923986a.2dfdb" + "4ad04544.d0fad4" ] ] }, { - "id": "7923986a.2dfdb", + "id": "4ad04544.d0fad4", "type": "success", "name": "success", "xml": "\n", "comments": "", "outputs": 1, - "x": 3473.5, - "y": 988, - "z": "5c3e2071.30fcf", + "x": 3476.5, + "y": 979, + "z": "9b26c8a0.a64c1", "wires": [ [ - "e1de0e95.dce97" + "d8cca786.0614f8" ] ] }, { - "id": "e1de0e95.dce97", + "id": "d8cca786.0614f8", "type": "set", "name": "set network-id, topo-id, client-id, etc", "xml": "\n\n\n\n\n\n\n\n", "comments": "", - "x": 3742, - "y": 987, - "z": "5c3e2071.30fcf", + "x": 3745, + "y": 978, + "z": "9b26c8a0.a64c1", "wires": [] }, { - "id": "aeddedc2.f06158", + "id": "aab160b4.f76088", "type": "call", "name": "call GENERIC-RESOURCE-API:sotn-get-otn-tunnel-path-from-oof", "xml": "\n", "comments": "", "outputs": 1, - "x": 797, - "y": 905, - "z": "5c3e2071.30fcf", + "x": 800, + "y": 896, + "z": "9b26c8a0.a64c1", "wires": [ [] ] }, { - "id": "a1776b53.b80d", + "id": "8cbba6bb.ad862", "type": "outcome", "name": "thirdparty-controller", "xml": "\n", "comments": "", "outputs": 1, - "x": 2812, - "y": 845, - "z": "5c3e2071.30fcf", + "x": 2815, + "y": 836, + "z": "9b26c8a0.a64c1", "wires": [ [ - "4c01f776.c87b7" + "8b43ac76.263cd" ] ] }, { - "id": "4c01f776.c87b7", + "id": "8b43ac76.263cd", "type": "block", "name": "block : atomic", "xml": "", "atomic": "true", "outputs": 1, - "x": 3025, - "y": 846, - "z": "5c3e2071.30fcf", + "x": 3028, + "y": 837, + "z": "9b26c8a0.a64c1", "wires": [ [ - "583e9b05.f6eef4" + "9b5d5673.27be38" ] ] }, { - "id": "583e9b05.f6eef4", + "id": "9b5d5673.27be38", "type": "set", "name": "set thirdparty-sdnc-id", "xml": "\n\n", "comments": "", - "x": 3252, - "y": 845, - "z": "5c3e2071.30fcf", + "x": 3255, + "y": 836, + "z": "9b26c8a0.a64c1", "wires": [] }, { - "id": "d059a84d.8e506", + "id": "4ddb604c.658b08", "type": "comment", "name": "when we reach here, we have 2 UNIs, so do ACTN operations", "info": "", "comments": "", - "x": 810, - "y": 851, - "z": "5c3e2071.30fcf", + "x": 813, + "y": 842, + "z": "9b26c8a0.a64c1", "wires": [] }, { - "id": "f2975c47.fb694", + "id": "6d51d616.88647", "type": "for", "name": "for vidx..unis.uni_length[]", "xml": "", "comments": "", "outputs": 1, - "x": 663, - "y": 1097, - "z": "5c3e2071.30fcf", + "x": 666, + "y": 1088, + "z": "9b26c8a0.a64c1", "wires": [ [ - "de539d0a.26596" + "8a72c5de.69f39" ] ] }, { - "id": "3b0a5525.2ac102", + "id": "f7756434.d014e", "type": "set", "name": "set oof.vpn", "xml": "\n", "comments": "", - "x": 1089.0272216796875, - "y": 1036.040771484375, - "z": "5c3e2071.30fcf", + "x": 1092.0272216796875, + "y": 1027.040771484375, + "z": "9b26c8a0.a64c1", "wires": [] }, { - "id": "29b92baa.41f5cc", + "id": "8e5c8d32.64abe8", "type": "set", "name": "set controller data", - "xml": "\n\n\n\n", + "xml": "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n", "comments": "", - "x": 1569.0272216796875, - "y": 1149.0407409667969, - "z": "5c3e2071.30fcf", + "x": 1572.0272216796875, + "y": 1140.0407409667969, + "z": "9b26c8a0.a64c1", "wires": [] }, { - "id": "82572a7a.757f1", + "id": "58b223b2.226b5c", "type": "success", "name": "success", "xml": "\n", "comments": "", "outputs": 1, - "x": 1399.0272216796875, - "y": 1149.0407409667969, - "z": "5c3e2071.30fcf", + "x": 1402.0272216796875, + "y": 1140.0407409667969, + "z": "9b26c8a0.a64c1", "wires": [ [ - "29b92baa.41f5cc" + "8e5c8d32.64abe8" ] ] }, { - "id": "7ff0b8e4.d0edd", + "id": "74cd1f0b.113038", "type": "not-found", "name": "not-found", "xml": "\n", "comments": "", "outputs": 1, - "x": 1403.0272216796875, - "y": 1189.0407409667969, - "z": "5c3e2071.30fcf", + "x": 1406.0272216796875, + "y": 1180.0407409667969, + "z": "9b26c8a0.a64c1", "wires": [ [ - "d2605932.de72d8" + "50f33a59.7393a4" ] ] }, { - "id": "bcaaab5e.f760b", + "id": "4f39f2a5.5bd5fc", "type": "other", "name": "other", "xml": "\n", "comments": "", "outputs": 1, - "x": 1395.0272216796875, - "y": 1229.0407409667969, - "z": "5c3e2071.30fcf", + "x": 1398.0272216796875, + "y": 1220.0407409667969, + "z": "9b26c8a0.a64c1", "wires": [ [ - "c5af9444.32cba8" + "4b579e44.4ec6b" ] ] }, { - "id": "d2605932.de72d8", + "id": "50f33a59.7393a4", "type": "returnFailure", "name": "return failure", "xml": "\n\t\n\t\n \n\t\n\t\n \n", "comments": "", "outputs": 1, - "x": 1399.0272216796875, - "y": 1269.0407409667969, - "z": "5c3e2071.30fcf", + "x": 1402.0272216796875, + "y": 1260.0407409667969, + "z": "9b26c8a0.a64c1", "wires": [ [ - "189365cc.5aa2da" + "9aeb59cf.e4f488" ] ] }, { - "id": "36cada17.d60606", + "id": "3bf26416.4deddc", "type": "failure", "name": "failure", "xml": "\n", "comments": "", "outputs": 1, - "x": 1395.0272216796875, - "y": 1309.0407409667969, - "z": "5c3e2071.30fcf", + "x": 1398.0272216796875, + "y": 1300.0407409667969, + "z": "9b26c8a0.a64c1", "wires": [ [ - "436f764c.14ed4" + "e227ce38.6755d" ] ] }, { - "id": "436f764c.14ed4", + "id": "e227ce38.6755d", "type": "returnFailure", "name": "return failure", "xml": "\n\t\n\t\n \n", "comments": "", - "x": 1553.0272216796875, - "y": 1309.0407409667969, - "z": "5c3e2071.30fcf", + "x": 1556.0272216796875, + "y": 1300.0407409667969, + "z": "9b26c8a0.a64c1", "wires": [] }, { - "id": "189365cc.5aa2da", + "id": "9aeb59cf.e4f488", "type": "set", "name": "set token-id", "xml": "\n\n", "comments": "", - "x": 1549.5272216796875, - "y": 1269.0407409667969, - "z": "5c3e2071.30fcf", + "x": 1552.5272216796875, + "y": 1260.0407409667969, + "z": "9b26c8a0.a64c1", "wires": [] }, { - "id": "bce6bff8.ae1f18", + "id": "ac6d44a1.0c401", "type": "comment", "name": "Get controller info and send request", "info": "", "comments": "", - "x": 1161.0272216796875, - "y": 1149.0407409667969, - "z": "5c3e2071.30fcf", + "x": 1164.0272216796875, + "y": 1140.0407409667969, + "z": "9b26c8a0.a64c1", "wires": [] }, { - "id": "8c2f104c.2ab35", + "id": "a9643f3f.4f04b", "type": "get-resource", "name": "get-resource esr-thirdparty-sdnc", "xml": "\n\n", "comments": "", "outputs": 1, - "x": 1153.0272216796875, - "y": 1189.0407409667969, - "z": "5c3e2071.30fcf", + "x": 1156.0272216796875, + "y": 1180.0407409667969, + "z": "9b26c8a0.a64c1", "wires": [ [ - "82572a7a.757f1", - "7ff0b8e4.d0edd", - "bcaaab5e.f760b" + "58b223b2.226b5c", + "74cd1f0b.113038", + "4f39f2a5.5bd5fc" ] ] }, { - "id": "e9d11d4a.ea432", + "id": "c6d53bc.53f5bc8", "type": "execute", "name": "execute RestApiCallNode Get token", "xml": "\n\n\n\n\n\n\n\n\n", "comments": "", "outputs": 1, - "x": 1165.5272216796875, - "y": 1289.0407409667969, - "z": "5c3e2071.30fcf", + "x": 1168.5272216796875, + "y": 1280.0407409667969, + "z": "9b26c8a0.a64c1", "wires": [ [ - "dc15d354.485648", - "36cada17.d60606" + "66a971fa.46a568", + "3bf26416.4deddc" ] ] }, { - "id": "81bac551.cc757", + "id": "787bd09.8ff59b", "type": "comment", "name": "call domain controller to create underlay OTN tunnel", "info": "", "comments": "", - "x": 1214.5272216796875, - "y": 1374.49560546875, - "z": "5c3e2071.30fcf", + "x": 1217.5272216796875, + "y": 1365.49560546875, + "z": "9b26c8a0.a64c1", "wires": [] }, { - "id": "f9c270fa.7abd5", + "id": "ee991e0.ab6b36", "type": "call", "name": "call GENERIC-RESOURCE-API:sotn-create-otn-tunnel", "xml": "\n", "comments": "", "outputs": 1, - "x": 1234.5272216796875, - "y": 1418.49560546875, - "z": "5c3e2071.30fcf", + "x": 1237.5272216796875, + "y": 1409.49560546875, + "z": "9b26c8a0.a64c1", "wires": [ [] ] }, { - "id": "de539d0a.26596", + "id": "8a72c5de.69f39", "type": "block", "name": "block : atomic", "xml": "", "atomic": "true", "outputs": 1, - "x": 816.5272216796875, - "y": 1429.0407409667969, - "z": "5c3e2071.30fcf", + "x": 819.5272216796875, + "y": 1420.0407409667969, + "z": "9b26c8a0.a64c1", "wires": [ [ - "8c2f104c.2ab35", - "3b0a5525.2ac102", - "2c3edd05.477cca", - "543dd31e.1a6c4c", - "e9d11d4a.ea432", - "ab256b41.e2d9b8", - "f9c270fa.7abd5" + "124c6957.e07dc7", + "3ce3b19a.7c10c6", + "d661efba.3fa238", + "ee991e0.ab6b36", + "f7756434.d014e" ] ] }, { - "id": "641e0b16.a7aa44", + "id": "ab7e4ea9.e8e178", "type": "comment", "name": "Loop through UNIs and configure domain controllers", "info": "", "comments": "", - "x": 751.5003662109375, - "y": 1237.5003662109375, - "z": "5c3e2071.30fcf", + "x": 754.5003662109375, + "y": 1228.5003662109375, + "z": "9b26c8a0.a64c1", "wires": [] }, { - "id": "2c3edd05.477cca", + "id": "124c6957.e07dc7", "type": "set", "name": "set sotn_value", "xml": "\n\n\n\n\n\n\n", "comments": "", - "x": 1080.52734375, - "y": 1497.040771484375, - "z": "5c3e2071.30fcf", + "x": 1083.52734375, + "y": 1488.040771484375, + "z": "9b26c8a0.a64c1", "wires": [] }, { - "id": "543dd31e.1a6c4c", + "id": "3ce3b19a.7c10c6", "type": "set", "name": "set attachment_param", "xml": "\n\n\n\n\n\n\n\n\n", "comments": "", - "x": 1105.02734375, - "y": 1537.040771484375, - "z": "5c3e2071.30fcf", + "x": 1108.02734375, + "y": 1528.040771484375, + "z": "9b26c8a0.a64c1", "wires": [] }, { - "id": "ab256b41.e2d9b8", + "id": "d661efba.3fa238", "type": "switchNode", "name": "switch prop.sdncRestApi.token_id", "xml": "\n\n", "comments": "", "outputs": 1, - "x": 1140.52734375, - "y": 1577.040771484375, - "z": "5c3e2071.30fcf", + "x": 1143.52734375, + "y": 1568.040771484375, + "z": "9b26c8a0.a64c1", "wires": [ [ - "7aea425d.d2ac8c", - "c6896fdc.d8f088" + "f63083b5.0624b", + "fbf2273e.fbe678" ] ] }, { - "id": "e7a0edea.212a28", + "id": "678c3911.078e2", "type": "execute", "name": "execute RestconfApiCallNode Create ethernet Service with token", "xml": "\n\n\n\n\n\n\n\n\n\n\n\n", "comments": "", "outputs": 1, - "x": 1657.52734375, - "y": 1597.040771484375, - "z": "5c3e2071.30fcf", + "x": 1660.52734375, + "y": 1588.040771484375, + "z": "9b26c8a0.a64c1", "wires": [ [ - "dc79f422.6ffec8", - "fce6e76c.ef0f5" + "72a042fd.6a9e5c", + "4ae2509c.7d19b8" ] ] }, { - "id": "dc79f422.6ffec8", + "id": "72a042fd.6a9e5c", "type": "success", "name": "success", "xml": "\n", "comments": "", "outputs": 1, - "x": 2001.02734375, - "y": 1597.040771484375, - "z": "5c3e2071.30fcf", + "x": 2004.02734375, + "y": 1588.040771484375, + "z": "9b26c8a0.a64c1", "wires": [ [ - "e78610af.f485d" + "743fa383.cc94fc" ] ] }, { - "id": "e78610af.f485d", + "id": "743fa383.cc94fc", "type": "block", "name": "block : atomic", "xml": "", "atomic": "true", "comments": "", "outputs": 1, - "x": 2158.52734375, - "y": 1597.040771484375, - "z": "5c3e2071.30fcf", + "x": 2161.52734375, + "y": 1588.040771484375, + "z": "9b26c8a0.a64c1", "wires": [ [] ] }, { - "id": "3c748274.94d126", + "id": "7e01ab8f.069484", "type": "returnFailure", "name": "return failure", "xml": "\n\t\n\t\n \n", "comments": "", - "x": 2155.02734375, - "y": 1557.040771484375, - "z": "5c3e2071.30fcf", + "x": 2158.02734375, + "y": 1548.040771484375, + "z": "9b26c8a0.a64c1", "wires": [] }, { - "id": "fce6e76c.ef0f5", + "id": "4ae2509c.7d19b8", "type": "failure", "name": "failure", "xml": "\n", "comments": "", "outputs": 1, - "x": 1997.02734375, - "y": 1557.040771484375, - "z": "5c3e2071.30fcf", + "x": 2000.02734375, + "y": 1548.040771484375, + "z": "9b26c8a0.a64c1", "wires": [ [ - "3c748274.94d126" + "7e01ab8f.069484" ] ] }, { - "id": "7aea425d.d2ac8c", + "id": "f63083b5.0624b", "type": "other", "name": "Null", "xml": "\n", "comments": "", "outputs": 1, - "x": 1353.3711738586426, - "y": 1557.162670135498, - "z": "5c3e2071.30fcf", + "x": 1356.3711738586426, + "y": 1548.162670135498, + "z": "9b26c8a0.a64c1", "wires": [ [ - "7a6c581b.b1ed5" + "42cb8b06.e7daec" ] ] }, { - "id": "c6896fdc.d8f088", + "id": "fbf2273e.fbe678", "type": "other", "name": "other", "xml": "\n", "comments": "", "outputs": 1, - "x": 1357.02734375, - "y": 1597.040771484375, - "z": "5c3e2071.30fcf", + "x": 1360.02734375, + "y": 1588.040771484375, + "z": "9b26c8a0.a64c1", "wires": [ [ - "e7a0edea.212a28" + "678c3911.078e2" ] ] }, { - "id": "7a6c581b.b1ed5", + "id": "42cb8b06.e7daec", "type": "execute", "name": "execute RestconfApiCallNode Create ethernet Service without token", "xml": "\n\n\n\n\n\n\n\n\n\n\n", "comments": "", "outputs": 1, - "x": 1667.52734375, - "y": 1557.040771484375, - "z": "5c3e2071.30fcf", + "x": 1670.52734375, + "y": 1548.040771484375, + "z": "9b26c8a0.a64c1", "wires": [ [ - "fce6e76c.ef0f5", - "dc79f422.6ffec8" + "4ae2509c.7d19b8", + "72a042fd.6a9e5c" ] ] }, { - "id": "25602afb.1d9cfe", + "id": "28391a2c.3321fe", "type": "success", "name": "success", "xml": "\n", "comments": "", "outputs": 1, - "x": 722, - "y": 672, - "z": "5c3e2071.30fcf", + "x": 725, + "y": 663, + "z": "9b26c8a0.a64c1", "wires": [ [ - "8bfca5dd.ccec38" + "6a811cc0.b174ac" ] ] }, { - "id": "a9afb163.16d81", + "id": "51c3744a.753414", "type": "failure", "name": "success", "xml": "\n", "comments": "", "outputs": 1, - "x": 1992, - "y": 826, - "z": "5c3e2071.30fcf", + "x": 1995, + "y": 817, + "z": "9b26c8a0.a64c1", "wires": [ [ - "6d7469b.d065118" + "796d1bdc.d65e9c" ] ] + }, + { + "id": "672fc75a.1e91b", + "type": "set", + "name": "set tmp.unis.uni[].tpId", + "xml": "\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n", + "comments": "", + "x": 655, + "y": 1015, + "z": "9b26c8a0.a64c1", + "wires": [] } ] \ No newline at end of file diff --git a/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-create.json b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-create.json index 191456bd..0a95efc3 100644 --- a/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-create.json +++ b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-create.json @@ -1,20 +1,20 @@ [ { - "id": "41bcd68b.3b187", + "id": "bdabd9df.2798c", "type": "dgstart", "name": "DGSTART", "outputs": 1, - "x": 117, - "y": 66, - "z": "c1f3ee3d.7e867", + "x": 134, + "y": 76, + "z": "d9929d00.bfba4", "wires": [ [ - "68ff8d75.08d6bc" + "37325ab3.a584e6" ] ] }, { - "id": "68ff8d75.08d6bc", + "id": "37325ab3.a584e6", "type": "service-logic", "name": "GENERIC-RESOURCE-API ${project.version}", "module": "GENERIC-RESOURCE-API", @@ -22,600 +22,608 @@ "comments": "", "xml": "", "outputs": 1, - "x": 248.2856903076172, - "y": 115.23810863494873, - "z": "c1f3ee3d.7e867", + "x": 265.2856903076172, + "y": 125.23810863494873, + "z": "d9929d00.bfba4", "wires": [ [ - "e9c8e7da.08db58" + "89aa288e.14e82" ] ] }, { - "id": "e9c8e7da.08db58", + "id": "89aa288e.14e82", "type": "method", "name": "method sotn-vf-operation-uni-create", "xml": "\n", "comments": "", "outputs": 1, - "x": 251.42861938476562, - "y": 200.00003242492676, - "z": "c1f3ee3d.7e867", + "x": 268.4286193847656, + "y": 210.00003242492676, + "z": "d9929d00.bfba4", "wires": [ [ - "9b876278.69aec" + "6a0993ac.72dd54" ] ] }, { - "id": "b6719136.d1d408", + "id": "a9a04009.84cea", "type": "switchNode", "name": "switch vnf_length", "xml": "\n", "comments": "", "outputs": 1, - "x": 625.5273399353027, - "y": 85, - "z": "c1f3ee3d.7e867", + "x": 642.5273399353027, + "y": 95, + "z": "d9929d00.bfba4", "wires": [ [ - "de455676.bfc4b8" + "61b0d7e5.2d7618" ] ] }, { - "id": "de455676.bfc4b8", + "id": "61b0d7e5.2d7618", "type": "other", "name": "NULL", "xml": "\n", "comments": "", "outputs": 1, - "x": 812.194019317627, - "y": 84.33329772949219, - "z": "c1f3ee3d.7e867", + "x": 829.194019317627, + "y": 94.33329772949219, + "z": "d9929d00.bfba4", "wires": [ [ - "caff06c1.7f0ea8" + "bd3df9dd.cbfcb" ] ] }, { - "id": "caff06c1.7f0ea8", + "id": "bd3df9dd.cbfcb", "type": "returnFailure", "name": "return failure", "xml": "\n\t\n\t\n \n", "comments": "", - "x": 993.8606452941895, - "y": 84.33329772949219, - "z": "c1f3ee3d.7e867", + "x": 1010.8606452941895, + "y": 94.33329772949219, + "z": "d9929d00.bfba4", "wires": [] }, { - "id": "2806a3d2.9200ac", + "id": "4ccd346e.b2fa8c", "type": "for", "name": "for each vnf", "xml": "\n", "comments": "", "outputs": 1, - "x": 615.1067600250244, - "y": 139.50003504753113, - "z": "c1f3ee3d.7e867", + "x": 632.1067600250244, + "y": 149.50003504753113, + "z": "d9929d00.bfba4", "wires": [ [ - "baaa4638.c65" + "a043ea5a.d72c3" ] ] }, { - "id": "baaa4638.c65", + "id": "a043ea5a.d72c3", "type": "switchNode", "name": "switch this vnf-id == input vnf-id", "xml": " \n", "comments": "", "outputs": 1, - "x": 866.106855392456, - "y": 135.1666555404663, - "z": "c1f3ee3d.7e867", + "x": 883.106855392456, + "y": 145.1666555404663, + "z": "d9929d00.bfba4", "wires": [ [ - "ac6af028.e56f6" + "1c9dfc9b.785bf3" ] ] }, { - "id": "ac6af028.e56f6", + "id": "1c9dfc9b.785bf3", "type": "outcomeTrue", "name": "true", "xml": "\n", "comments": "", "outputs": 1, - "x": 1084.4401721954346, - "y": 137.1666374206543, - "z": "c1f3ee3d.7e867", + "x": 1101.4401721954346, + "y": 147.1666374206543, + "z": "d9929d00.bfba4", "wires": [ [ - "8e9b59f5.9fbff8" + "969f295d.058158" ] ] }, { - "id": "8e9b59f5.9fbff8", + "id": "969f295d.058158", "type": "set", "name": "set vnf-index", "xml": "\n\n", "comments": "", - "x": 1237.773344039917, - "y": 137.16665840148926, - "z": "c1f3ee3d.7e867", + "x": 1254.773344039917, + "y": 147.16665840148926, + "z": "d9929d00.bfba4", "wires": [] }, { - "id": "e32594d8.14f33", + "id": "40f51cac.5aaffc", "type": "switchNode", "name": "switch vnf-index", "xml": "\n", "comments": "", "outputs": 1, - "x": 629.1067790985107, - "y": 200.5000331401825, - "z": "c1f3ee3d.7e867", + "x": 646.1067790985107, + "y": 210.5000331401825, + "z": "d9929d00.bfba4", "wires": [ [ - "5097b64f.8e649" + "7872a8f4.e17f28" ] ] }, { - "id": "5097b64f.8e649", + "id": "7872a8f4.e17f28", "type": "other", "name": "Null", "xml": "\n", "comments": "", "outputs": 1, - "x": 791.1068248748779, - "y": 199.50003218650818, - "z": "c1f3ee3d.7e867", + "x": 808.1068248748779, + "y": 209.50003218650818, + "z": "d9929d00.bfba4", "wires": [ [ - "f8a1475e.8d7dc8" + "ecf654ed.ac8c08" ] ] }, { - "id": "f8a1475e.8d7dc8", + "id": "ecf654ed.ac8c08", "type": "returnFailure", "name": "return failure", "xml": "\n\t\n\t\n \n", "comments": "", - "x": 940.3569164276123, - "y": 197.27790999412537, - "z": "c1f3ee3d.7e867", + "x": 957.3569164276123, + "y": 207.27790999412537, + "z": "d9929d00.bfba4", "wires": [] }, { - "id": "7c723171.97826", + "id": "1bbfcdc4.cfc1ea", "type": "switchNode", "name": "switch vf-modules.vf-module_length", "xml": "\n", "comments": "", "outputs": 1, - "x": 663.777361869812, - "y": 261.9999940395355, - "z": "c1f3ee3d.7e867", + "x": 680.777361869812, + "y": 271.9999940395355, + "z": "d9929d00.bfba4", "wires": [ [ - "d3dcde48.41f3", - "9c9a7796.629b6" + "76a0bc4c.3ecaac", + "7c11fc12.2ce60c" ] ] }, { - "id": "d3dcde48.41f3", + "id": "76a0bc4c.3ecaac", "type": "other", "name": "Null", "xml": "\n", "comments": "", "outputs": 1, - "x": 894.7773723602295, - "y": 237.99999117851257, - "z": "c1f3ee3d.7e867", + "x": 911.7773723602295, + "y": 247.99999117851257, + "z": "d9929d00.bfba4", "wires": [ [ - "eb2b3da4.ac3bf" + "dcfece83.e40b18" ] ] }, { - "id": "9c9a7796.629b6", + "id": "7c11fc12.2ce60c", "type": "other", "name": "other", "xml": "\n", "comments": "", "outputs": 1, - "x": 894.7773723602295, - "y": 277.9999911785126, - "z": "c1f3ee3d.7e867", + "x": 911.7773723602295, + "y": 287.9999911785126, + "z": "d9929d00.bfba4", "wires": [ [ - "9e326ce7.36ba2" + "5a1242b8.d2d7dc" ] ] }, { - "id": "eb2b3da4.ac3bf", + "id": "dcfece83.e40b18", "type": "set", "name": "set vf-index", "xml": "\n\n", "comments": "", - "x": 1037.2773723602295, - "y": 237.99999117851257, - "z": "c1f3ee3d.7e867", + "x": 1054.2773723602295, + "y": 247.99999117851257, + "z": "d9929d00.bfba4", "wires": [] }, { - "id": "9e326ce7.36ba2", + "id": "5a1242b8.d2d7dc", "type": "block", "name": "block", "xml": "\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1039.1344165802002, - "y": 277.9365031719208, - "z": "c1f3ee3d.7e867", + "x": 1056.1344165802002, + "y": 287.9365031719208, + "z": "d9929d00.bfba4", "wires": [ [ - "bb4f26d0.2b52f8", - "c6144a09.68351" + "fc192c7c.c666c", + "3d110b04.3f7cfc" ] ] }, { - "id": "c6144a09.68351", + "id": "3d110b04.3f7cfc", "type": "set", "name": "set vf-index", "xml": "\n\n\n\n", "comments": "", - "x": 1191.8328914642334, - "y": 247.55560186458752, - "z": "c1f3ee3d.7e867", + "x": 1208.8328914642334, + "y": 257.5556018645875, + "z": "d9929d00.bfba4", "wires": [] }, { - "id": "bb4f26d0.2b52f8", + "id": "fc192c7c.c666c", "type": "for", "name": "for each existing vf-index", "xml": "\n", "comments": "", "outputs": 1, - "x": 1248.261396408081, - "y": 300.7777316570282, - "z": "c1f3ee3d.7e867", + "x": 1265.261396408081, + "y": 310.7777316570282, + "z": "d9929d00.bfba4", "wires": [ [ - "cadc9be5.e759e" + "88b73d6e.6d468" ] ] }, { - "id": "fcf618d7.ce2b98", + "id": "442e188e.f803c", "type": "comment", "name": "make sure this network doesn't exist already", "info": "", "comments": "", - "x": 1471.9121265411377, - "y": 259.03178906440735, - "z": "c1f3ee3d.7e867", + "x": 1488.9121265411377, + "y": 269.03178906440735, + "z": "d9929d00.bfba4", "wires": [] }, { - "id": "cadc9be5.e759e", + "id": "88b73d6e.6d468", "type": "switchNode", "name": "switch vf-module-id found", "xml": "\n", "comments": "", "outputs": 1, - "x": 1523.5471172332764, - "y": 300.3492343425751, - "z": "c1f3ee3d.7e867", + "x": 1540.5471172332764, + "y": 310.3492343425751, + "z": "d9929d00.bfba4", "wires": [ [ - "c1e99eff.0e5d48" + "ea98d10d.89934" ] ] }, { - "id": "c1e99eff.0e5d48", + "id": "ea98d10d.89934", "type": "outcomeTrue", "name": "true", "xml": "\n", "comments": "", "outputs": 1, - "x": 1424.2773151397705, - "y": 358.9206655025482, - "z": "c1f3ee3d.7e867", + "x": 1441.2773151397705, + "y": 368.9206655025482, + "z": "d9929d00.bfba4", "wires": [ [ - "840dd033.d02e68" + "acd8ea2b.eae8b8" ] ] }, { - "id": "840dd033.d02e68", + "id": "acd8ea2b.eae8b8", "type": "returnFailure", "name": "return failure", "xml": "\n\t\n\t\n \n", "comments": "", - "x": 1572.0274181365967, - "y": 358.7778575713746, - "z": "c1f3ee3d.7e867", + "x": 1589.0274181365967, + "y": 368.7778575713746, + "z": "d9929d00.bfba4", "wires": [] }, { - "id": "425e7a20.0b25dc", + "id": "59edc1a3.014a68", "type": "comment", "name": "Take the parameter names by removing prefix", "info": "", "comments": "", - "x": 708.3571338653564, - "y": 334.8294517993927, - "z": "c1f3ee3d.7e867", + "x": 725.3571338653564, + "y": 344.8294517993927, + "z": "d9929d00.bfba4", "wires": [] }, { - "id": "26fdcf88.d41188", + "id": "848c6001.e3ca1", "type": "for", "name": "for loop idx - VF input parameters", "xml": "\n\n", "comments": "", "outputs": 1, - "x": 670.3569316864014, - "y": 378.16278433799744, - "z": "c1f3ee3d.7e867", + "x": 687.3569316864014, + "y": 388.16278433799744, + "z": "d9929d00.bfba4", "wires": [ [ - "d2a88646.f84f6" + "502abba1.49866c" ] ] }, { - "id": "d2a88646.f84f6", + "id": "502abba1.49866c", "type": "block", "name": "block", "xml": "\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 885.135274887085, - "y": 375.71836829185486, - "z": "c1f3ee3d.7e867", + "x": 902.135274887085, + "y": 385.71836829185486, + "z": "d9929d00.bfba4", "wires": [ [ - "6ee856f3.a6b1a", - "7919b72e.9e665" + "e8577fea.dc9eb", + "c88b6740.086e48" ] ] }, { - "id": "6ee856f3.a6b1a", + "id": "e8577fea.dc9eb", "type": "execute", "name": "execute split parameterName", "xml": "\n\n\n\n", "comments": "", "outputs": 1, - "x": 1081.3914775848389, - "y": 353.46650671958923, - "z": "c1f3ee3d.7e867", + "x": 1098.3914775848389, + "y": 363.46650671958923, + "z": "d9929d00.bfba4", "wires": [ [] ] }, { - "id": "7919b72e.9e665", + "id": "c88b6740.086e48", "type": "set", "name": "set parameterName", "xml": "\n\n", "comments": "", - "x": 1050.8359050750732, - "y": 390.46662306785583, - "z": "c1f3ee3d.7e867", + "x": 1067.8359050750732, + "y": 400.46662306785583, + "z": "d9929d00.bfba4", "wires": [] }, { - "id": "9b876278.69aec", + "id": "6a0993ac.72dd54", "type": "block", "name": "block : atomic", "xml": "\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 324.1067714691162, - "y": 395.4961154460907, - "z": "c1f3ee3d.7e867", + "x": 341.1067714691162, + "y": 405.4961154460907, + "z": "d9929d00.bfba4", "wires": [ [ - "26fdcf88.d41188", - "b6719136.d1d408", - "7c723171.97826", - "6c8900d6.0d8e58", - "49bfdced.7c2bbc", - "bf7bb77.41be8c8", - "abc1f25f.e43c08", - "8c309fdb.0398f", - "91a89d7a.a0f178", - "2806a3d2.9200ac", - "e32594d8.14f33", - "2b448345.aa142c", - "d1e54672.f82058", - "abd09dc6.c02b78", - "4b4cd818.a8df08", - "a0154eab.2fbc7" + "848c6001.e3ca1", + "1bbfcdc4.cfc1ea", + "53255108.3aa87", + "eb87c476.701828", + "60cc5c3c.7af384", + "6cc42136.9a456", + "18de011.772867f", + "56659886.9d87b", + "46813925.b275b", + "4dcd3e86.6f4288", + "1e2320ca.16ae1f", + "922a3600.fd199", + "d21f4a10.58364" ] ] }, { - "id": "8c309fdb.0398f", + "id": "18de011.772867f", "type": "returnSuccess", "name": "return success", "xml": "\n\n\n\n", "comments": "", - "x": 611.3292503356934, - "y": 933.00732421875, - "z": "c1f3ee3d.7e867", + "x": 628.3292503356934, + "y": 943.00732421875, + "z": "d9929d00.bfba4", "wires": [] }, { - "id": "abc1f25f.e43c08", + "id": "6cc42136.9a456", "type": "save", "name": "save service relationship in AAI", - "xml": "\n\n\n\n\n", + "xml": "\n\n\n\n\n\n\n\n\n\n\n\n", "comments": "", "outputs": 1, - "x": 666.606746673584, - "y": 891.83349609375, - "z": "c1f3ee3d.7e867", + "x": 683.606746673584, + "y": 901.83349609375, + "z": "d9929d00.bfba4", "wires": [ [] ] }, { - "id": "bf7bb77.41be8c8", + "id": "60cc5c3c.7af384", "type": "save", "name": "save uni resource in AAI", - "xml": "\n\n\n\n\n\n\n\n\n", + "xml": "\n\n\n\n\n\n\n\n\n", "comments": "", "outputs": 1, - "x": 648.6068077087402, - "y": 787.83349609375, - "z": "c1f3ee3d.7e867", + "x": 665.6068077087402, + "y": 797.83349609375, + "z": "d9929d00.bfba4", "wires": [ [] ] }, { - "id": "91a89d7a.a0f178", + "id": "56659886.9d87b", "type": "set", "name": "set vf-module-level-oper-status", "xml": "\n\n\n\n", "comments": "", - "x": 666.1067790985107, - "y": 738.5000331401825, - "z": "c1f3ee3d.7e867", + "x": 683.1067790985107, + "y": 748.5000331401825, + "z": "d9929d00.bfba4", "wires": [] }, { - "id": "49bfdced.7c2bbc", + "id": "eb87c476.701828", "type": "set", "name": "set vf-module-object-path", - "xml": "\n \n\n\n\n", + "xml": "\n \n\n\n\n\n\n \n", "comments": "", - "x": 649.6068153381348, - "y": 696.3335154056549, - "z": "c1f3ee3d.7e867", + "x": 666.6068153381348, + "y": 706.3335154056549, + "z": "d9929d00.bfba4", "wires": [] }, { - "id": "6c8900d6.0d8e58", + "id": "53255108.3aa87", "type": "set", "name": "copy input data to service data", - "xml": "\n\n\n\n\n\n\n\n\n\n\n", + "xml": "\n\n\n\n\n\n\n\n\n\n\n\n\n", "comments": "", - "x": 661.4598903656006, - "y": 644.8296692371368, - "z": "c1f3ee3d.7e867", + "x": 678.4598903656006, + "y": 654.8296692371368, + "z": "d9929d00.bfba4", "wires": [] }, { - "id": "abd09dc6.c02b78", + "id": "1e2320ca.16ae1f", "type": "set", "name": "set new vf-module_length", "xml": "\n", "comments": "", - "x": 641.5273399353027, - "y": 537, - "z": "c1f3ee3d.7e867", + "x": 658.5273399353027, + "y": 547, + "z": "d9929d00.bfba4", "wires": [] }, { - "id": "2b448345.aa142c", + "id": "46813925.b275b", "type": "set", "name": "set vf-module-request-input.", "xml": "\n\n", "comments": "", - "x": 648.526927947998, - "y": 431.9912657737732, - "z": "c1f3ee3d.7e867", + "x": 665.526927947998, + "y": 441.9912657737732, + "z": "d9929d00.bfba4", "wires": [] }, { - "id": "d1e54672.f82058", + "id": "4dcd3e86.6f4288", "type": "call", "name": "call sotn-get-vf-module-uni-param", "xml": "\n", "comments": "", "outputs": 1, - "x": 687.3406028747559, - "y": 484.83709144592285, - "z": "c1f3ee3d.7e867", + "x": 704.3406028747559, + "y": 494.83709144592285, + "z": "d9929d00.bfba4", "wires": [ [] ] }, { - "id": "4b4cd818.a8df08", + "id": "922a3600.fd199", "type": "execute", "name": "execute generate-vf-id", "xml": "\n\n", "comments": "", "outputs": 1, - "x": 640.3406181335449, - "y": 593.3409690856934, - "z": "c1f3ee3d.7e867", + "x": 657.3406181335449, + "y": 603.3409690856934, + "z": "d9929d00.bfba4", "wires": [ [] ] }, { - "id": "a0154eab.2fbc7", + "id": "f8f11492.e98458", "type": "get-resource", "name": "get-resource generic-vnf", "xml": "\n\n\n", "comments": "", "outputs": 1, - "x": 638.5273399353027, - "y": 843, - "z": "c1f3ee3d.7e867", + "x": 655.5273399353027, + "y": 853, + "z": "d9929d00.bfba4", "wires": [ [ - "288ce8e3.088cd" + "3535eafb.6a02f6" ] ] }, { - "id": "42b83e22.53c9", + "id": "670e04c7.7b4c04", "type": "set", "name": "set tmp.relationship_length", "xml": "\n\n", "comments": "", - "x": 1154.52734375, - "y": 801, - "z": "c1f3ee3d.7e867", + "x": 1171.52734375, + "y": 811, + "z": "d9929d00.bfba4", "wires": [] }, { - "id": "288ce8e3.088cd", + "id": "3535eafb.6a02f6", "type": "success", "name": "success", "xml": "\n", "comments": "", "outputs": 1, - "x": 868, - "y": 821, - "z": "c1f3ee3d.7e867", + "x": 885, + "y": 831, + "z": "d9929d00.bfba4", "wires": [ [ - "42b83e22.53c9" + "670e04c7.7b4c04" ] ] + }, + { + "id": "d21f4a10.58364", + "type": "set", + "name": "set vnf-index", + "xml": "\n\n\n\n", + "comments": "", + "x": 626, + "y": 33, + "z": "d9929d00.bfba4", + "wires": [] } ] \ No newline at end of file diff --git a/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-activate.json b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-activate.json index 9730d51f..ce7f41ad 100644 --- a/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-activate.json +++ b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-activate.json @@ -1,20 +1,20 @@ [ { - "id": "f8944be3.096ab8", + "id": "e012ce90.0e58e", "type": "dgstart", "name": "DGSTART", "outputs": 1, - "x": 111, - "y": 56, - "z": "9dcfec88.5f292", + "x": 154, + "y": 93, + "z": "770d39a2.206bf8", "wires": [ [ - "68420034.5c6d98" + "971026a6.52ce9" ] ] }, { - "id": "68420034.5c6d98", + "id": "971026a6.52ce9", "type": "service-logic", "name": "GENERIC-RESOURCE-API ${project.version}", "module": "GENERIC-RESOURCE-API", @@ -22,350 +22,350 @@ "comments": "", "xml": "", "outputs": 1, - "x": 242.2856903076172, - "y": 105.23810863494873, - "z": "9dcfec88.5f292", + "x": 285.2856903076172, + "y": 142.23810863494873, + "z": "770d39a2.206bf8", "wires": [ [ - "9e33642a.9ab6b8" + "424280.3e7be58" ] ] }, { - "id": "9e33642a.9ab6b8", + "id": "424280.3e7be58", "type": "method", "name": "method sotn-vnf-topology-operation-underlay-activate", "xml": "\n", "comments": "", "outputs": 1, - "x": 245.42861938476562, - "y": 190.00003242492676, - "z": "9dcfec88.5f292", + "x": 288.4286193847656, + "y": 227.00003242492676, + "z": "770d39a2.206bf8", "wires": [ [ - "f3fc4610.118298" + "15b1d170.c6c3bf" ] ] }, { - "id": "f3fc4610.118298", + "id": "15b1d170.c6c3bf", "type": "block", "name": "block : atomic", "xml": "", "atomic": "true", "outputs": 1, - "x": 395.238037109375, - "y": 319.6666564941406, - "z": "9dcfec88.5f292", + "x": 438.238037109375, + "y": 356.6666564941406, + "z": "770d39a2.206bf8", "wires": [ [ - "321f78ca.ccdc38", - "47a0d8c5.66ef38", - "30a9bb6d.ac3de4", - "470fa21f.c90dac", - "a9e79f17.0260f", - "79db1524.d2b97c", - "47e6b5ed.41cf1c" + "d341e8da.386dc8", + "7757d326.0ab11c", + "28b09a42.4448ee", + "3ec3b54e.f18002", + "363c01cb.431f2e", + "b58db0f2.2bd788", + "78a6cae.62d4c34" ] ] }, { - "id": "321f78ca.ccdc38", + "id": "d341e8da.386dc8", "type": "set", "name": "set vnf-level-oper-status to Active", "xml": "\n\n\n", "comments": "", - "x": 738.3849563598633, - "y": 556.6705458434299, - "z": "9dcfec88.5f292", + "x": 781.3849563598633, + "y": 593.6705458434299, + "z": "770d39a2.206bf8", "wires": [] }, { - "id": "47a0d8c5.66ef38", + "id": "7757d326.0ab11c", "type": "returnSuccess", "name": "return success", "xml": "\n\n\n\n", "comments": "", - "x": 658.571647644043, - "y": 682.5970833571628, - "z": "9dcfec88.5f292", + "x": 701.571647644043, + "y": 719.5970833571628, + "z": "770d39a2.206bf8", "wires": [] }, { - "id": "30a9bb6d.ac3de4", + "id": "28b09a42.4448ee", "type": "set", "name": "set vnf-index and vnf-object-path", "xml": "\n\n", "comments": "", - "x": 744.5716018676758, - "y": 504.5968001158908, - "z": "9dcfec88.5f292", + "x": 787.5716018676758, + "y": 541.5968001158908, + "z": "770d39a2.206bf8", "wires": [] }, { - "id": "470fa21f.c90dac", + "id": "3ec3b54e.f18002", "type": "switchNode", "name": "switch service-data.vnfs.vnf_length", "xml": "\n", "comments": "", "outputs": 1, - "x": 753, - "y": 259, - "z": "9dcfec88.5f292", + "x": 796, + "y": 296, + "z": "770d39a2.206bf8", "wires": [ [ - "bde1ee44.7683d", - "2e788e91.c6a1c2", - "946699e9.3b5b1" + "2a1b5222.0a12ce", + "7071c692.fef0f", + "f5af0773.6ebfd8" ] ] }, { - "id": "946699e9.3b5b1", + "id": "f5af0773.6ebfd8", "type": "outcome", "name": "0", "xml": "\n", "comments": "", "outputs": 1, - "x": 1145.968994140625, - "y": 224.96875, - "z": "9dcfec88.5f292", + "x": 1188.968994140625, + "y": 261.96875, + "z": "770d39a2.206bf8", "wires": [ [ - "5b4e6761.75d918" + "deb6d8c5.8a0d18" ] ] }, { - "id": "5b4e6761.75d918", + "id": "deb6d8c5.8a0d18", "type": "returnFailure", "name": "return failure", "xml": "\n\t\n\t\n \n", "comments": "", - "x": 1300.7778816223145, - "y": 243.889018535614, - "z": "9dcfec88.5f292", + "x": 1343.7778816223145, + "y": 280.889018535614, + "z": "770d39a2.206bf8", "wires": [] }, { - "id": "bde1ee44.7683d", + "id": "2a1b5222.0a12ce", "type": "other", "name": "Null", "xml": "\n", "comments": "", "outputs": 1, - "x": 1139.0001335144043, - "y": 264.00007152557373, - "z": "9dcfec88.5f292", + "x": 1182.0001335144043, + "y": 301.00007152557373, + "z": "770d39a2.206bf8", "wires": [ [ - "5b4e6761.75d918" + "deb6d8c5.8a0d18" ] ] }, { - "id": "2e788e91.c6a1c2", + "id": "7071c692.fef0f", "type": "other", "name": "other", "xml": "\n", "comments": "", "outputs": 1, - "x": 1132.0005416870117, - "y": 297.000075340271, - "z": "9dcfec88.5f292", + "x": 1175.0005416870117, + "y": 334.000075340271, + "z": "770d39a2.206bf8", "wires": [ [ - "ebf17a44.2210a8" + "16d2cb29.ef702d" ] ] }, { - "id": "ebf17a44.2210a8", + "id": "16d2cb29.ef702d", "type": "block", "name": "block : atomic", "xml": "", "atomic": "true", "outputs": 1, - "x": 1279.2700843811035, - "y": 297.5547204017639, - "z": "9dcfec88.5f292", + "x": 1322.2700843811035, + "y": 334.5547204017639, + "z": "770d39a2.206bf8", "wires": [ [ - "e3ab2fd7.ebbf08" + "ed1ae4ee.47337" ] ] }, { - "id": "e3ab2fd7.ebbf08", + "id": "ed1ae4ee.47337", "type": "for", "name": "for vidx..service-data.vnfs.vnf_length[]", "xml": "\n", "comments": "", "outputs": 1, - "x": 1525.2862014770508, - "y": 304.42864084243774, - "z": "9dcfec88.5f292", + "x": 1568.2862014770508, + "y": 341.42864084243774, + "z": "770d39a2.206bf8", "wires": [ [ - "18572251.98d83e" + "3d63efba.81c87" ] ] }, { - "id": "18572251.98d83e", + "id": "3d63efba.81c87", "type": "block", "name": "block", "xml": "\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1744.6358337402344, - "y": 303.96872091293335, - "z": "9dcfec88.5f292", + "x": 1787.6358337402344, + "y": 340.96872091293335, + "z": "770d39a2.206bf8", "wires": [ [ - "4a39ea58.7fb184" + "db2db94d.9596f8" ] ] }, { - "id": "4a39ea58.7fb184", + "id": "db2db94d.9596f8", "type": "switchNode", "name": "switch vnfid found", "xml": "\n\n", "comments": "", "outputs": 1, - "x": 1898.715431213379, - "y": 303.67880296707153, - "z": "9dcfec88.5f292", + "x": 1941.715431213379, + "y": 340.67880296707153, + "z": "770d39a2.206bf8", "wires": [ [ - "669b0d11.8a0824" + "b38b8c2b.ab959" ] ] }, { - "id": "669b0d11.8a0824", + "id": "b38b8c2b.ab959", "type": "outcomeTrue", "name": "true", "xml": "\n", "comments": "", "outputs": 1, - "x": 2109.6675758361816, - "y": 306.571494102478, - "z": "9dcfec88.5f292", + "x": 2152.6675758361816, + "y": 343.571494102478, + "z": "770d39a2.206bf8", "wires": [ [ - "e89a8750.1f8e18" + "f56ad8f6.f25e88" ] ] }, { - "id": "e89a8750.1f8e18", + "id": "f56ad8f6.f25e88", "type": "set", "name": "set tmp.vidx and ctx.vnf-data", "xml": "\n\n\n", "comments": "", - "x": 2319.199951171875, - "y": 308.32159423828125, - "z": "9dcfec88.5f292", + "x": 2362.199951171875, + "y": 345.32159423828125, + "z": "770d39a2.206bf8", "wires": [] }, { - "id": "a9e79f17.0260f", + "id": "363c01cb.431f2e", "type": "save", "name": "update AnAI - vnf-instance.orchestration-status", "xml": "\n\n", "comments": "", "outputs": 1, - "x": 763.9999618530273, - "y": 623.0103714736179, - "z": "9dcfec88.5f292", + "x": 806.9999618530273, + "y": 660.0103714736179, + "z": "770d39a2.206bf8", "wires": [ [] ] }, { - "id": "79db1524.d2b97c", + "id": "b58db0f2.2bd788", "type": "set", "name": "copy input data to service data", "xml": "\n\n\n", "comments": "", - "x": 743.0000762939453, - "y": 454.01033284980804, - "z": "9dcfec88.5f292", + "x": 786.0000762939453, + "y": 491.01033284980804, + "z": "770d39a2.206bf8", "wires": [] }, { - "id": "47e6b5ed.41cf1c", + "id": "78a6cae.62d4c34", "type": "switchNode", "name": "switch vnf-level-oper-status", "xml": "\n", "comments": "", "outputs": 1, - "x": 729.7499389648438, - "y": 359.00390270072967, - "z": "9dcfec88.5f292", + "x": 772.7499389648438, + "y": 396.00390270072967, + "z": "770d39a2.206bf8", "wires": [ [ - "3e2d00ea.214d9", - "ed7ee56e.298fc8" + "d6917198.13129", + "178db909.328e8f" ] ] }, { - "id": "3e2d00ea.214d9", + "id": "d6917198.13129", "type": "outcome", "name": "outcome Created", "xml": "\n", "comments": "", "outputs": 1, - "x": 1109.5833320617676, - "y": 364.1149909766391, - "z": "9dcfec88.5f292", + "x": 1152.5833320617676, + "y": 401.1149909766391, + "z": "770d39a2.206bf8", "wires": [ [ - "34b25335.603514" + "6cd721df.116148" ] ] }, { - "id": "ed7ee56e.298fc8", + "id": "178db909.328e8f", "type": "other", "name": "other", "xml": "\n", "comments": "", "outputs": 1, - "x": 1087.583351135254, - "y": 414.1150024207309, - "z": "9dcfec88.5f292", + "x": 1130.583351135254, + "y": 451.1150024207309, + "z": "770d39a2.206bf8", "wires": [ [ - "4a64950b.2e4a84" + "ff0fdf62.38c4c" ] ] }, { - "id": "4a64950b.2e4a84", + "id": "ff0fdf62.38c4c", "type": "returnFailure", "name": "return failure", "xml": "\n\t\n\t\n ", "comments": "", - "x": 1247.0831184387207, - "y": 417.1150014670566, - "z": "9dcfec88.5f292", + "x": 1290.0831184387207, + "y": 454.1150014670566, + "z": "770d39a2.206bf8", "wires": [] }, { - "id": "34b25335.603514", + "id": "6cd721df.116148", "type": "block", "name": "block : atomic", "xml": "", "atomic": "true", "outputs": 1, - "x": 1319.889705657959, - "y": 375.44016626197845, - "z": "9dcfec88.5f292", + "x": 1362.889705657959, + "y": 412.44016626197845, + "z": "770d39a2.206bf8", "wires": [ [] ] diff --git a/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-create.json b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-create.json index fe1d70f2..f834495c 100644 --- a/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-create.json +++ b/platform-logic/generic-resource-api/src/main/json/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-create.json @@ -1,20 +1,20 @@ [ { - "id": "630403de.7c4dfc", + "id": "c51171cf.967f48", "type": "dgstart", "name": "DGSTART", "outputs": 1, - "x": 130, - "y": 71, - "z": "adc7d7d7.2ba55", + "x": 215, + "y": 61, + "z": "2acad42e.98ae6c", "wires": [ [ - "80c50a18.8d75c" + "dc4fe414.ffc068" ] ] }, { - "id": "80c50a18.8d75c", + "id": "dc4fe414.ffc068", "type": "service-logic", "name": "GENERIC-RESOURCE-API ${project.version}", "module": "GENERIC-RESOURCE-API", @@ -22,481 +22,481 @@ "comments": "", "xml": "", "outputs": 1, - "x": 414.2856903076172, - "y": 132.23810863494873, - "z": "adc7d7d7.2ba55", + "x": 499.2856903076172, + "y": 122.23810863494873, + "z": "2acad42e.98ae6c", "wires": [ [ - "2da8c00e.5874f" + "7bc6b10b.958808" ] ] }, { - "id": "2da8c00e.5874f", + "id": "7bc6b10b.958808", "type": "method", "name": "method sotn-vnf-topology-operation-underlay-create", "xml": "\n", "comments": "", "outputs": 1, - "x": 420.42860412597656, - "y": 217.00003051757812, - "z": "adc7d7d7.2ba55", + "x": 505.42860412597656, + "y": 207.00003051757812, + "z": "2acad42e.98ae6c", "wires": [ [ - "c4830870.f71be" + "abdb94c8.92ca2" ] ] }, { - "id": "c4830870.f71be", + "id": "abdb94c8.92ca2", "type": "block", "name": "block : atomic", "xml": "", "atomic": "true", "outputs": 1, - "x": 790.238037109375, - "y": 241.66668701171875, - "z": "adc7d7d7.2ba55", + "x": 875.238037109375, + "y": 231.66668701171875, + "z": "2acad42e.98ae6c", "wires": [ [ - "d09b0487.d267f8", - "4e465113.c34b3", - "6d4651f1.9a44a", - "b93f8dee.f542a", - "18feff02.43bff9", - "e9275990.6ea4e", - "273e48bf.25ca5", - "4b57404f.d373b8", - "4822a493.73c54c", - "567e338.a899b4c", - "616296b0.6f36", - "cdecd2ad.ea2458", - "9b5e953e.0822e8" + "ebb673b7.95bb08", + "b3e2958c.9ee52", + "e1a71481.b347c", + "824a2826.fb7a5", + "23822c5.535c954", + "db0823f0.79d838", + "9d444bb6.e5cc7", + "d8fc2b2b.da9d38", + "7de6e31b.ca690c", + "37ce30ff.3ae068", + "a026f709.be666", + "d3e90ee2.8cdb8", + "4530b43d.793bcc" ] ] }, { - "id": "4e465113.c34b3", + "id": "b3e2958c.9ee52", "type": "set", "name": "set vnf-level-oper-status to Created", "xml": "\n\n\n\n", "comments": "", - "x": 1212.3848495483398, - "y": 605.6706197531894, - "z": "adc7d7d7.2ba55", + "x": 1297.3848495483398, + "y": 595.6706197531894, + "z": "2acad42e.98ae6c", "wires": [] }, { - "id": "d09b0487.d267f8", + "id": "ebb673b7.95bb08", "type": "set", "name": "copy input data to service data", "xml": "\n\n\n\n\n\n\n\n", "comments": "", - "x": 1204.238037109375, - "y": 500.6668718131259, - "z": "adc7d7d7.2ba55", + "x": 1289.238037109375, + "y": 490.6668718131259, + "z": "2acad42e.98ae6c", "wires": [] }, { - "id": "18feff02.43bff9", + "id": "23822c5.535c954", "type": "execute", "name": "execute generate-vnf-index", "xml": "\n\n", "comments": "", "outputs": 1, - "x": 1192.5715408325195, - "y": 450.3334558280185, - "z": "adc7d7d7.2ba55", + "x": 1277.5715408325195, + "y": 440.3334558280185, + "z": "2acad42e.98ae6c", "wires": [ [] ] }, { - "id": "567e338.a899b4c", + "id": "37ce30ff.3ae068", "type": "set", "name": "set vnf-index to service data", "xml": "\n\n", "comments": "", - "x": 1203.5716171264648, - "y": 557.3334596427158, - "z": "adc7d7d7.2ba55", + "x": 1288.5716171264648, + "y": 547.3334596427158, + "z": "2acad42e.98ae6c", "wires": [] }, { - "id": "6d4651f1.9a44a", + "id": "e1a71481.b347c", "type": "switchNode", "name": "switch service-data.vnfs.vnf_length", "xml": "\n", "comments": "", "outputs": 1, - "x": 1219.5713577270508, - "y": 120.33337858039886, - "z": "adc7d7d7.2ba55", + "x": 1304.5713577270508, + "y": 110.33337858039886, + "z": "2acad42e.98ae6c", "wires": [ [ - "c4be7092.54bab", - "bebf6c90.f10358" + "2aa8bb99.a4b4cc", + "2ff8b11d.a3a30e" ] ] }, { - "id": "c4be7092.54bab", + "id": "2aa8bb99.a4b4cc", "type": "other", "name": "NULL", "xml": "\n", "comments": "", "outputs": 1, - "x": 1454.285743713379, - "y": 115.47619893867522, - "z": "adc7d7d7.2ba55", + "x": 1539.285743713379, + "y": 105.47619893867522, + "z": "2acad42e.98ae6c", "wires": [ [ - "55302818.0621f" + "9f14dc9.0335b2" ] ] }, { - "id": "55302818.0621f", + "id": "9f14dc9.0335b2", "type": "set", "name": "set vnf-index=0", "xml": "\n\n", "comments": "", - "x": 1614.5714492797852, - "y": 115.4762904914096, - "z": "adc7d7d7.2ba55", + "x": 1699.5714492797852, + "y": 105.4762904914096, + "z": "2acad42e.98ae6c", "wires": [] }, { - "id": "bebf6c90.f10358", + "id": "2ff8b11d.a3a30e", "type": "other", "name": "other", "xml": "\n", "comments": "", "outputs": 1, - "x": 1450.714282989502, - "y": 148.76203039009124, - "z": "adc7d7d7.2ba55", + "x": 1535.714282989502, + "y": 138.76203039009124, + "z": "2acad42e.98ae6c", "wires": [ [ - "d6fccb24.04a71" + "c07d0fb1.6b3d1" ] ] }, { - "id": "543cefe7.718a7", + "id": "1270cfd.bc37b3", "type": "set", "name": "set vnf-index = vnf_length", "xml": "\n\n", "comments": "", - "x": 1843.5715255737305, - "y": 127.04775598365813, - "z": "adc7d7d7.2ba55", + "x": 1928.5715255737305, + "y": 117.04775598365813, + "z": "2acad42e.98ae6c", "wires": [] }, { - "id": "5d18757b.848c24", + "id": "41d9a632.4f7ff", "type": "for", "name": "for each existing VNF", "xml": "\n", "comments": "", "outputs": 1, - "x": 1832.000144958496, - "y": 162.0477278502658, - "z": "adc7d7d7.2ba55", + "x": 1917.000144958496, + "y": 152.0477278502658, + "z": "2acad42e.98ae6c", "wires": [ [ - "8ce4ca7d.ffb71" + "648fa43a.d20ca4" ] ] }, { - "id": "d6fccb24.04a71", + "id": "c07d0fb1.6b3d1", "type": "block", "name": "block", "xml": "\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1585.428565979004, - "y": 150.76199987251312, - "z": "adc7d7d7.2ba55", + "x": 1670.428565979004, + "y": 140.76199987251312, + "z": "2acad42e.98ae6c", "wires": [ [ - "543cefe7.718a7", - "5d18757b.848c24" + "1270cfd.bc37b3", + "41d9a632.4f7ff" ] ] }, { - "id": "8ce4ca7d.ffb71", + "id": "648fa43a.d20ca4", "type": "switchNode", "name": "switch vnf-information.vnf-id == service-data.vnfs.vnf[].vnf-id", "xml": "\n", "comments": "", "outputs": 1, - "x": 2225.2858810424805, - "y": 162.6192119391635, - "z": "adc7d7d7.2ba55", + "x": 2310.2858810424805, + "y": 152.6192119391635, + "z": "2acad42e.98ae6c", "wires": [ [ - "46146016.cb5b58" + "fcc42c1e.bc5548" ] ] }, { - "id": "46146016.cb5b58", + "id": "fcc42c1e.bc5548", "type": "outcomeTrue", "name": "true", "xml": "\n", "comments": "", "outputs": 1, - "x": 2506.5715827941895, - "y": 161.1906173499301, - "z": "adc7d7d7.2ba55", + "x": 2591.5715827941895, + "y": 151.1906173499301, + "z": "2acad42e.98ae6c", "wires": [ [ - "14fd2dd2.04e2ea" + "51470afc.fd843c" ] ] }, { - "id": "fac5d84d.dacdb8", + "id": "75fcb25e.311ddc", "type": "comment", "name": "make sure this vnf-id doesn't exist already", "info": "", "comments": "", - "x": 2194.428497314453, - "y": 126.19060399848968, - "z": "adc7d7d7.2ba55", + "x": 2279.428497314453, + "y": 116.19060399848968, + "z": "2acad42e.98ae6c", "wires": [] }, { - "id": "b93f8dee.f542a", + "id": "824a2826.fb7a5", "type": "set", "name": "set new vnf_length", "xml": "\n\n", "comments": "", - "x": 1150.571533203125, - "y": 398.33343505859375, - "z": "adc7d7d7.2ba55", + "x": 1235.571533203125, + "y": 388.33343505859375, + "z": "2acad42e.98ae6c", "wires": [] }, { - "id": "e9275990.6ea4e", + "id": "db0823f0.79d838", "type": "returnSuccess", "name": "return success", "xml": "\n\n\n\n", "comments": "", - "x": 1151.5715026855469, - "y": 868.5969713004306, - "z": "adc7d7d7.2ba55", + "x": 1236.5715026855469, + "y": 858.5969713004306, + "z": "2acad42e.98ae6c", "wires": [] }, { - "id": "4822a493.73c54c", + "id": "7de6e31b.ca690c", "type": "save", "name": "save service relationship in AAI", "xml": "\n\n\n\n\n\n\n\n\n", "comments": "", "outputs": 1, - "x": 1184.2382736206055, - "y": 817.5968644889072, - "z": "adc7d7d7.2ba55", + "x": 1269.2382736206055, + "y": 807.5968644889072, + "z": "2acad42e.98ae6c", "wires": [ [] ] }, { - "id": "273e48bf.25ca5", + "id": "9d444bb6.e5cc7", "type": "set", "name": "set vnf-index and vnf-object-path", "xml": "\n\n", "comments": "", - "x": 1205.571533203125, - "y": 646.5968902381137, - "z": "adc7d7d7.2ba55", + "x": 1290.571533203125, + "y": 636.5968902381137, + "z": "2acad42e.98ae6c", "wires": [] }, { - "id": "14fd2dd2.04e2ea", + "id": "51470afc.fd843c", "type": "returnFailure", "name": "return failure", "xml": "\n\t\n\t\n \n", "comments": "", - "x": 2635.142951965332, - "y": 212.19063165504485, - "z": "adc7d7d7.2ba55", + "x": 2720.142951965332, + "y": 202.19063165504485, + "z": "2acad42e.98ae6c", "wires": [] }, { - "id": "4b57404f.d373b8", + "id": "d8fc2b2b.da9d38", "type": "save", "name": "save AnAI - vnf-instance.orchestration-status", "xml": "\n\n\n\n\n\n\n", "comments": "", "outputs": 1, - "x": 1260.5458374023438, - "y": 756.2471072943881, - "z": "adc7d7d7.2ba55", + "x": 1345.5458374023438, + "y": 746.2471072943881, + "z": "2acad42e.98ae6c", "wires": [ [] ] }, { - "id": "1ddf67d5.b35a7", + "id": "766790a.b9c79f", "type": "comment", "name": "TODO: change AAI models", "info": "", "comments": "", - "x": 1194.1820983886719, - "y": 715.9743230612949, - "z": "adc7d7d7.2ba55", + "x": 1279.1820983886719, + "y": 705.9743230612949, + "z": "2acad42e.98ae6c", "wires": [] }, { - "id": "eb3e5b54.ee7cc8", + "id": "a966163d.bdafe8", "type": "execute", "name": "execute split parameterName", "xml": "\n\n\n\n", "comments": "", "outputs": 1, - "x": 1620.7395858764648, - "y": 209.75002291519195, - "z": "adc7d7d7.2ba55", + "x": 1705.7395858764648, + "y": 199.75002291519195, + "z": "2acad42e.98ae6c", "wires": [ [] ] }, { - "id": "a93d9d55.574d98", + "id": "1dc30465.a19184", "type": "block", "name": "block", "xml": "\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1424.483383178711, - "y": 214.00189593154937, - "z": "adc7d7d7.2ba55", + "x": 1509.483383178711, + "y": 204.00189593154937, + "z": "2acad42e.98ae6c", "wires": [ [ - "eb3e5b54.ee7cc8", - "34cb35bb.2ef0aa" + "a966163d.bdafe8", + "a75d0084.0dea2" ] ] }, { - "id": "616296b0.6f36", + "id": "a026f709.be666", "type": "for", "name": "for loop idx - VNF input parameters", "xml": "\n", "comments": "", "outputs": 1, - "x": 1209.7050399780273, - "y": 216.44631197769195, - "z": "adc7d7d7.2ba55", + "x": 1294.7050399780273, + "y": 206.44631197769195, + "z": "2acad42e.98ae6c", "wires": [ [ - "a93d9d55.574d98" + "1dc30465.a19184" ] ] }, { - "id": "cdecd2ad.ea2458", + "id": "d3e90ee2.8cdb8", "type": "set", "name": "set vnf-request-input.", "xml": "\n\n", "comments": "", - "x": 1166.7046737670898, - "y": 286.77101900894195, - "z": "adc7d7d7.2ba55", + "x": 1251.7046737670898, + "y": 276.77101900894195, + "z": "2acad42e.98ae6c", "wires": [] }, { - "id": "34cb35bb.2ef0aa", + "id": "a75d0084.0dea2", "type": "set", "name": "set parameterName", "xml": "\n\n", "comments": "", - "x": 1597.7395858764648, - "y": 255.75002291519195, - "z": "adc7d7d7.2ba55", + "x": 1682.7395858764648, + "y": 245.75002291519195, + "z": "2acad42e.98ae6c", "wires": [] }, { - "id": "9b5e953e.0822e8", + "id": "4530b43d.793bcc", "type": "for", "name": "for each sdwan-get-request-input-param", "xml": "\n", "comments": "", "outputs": 1, - "x": 1222.7395858764648, - "y": 338.75002291519195, - "z": "adc7d7d7.2ba55", + "x": 1307.7395858764648, + "y": 328.75002291519195, + "z": "2acad42e.98ae6c", "wires": [ [ - "42766226.3db64c" + "dc4ef169.09fde8" ] ] }, { - "id": "42766226.3db64c", + "id": "dc4ef169.09fde8", "type": "block", "name": "block", "xml": "\n", "atomic": "false", "comments": "", "outputs": 1, - "x": 1448.9722518920898, - "y": 337.09377291519195, - "z": "adc7d7d7.2ba55", + "x": 1533.9722518920898, + "y": 327.09377291519195, + "z": "2acad42e.98ae6c", "wires": [ [ - "85dff1eb.0e22b8" + "b619e27a.688618" ] ] }, { - "id": "85dff1eb.0e22b8", + "id": "b619e27a.688618", "type": "switchNode", "name": "switch vnf name", "xml": "\n", "comments": "", "outputs": 1, - "x": 1605.4722518920898, - "y": 335.0938339503482, - "z": "adc7d7d7.2ba55", + "x": 1690.4722518920898, + "y": 325.0938339503482, + "z": "2acad42e.98ae6c", "wires": [ [ - "2f903a44.280976" + "91d21a65.20ca" ] ] }, { - "id": "2f903a44.280976", + "id": "91d21a65.20ca", "type": "outcomeTrue", "name": "true", "xml": "\n", "comments": "", "outputs": 1, - "x": 1766.4726181030273, - "y": 335.09389498550445, - "z": "adc7d7d7.2ba55", + "x": 1851.4726181030273, + "y": 325.09389498550445, + "z": "2acad42e.98ae6c", "wires": [ [ - "55b726c2.cd02d" + "9c25080f.021b" ] ] }, { - "id": "55b726c2.cd02d", + "id": "9c25080f.021b", "type": "set", "name": "set vnf name", "xml": "\n\n", "comments": "", - "x": 1924.4727401733398, - "y": 333.6939316065982, - "z": "adc7d7d7.2ba55", + "x": 2009.4727401733398, + "y": 323.6939316065982, + "z": "2acad42e.98ae6c", "wires": [] } ] \ No newline at end of file diff --git a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-create-otn-tunnel.xml b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-create-otn-tunnel.xml index 4527b788..c6505ad1 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-create-otn-tunnel.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-create-otn-tunnel.xml @@ -3,27 +3,34 @@ 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}'> - - - + + + + - + - - - - - - - + + + + + + + + + + + + - - - - + + + + + @@ -44,29 +51,34 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + - + diff --git a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-get-otn-tunnel-path-from-oof.xml b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-get-otn-tunnel-path-from-oof.xml index 9a86f933..7159b23a 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-get-otn-tunnel-path-from-oof.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-get-otn-tunnel-path-from-oof.xml @@ -27,222 +27,240 @@ - + - + + - - - - - - - - + + + + + + + + + + - - - - - + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + - + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-get-vf-module-uni-param.xml b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-get-vf-module-uni-param.xml index 8629403f..5297297a 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-get-vf-module-uni-param.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-get-vf-module-uni-param.xml @@ -12,10 +12,10 @@ - + - + diff --git a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-activate.xml b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-activate.xml index e2e61c6c..1f3e0f7f 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-activate.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-activate.xml @@ -1,69 +1,17 @@ + xmlns='http://www.onap.org/sdnc/svclogic' + xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - - - - - - - - - + diff --git a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-create.xml b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-create.xml index 94e218b0..98ca621f 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-create.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-l2vpn-create.xml @@ -1,27 +1,29 @@ + xmlns='http://www.onap.org/sdnc/svclogic' + xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'> - + + + + - + - + - - + + - + @@ -29,62 +31,102 @@ - + - + - + - - - - + - + + + + + + + + - + - + - - - - - - - - - + + + + - + + + + + + + + + + - - - + + + + - - + + + - - + + + + + + + + + + + + + + + + + diff --git a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-activate.xml b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-activate.xml index ec76dae8..406f52c0 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-activate.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-activate.xml @@ -61,7 +61,6 @@ - @@ -71,17 +70,18 @@ + - + - + + @@ -168,61 +168,30 @@ + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-create.xml b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-create.xml index e582fb7e..9648bb69 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-create.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vf-operation-uni-create.xml @@ -3,33 +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}'> - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + @@ -87,6 +63,7 @@ + @@ -95,7 +72,7 @@ + '/service-data/vnfs/vnf/' + $service-data.vnfs.vnf[$vnf-index].vnf-id + '/vnf-data/vf-modules/vf-module/' - + $vf-module-topology-operation-input.vf-module-information.vf-module-id + + $prop.vf-id + '/vf-module-data/vf-module-topology/'`"/> + @@ -116,32 +94,28 @@ - - + + - - - - - - - + + + + + + + - - - - + + + + diff --git a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-activate.xml b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-activate.xml index 69344e8a..3210405e 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-activate.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-activate.xml @@ -1,6 +1,6 @@ + xmlns='http://www.onap.org/sdnc/svclogic' + xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'> @@ -61,9 +61,9 @@ - + diff --git a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-create.xml b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-create.xml index ba1c3cdd..07ba2028 100644 --- a/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-create.xml +++ b/platform-logic/generic-resource-api/src/main/xml/sotn_nni/GENERIC-RESOURCE-API_sotn-vnf-topology-operation-underlay-create.xml @@ -1,7 +1,7 @@ - + xmlns='http://www.onap.org/sdnc/svclogic' + xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xsi:schemaLocation='http://www.onap.org/sdnc/svclogic ./svclogic.xsd' module='GENERIC-RESOURCE-API' version='${project.version}'> + @@ -81,9 +81,9 @@ - + @@ -92,11 +92,11 @@ - + -- cgit 1.2.3-korg