From d7fb6e5e9d05edadaf1478e07100c8e88b7af782 Mon Sep 17 00:00:00 2001 From: atriki Date: Wed, 11 Dec 2019 14:57:57 +0100 Subject: [PATCH] Update config files and tests - correct the ip-Addresses in some config files - consider different clfi for different fibers - move the opposite-link, TE-metric and clfi fields to org-openroadm-common-network instead of org-openroadm-network-topology:OMS-attributes JIRA: TRNSPRTPCE-95 Change-Id: I77aa2130b56eb82157e4edce206aea73711ae497 Signed-off-by: atriki --- tests/sample_configs/NW-for-test-5-4.xml | 300 +++++++----------- tests/sample_configs/NW-simple-topology.xml | 20 +- .../gnpy/openroadmTopology.json | 98 +++--- tests/sample_configs/honeynode-topo.xml | 10 +- .../openroadm/1.2.1/oper-XPDRC.xml | 2 +- .../openroadm/2.2.1/oper-ROADMB.xml | 4 +- .../openroadm/2.2.1/oper-ROADMC.xml | 4 +- .../openroadm/2.2.1/oper-XPDRC.xml | 10 +- .../transportpce_tests/1.2.1/test_end2end.py | 2 - .../transportpce_tests/1.2.1/test_topology.py | 44 ++- .../transportpce_tests/2.2.1/test_end2end.py | 3 - .../transportpce_tests/2.2.1/test_topology.py | 231 ++++++++++++-- 12 files changed, 411 insertions(+), 317 deletions(-) diff --git a/tests/sample_configs/NW-for-test-5-4.xml b/tests/sample_configs/NW-for-test-5-4.xml index e79275c45..0cefc4811 100644 --- a/tests/sample_configs/NW-for-test-5-4.xml +++ b/tests/sample_configs/NW-for-test-5-4.xml @@ -2703,15 +2703,14 @@ OpenROADM-1-1-DEG1-to-OpenROADM-1-2-DEG1 OpenROADM-1-2-DEG1-to-OpenROADM-1-1-DEG1 + fiber1112 + 10 1 ROADM-TO-ROADM OpenROADM-1-1-DEG1DEG1-TTP-TX OpenROADM-1-2-DEG1DEG1-TTP-RX - OpenROADM-1-2-DEG1-to-OpenROADM-1-1-DEG1 - 10 - fiber1 true 11.4 12 @@ -2728,15 +2727,14 @@ OpenROADM-1-2-DEG1-to-OpenROADM-1-1-DEG1 OpenROADM-1-1-DEG1-to-OpenROADM-1-2-DEG1 + fiber1211 + 10 1 ROADM-TO-ROADM OpenROADM-1-2-DEG1DEG1-TTP-TX OpenROADM-1-1-DEG1DEG1-TTP-RX - OpenROADM-1-1-DEG1-to-OpenROADM-1-2-DEG1 - 10 - fiber2 true 11.4 12 @@ -2753,15 +2751,14 @@ OpenROADM-1-2-DEG2-to-OpenROADM-1-3-DEG2 OpenROADM-1-3-DEG2-to-OpenROADM-1-2-DEG2 + fiber1213 + 10 1 ROADM-TO-ROADM OpenROADM-1-2-DEG2DEG2-TTP-TX OpenROADM-1-3-DEG2DEG2-TTP-RX - OpenROADM-1-3-DEG2-to-OpenROADM-1-2-DEG2 - 10 - fiber56 true 11.4 12 @@ -2779,14 +2776,13 @@ OpenROADM-1-3-DEG2-to-OpenROADM-1-2-DEG2 OpenROADM-1-2-DEG2-to-OpenROADM-1-3-DEG2 1 + fiber1312 + 10 ROADM-TO-ROADM OpenROADM-1-3-DEG2DEG2-TTP-TX OpenROADM-1-2-DEG2DEG2-TTP-RX - OpenROADM-1-2-DEG2-to-OpenROADM-1-3-DEG2 - 10 - fiber3 true 11.4 12 @@ -2803,15 +2799,14 @@ OpenROADM-1-3-DEG1-to-OpenROADM-1-4-DEG1 OpenROADM-1-4-DEG1-to-OpenROADM-1-3-DEG1 + fiber1314 + 10 1 ROADM-TO-ROADM OpenROADM-1-3-DEG1DEG1-TTP-TX OpenROADM-1-4-DEG1DEG1-TTP-RX - OpenROADM-1-4-DEG1-to-OpenROADM-1-3-DEG1 - 10 - fiber true 11.4 12 @@ -2828,15 +2823,14 @@ OpenROADM-1-4-DEG1-to-OpenROADM-1-3-DEG1 OpenROADM-1-3-DEG1-to-OpenROADM-1-4-DEG1 + fiber1413 + 10 1 ROADM-TO-ROADM OpenROADM-1-4-DEG1DEG1-TTP-TX OpenROADM-1-3-DEG1DEG1-TTP-RX - OpenROADM-1-3-DEG1-to-OpenROADM-1-4-DEG1 - 10 - fiber4 true 11.4 12 @@ -2853,15 +2847,14 @@ OpenROADM-1-4-DEG2-to-OpenROADM-1-1-DEG2 OpenROADM-1-1-DEG2-to-OpenROADM-1-4-DEG2 + fiber1411 + 10 1 ROADM-TO-ROADM OpenROADM-1-4-DEG2DEG2-TTP-TX OpenROADM-1-1-DEG2DEG2-TTP-RX - OpenROADM-1-1-DEG2-to-OpenROADM-1-4-DEG2 - 10 - fiber57 true 11.4 12 @@ -2878,15 +2871,14 @@ OpenROADM-1-1-DEG2-to-OpenROADM-1-4-DEG2 OpenROADM-1-4-DEG2-to-OpenROADM-1-1-DEG2 + fiber1114 + 10 1 ROADM-TO-ROADM OpenROADM-1-1-DEG2DEG2-TTP-TX OpenROADM-1-4-DEG2DEG2-TTP-RX - OpenROADM-1-4-DEG2-to-OpenROADM-1-1-DEG2 - 10 - fiber5 true 11.4 12 @@ -3223,15 +3215,14 @@ OpenROADM-2-1-DEG1-to-OpenROADM-2-2-DEG1 OpenROADM-2-2-DEG1-to-OpenROADM-2-1-DEG1 + fiber2122 + 10 1 ROADM-TO-ROADM OpenROADM-2-1-DEG1DEG1-TTP-TX OpenROADM-2-2-DEG1DEG1-TTP-RX - OpenROADM-2-2-DEG1-to-OpenROADM-2-1-DEG1 - 10 - fiber6 true 11.4 12 @@ -3248,15 +3239,14 @@ OpenROADM-2-2-DEG1-to-OpenROADM-2-1-DEG1 OpenROADM-2-1-DEG1-to-OpenROADM-2-2-DEG1 + fiber2221 + 10 1 ROADM-TO-ROADM OpenROADM-2-2-DEG1DEG1-TTP-TX OpenROADM-2-1-DEG1DEG1-TTP-RX - OpenROADM-2-1-DEG1-to-OpenROADM-2-2-DEG1 - 10 - fiber7 true 11.4 12 @@ -3273,15 +3263,14 @@ OpenROADM-2-2-DEG2-to-OpenROADM-2-3-DEG2 OpenROADM-2-3-DEG2-to-OpenROADM-2-2-DEG2 + fiber2223 + 10 1 ROADM-TO-ROADM OpenROADM-2-2-DEG2DEG2-TTP-TX OpenROADM-2-3-DEG2DEG2-TTP-RX - OpenROADM-2-3-DEG2-to-OpenROADM-2-2-DEG2 - 10 - fiber8 true 11.4 12 @@ -3298,15 +3287,14 @@ OpenROADM-2-3-DEG2-to-OpenROADM-2-2-DEG2 OpenROADM-2-2-DEG2-to-OpenROADM-2-3-DEG2 + fiber2322 + 10 1 ROADM-TO-ROADM OpenROADM-2-3-DEG2DEG2-TTP-TX OpenROADM-2-2-DEG2DEG2-TTP-RX - OpenROADM-2-2-DEG2-to-OpenROADM-2-3-DEG2 - 10 - fiber9 true 11.4 12 @@ -3323,15 +3311,14 @@ OpenROADM-2-3-DEG1-to-OpenROADM-2-4-DEG1 OpenROADM-2-4-DEG1-to-OpenROADM-2-3-DEG1 + fiber2324 + 10 1 ROADM-TO-ROADM OpenROADM-2-3-DEG1DEG1-TTP-TX OpenROADM-2-4-DEG1DEG1-TTP-RX - OpenROADM-2-4-DEG1-to-OpenROADM-2-3-DEG1 - 10 - fiber10 true 11.4 12 @@ -3348,15 +3335,14 @@ OpenROADM-2-4-DEG1-to-OpenROADM-2-3-DEG1 OpenROADM-2-3-DEG1-to-OpenROADM-2-4-DEG1 + fiber2423 + 10 1 ROADM-TO-ROADM OpenROADM-2-4-DEG1DEG1-TTP-TX OpenROADM-2-3-DEG1DEG1-TTP-RX - OpenROADM-2-3-DEG1-to-OpenROADM-2-4-DEG1 - 10 - fiber11 true 11.4 12 @@ -3373,15 +3359,14 @@ OpenROADM-2-4-DEG2-to-OpenROADM-2-1-DEG2 OpenROADM-2-1-DEG2-to-OpenROADM-2-4-DEG2 + fiber2421 + 10 1 ROADM-TO-ROADM OpenROADM-2-4-DEG2DEG2-TTP-TX OpenROADM-2-1-DEG2DEG2-TTP-RX - OpenROADM-2-1-DEG2-to-OpenROADM-2-4-DEG2 - 10 - fiber58 true 11.4 12 @@ -3398,15 +3383,14 @@ OpenROADM-2-1-DEG2-to-OpenROADM-2-4-DEG2 OpenROADM-2-4-DEG2-to-OpenROADM-2-1-DEG2 + fiber2124 + 10 1 ROADM-TO-ROADM OpenROADM-2-1-DEG2DEG2-TTP-TX OpenROADM-2-4-DEG2DEG2-TTP-RX - OpenROADM-2-4-DEG2-to-OpenROADM-2-1-DEG2 - 10 - fiber12 true 11.4 12 @@ -3747,15 +3731,14 @@ OpenROADM-3-1-DEG1-to-OpenROADM-3-2-DEG1 OpenROADM-3-2-DEG1-to-OpenROADM-3-1-DEG1 + fiber3132 + 10 1 ROADM-TO-ROADM OpenROADM-3-1-DEG1DEG1-TTP-TX OpenROADM-3-2-DEG1DEG1-TTP-RX - OpenROADM-3-2-DEG1-to-OpenROADM-3-1-DEG1 - 10 - fiber13 true 11.4 12 @@ -3772,15 +3755,14 @@ OpenROADM-3-2-DEG1-to-OpenROADM-3-1-DEG1 OpenROADM-3-1-DEG1-to-OpenROADM-3-2-DEG1 + fiber3231 + 10 1 ROADM-TO-ROADM OpenROADM-3-2-DEG1DEG1-TTP-TX OpenROADM-3-1-DEG1DEG1-TTP-RX - OpenROADM-3-1-DEG1-to-OpenROADM-3-2-DEG1 - 10 - fiber14 true 11.4 12 @@ -3797,15 +3779,14 @@ OpenROADM-3-2-DEG2-to-OpenROADM-3-3-DEG2 OpenROADM-3-3-DEG2-to-OpenROADM-3-2-DEG2 + fiber3233 + 10 1 ROADM-TO-ROADM OpenROADM-3-2-DEG2DEG2-TTP-TX OpenROADM-3-3-DEG2DEG2-TTP-RX - OpenROADM-3-3-DEG2-to-OpenROADM-3-2-DEG2 - 10 - fiber15 true 11.4 12 @@ -3822,15 +3803,14 @@ OpenROADM-3-3-DEG2-to-OpenROADM-3-2-DEG2 OpenROADM-3-2-DEG2-to-OpenROADM-3-3-DEG2 + fiber3332 + 10 1 ROADM-TO-ROADM OpenROADM-3-3-DEG2DEG2-TTP-TX OpenROADM-3-2-DEG2DEG2-TTP-RX - OpenROADM-3-2-DEG2-to-OpenROADM-3-3-DEG2 - 10 - fiber16 true 11.4 12 @@ -3847,15 +3827,14 @@ OpenROADM-3-3-DEG1-to-OpenROADM-3-4-DEG1 OpenROADM-3-4-DEG1-to-OpenROADM-3-3-DEG1 + fiber3334 + 10 1 ROADM-TO-ROADM OpenROADM-3-3-DEG1DEG1-TTP-TX OpenROADM-3-4-DEG1DEG1-TTP-RX - OpenROADM-3-4-DEG1-to-OpenROADM-3-3-DEG1 - 10 - fiber17 true 11.4 12 @@ -3872,15 +3851,14 @@ OpenROADM-3-4-DEG1-to-OpenROADM-3-3-DEG1 OpenROADM-3-3-DEG1-to-OpenROADM-3-4-DEG1 + fiber3433 + 10 1 ROADM-TO-ROADM OpenROADM-3-4-DEG1DEG1-TTP-TX OpenROADM-3-3-DEG1DEG1-TTP-RX - OpenROADM-3-3-DEG1-to-OpenROADM-3-4-DEG1 - 10 - fiber18 true 11.4 12 @@ -3897,15 +3875,14 @@ OpenROADM-3-4-DEG2-to-OpenROADM-3-1-DEG2 OpenROADM-3-1-DEG2-to-OpenROADM-3-4-DEG2 + fiber3431 + 10 1 ROADM-TO-ROADM OpenROADM-3-4-DEG2DEG2-TTP-TX OpenROADM-3-1-DEG2DEG2-TTP-RX - OpenROADM-3-1-DEG2-to-OpenROADM-3-4-DEG2 - 10 - fiber19 true 11.4 12 @@ -3922,15 +3899,14 @@ OpenROADM-3-1-DEG2-to-OpenROADM-3-4-DEG2 OpenROADM-3-4-DEG2-to-OpenROADM-3-1-DEG2 + fiber3431 + 10 1 ROADM-TO-ROADM OpenROADM-3-1-DEG2DEG2-TTP-TX OpenROADM-3-4-DEG2DEG2-TTP-RX - OpenROADM-3-4-DEG2-to-OpenROADM-3-1-DEG2 - 10 - fiber20 true 11.4 12 @@ -4267,15 +4243,14 @@ OpenROADM-4-1-DEG1-to-OpenROADM-4-2-DEG1 OpenROADM-4-2-DEG1-to-OpenROADM-4-1-DEG1 + fiber4142 + 10 1 ROADM-TO-ROADM OpenROADM-4-1-DEG1DEG1-TTP-TX OpenROADM-4-2-DEG1DEG1-TTP-RX - OpenROADM-4-2-DEG1-to-OpenROADM-4-1-DEG1 - 10 - fiber21 true 11.4 12 @@ -4292,15 +4267,14 @@ OpenROADM-4-2-DEG1-to-OpenROADM-4-1-DEG1 OpenROADM-4-1-DEG1-to-OpenROADM-4-2-DEG1 + fiber4241 + 10 1 ROADM-TO-ROADM OpenROADM-4-2-DEG1DEG1-TTP-TX OpenROADM-4-1-DEG1DEG1-TTP-RX - OpenROADM-4-1-DEG1-to-OpenROADM-4-2-DEG1 - 10 - fiber22 true 11.4 12 @@ -4317,15 +4291,14 @@ OpenROADM-4-2-DEG2-to-OpenROADM-4-3-DEG2 OpenROADM-4-3-DEG2-to-OpenROADM-4-2-DEG2 + fiber4243 + 10 1 ROADM-TO-ROADM OpenROADM-4-2-DEG2DEG2-TTP-TX OpenROADM-4-3-DEG2DEG2-TTP-RX - OpenROADM-4-3-DEG2-to-OpenROADM-4-2-DEG2 - 10 - fiber23 true 11.4 12 @@ -4342,15 +4315,14 @@ OpenROADM-4-3-DEG2-to-OpenROADM-4-2-DEG2 OpenROADM-4-2-DEG2-to-OpenROADM-4-3-DEG2 + fiber4342 + 10 1 ROADM-TO-ROADM OpenROADM-4-3-DEG2DEG2-TTP-TX OpenROADM-4-2-DEG2DEG2-TTP-RX - OpenROADM-4-2-DEG2-to-OpenROADM-4-3-DEG2 - 10 - fiber24 true 11.4 12 @@ -4367,15 +4339,14 @@ OpenROADM-4-3-DEG1-to-OpenROADM-4-4-DEG1 OpenROADM-4-4-DEG1-to-OpenROADM-4-3-DEG1 + fiber4344 + 10 1 ROADM-TO-ROADM OpenROADM-4-3-DEG1DEG1-TTP-TX OpenROADM-4-4-DEG1DEG1-TTP-RX - OpenROADM-4-4-DEG1-to-OpenROADM-4-3-DEG1 - 10 - fiber25 true 11.4 12 @@ -4392,15 +4363,14 @@ OpenROADM-4-4-DEG1-to-OpenROADM-4-3-DEG1 OpenROADM-4-3-DEG1-to-OpenROADM-4-4-DEG1 + fiber4443 + 10 1 ROADM-TO-ROADM OpenROADM-4-4-DEG1DEG1-TTP-TX OpenROADM-4-3-DEG1DEG1-TTP-RX - OpenROADM-4-3-DEG1-to-OpenROADM-4-4-DEG1 - 10 - fiber26 true 11.4 12 @@ -4417,15 +4387,14 @@ OpenROADM-4-4-DEG2-to-OpenROADM-4-1-DEG2 OpenROADM-4-1-DEG2-to-OpenROADM-4-4-DEG2 + fiber4441 + 10 1 ROADM-TO-ROADM OpenROADM-4-4-DEG2DEG2-TTP-TX OpenROADM-4-1-DEG2DEG2-TTP-RX - OpenROADM-4-1-DEG2-to-OpenROADM-4-4-DEG2 - 10 - fiber27 true 11.4 12 @@ -4442,15 +4411,14 @@ OpenROADM-4-1-DEG2-to-OpenROADM-4-4-DEG2 OpenROADM-4-4-DEG2-to-OpenROADM-4-1-DEG2 + fiber4144 + 10 1 ROADM-TO-ROADM OpenROADM-4-1-DEG2DEG2-TTP-TX OpenROADM-4-4-DEG2DEG2-TTP-RX - OpenROADM-4-4-DEG2-to-OpenROADM-4-1-DEG2 - 10 - fiber28 true 11.4 12 @@ -4787,15 +4755,14 @@ OpenROADM-5-1-DEG1-to-OpenROADM-5-2-DEG1 OpenROADM-5-2-DEG1-to-OpenROADM-5-1-DEG1 + fiber5152 + 10 1 ROADM-TO-ROADM OpenROADM-5-1-DEG1DEG1-TTP-TX OpenROADM-5-2-DEG1DEG1-TTP-RX - OpenROADM-5-2-DEG1-to-OpenROADM-5-1-DEG1 - 10 - fiber29 true 11.4 12 @@ -4812,15 +4779,14 @@ OpenROADM-5-2-DEG1-to-OpenROADM-5-1-DEG1 OpenROADM-5-1-DEG1-to-OpenROADM-5-2-DEG1 + fiber5251 + 10 1 ROADM-TO-ROADM OpenROADM-5-2-DEG1DEG1-TTP-TX OpenROADM-5-1-DEG1DEG1-TTP-RX - OpenROADM-5-1-DEG1-to-OpenROADM-5-2-DEG1 - 10 - fiber30 true 11.4 12 @@ -4837,15 +4803,14 @@ OpenROADM-5-2-DEG2-to-OpenROADM-5-3-DEG2 OpenROADM-5-3-DEG2-to-OpenROADM-5-2-DEG2 + fiber5253 + 10 1 ROADM-TO-ROADM OpenROADM-5-2-DEG2DEG2-TTP-TX OpenROADM-5-3-DEG2DEG2-TTP-RX - OpenROADM-5-3-DEG2-to-OpenROADM-5-2-DEG2 - 10 - fiber31 true 11.4 12 @@ -4862,15 +4827,14 @@ OpenROADM-5-3-DEG2-to-OpenROADM-5-2-DEG2 OpenROADM-5-2-DEG2-to-OpenROADM-5-3-DEG2 + fiber5352 + 10 1 ROADM-TO-ROADM OpenROADM-5-3-DEG2DEG2-TTP-TX OpenROADM-5-2-DEG2DEG2-TTP-RX - OpenROADM-5-2-DEG2-to-OpenROADM-5-3-DEG2 - 10 - fiber32 true 11.4 12 @@ -4887,15 +4851,14 @@ OpenROADM-5-3-DEG1-to-OpenROADM-5-4-DEG1 OpenROADM-5-4-DEG1-to-OpenROADM-5-3-DEG1 + fiber5354 + 10 1 ROADM-TO-ROADM OpenROADM-5-3-DEG1DEG1-TTP-TX OpenROADM-5-4-DEG1DEG1-TTP-RX - OpenROADM-5-4-DEG1-to-OpenROADM-5-3-DEG1 - 10 - fiber33 true 11.4 12 @@ -4912,15 +4875,14 @@ OpenROADM-5-4-DEG1-to-OpenROADM-5-3-DEG1 OpenROADM-5-3-DEG1-to-OpenROADM-5-4-DEG1 + fiber5453 + 10 1 ROADM-TO-ROADM OpenROADM-5-4-DEG1DEG1-TTP-TX OpenROADM-5-3-DEG1DEG1-TTP-RX - OpenROADM-5-3-DEG1-to-OpenROADM-5-4-DEG1 - 10 - fiber34 true 11.4 12 @@ -4937,15 +4899,14 @@ OpenROADM-5-4-DEG2-to-OpenROADM-5-1-DEG2 OpenROADM-5-1-DEG2-to-OpenROADM-5-4-DEG2 + fiber5451 + 10 1 ROADM-TO-ROADM OpenROADM-5-4-DEG2DEG2-TTP-TX OpenROADM-5-1-DEG2DEG2-TTP-RX - OpenROADM-5-1-DEG2-to-OpenROADM-5-4-DEG2 - 10 - fiber35 true 11.4 12 @@ -4962,15 +4923,14 @@ OpenROADM-5-1-DEG2-to-OpenROADM-5-4-DEG2 OpenROADM-5-4-DEG2-to-OpenROADM-5-1-DEG2 + fiber5154 + 10 1 ROADM-TO-ROADM OpenROADM-5-1-DEG2DEG2-TTP-TX OpenROADM-5-4-DEG2DEG2-TTP-RX - OpenROADM-5-4-DEG2-to-OpenROADM-5-1-DEG2 - 10 - fiber36 true 11.4 12 @@ -4987,15 +4947,14 @@ OpenROADM-1-4-DEG3-to-OpenROADM-2-1-DEG3 OpenROADM-2-1-DEG3-to-OpenROADM-1-4-DEG3 + fiber1421 + 10 1 ROADM-TO-ROADM OpenROADM-1-4-DEG3DEG3-TTP-TX OpenROADM-2-1-DEG3DEG3-TTP-RX - OpenROADM-2-1-DEG3-to-OpenROADM-1-4-DEG3 - 10 - fiber37 true 11.4 12 @@ -5012,15 +4971,14 @@ OpenROADM-2-1-DEG3-to-OpenROADM-1-4-DEG3 OpenROADM-1-4-DEG3-to-OpenROADM-2-1-DEG3 + fiber2114 + 10 1 ROADM-TO-ROADM OpenROADM-2-1-DEG3DEG3-TTP-TX OpenROADM-1-4-DEG3DEG3-TTP-RX - OpenROADM-1-4-DEG3-to-OpenROADM-2-1-DEG3 - 10 - fiber38 true 11.4 12 @@ -5037,15 +4995,14 @@ OpenROADM-1-3-DEG3-to-OpenROADM-2-2-DEG3 OpenROADM-2-2-DEG3-to-OpenROADM-1-3-DEG3 + fiber1322 + 10 1 ROADM-TO-ROADM OpenROADM-1-3-DEG3DEG3-TTP-TX OpenROADM-2-2-DEG3DEG3-TTP-RX - OpenROADM-2-2-DEG3-to-OpenROADM-1-3-DEG3 - 10 - fiber39 true 11.4 12 @@ -5062,15 +5019,14 @@ OpenROADM-2-2-DEG3-to-OpenROADM-1-3-DEG3 OpenROADM-1-3-DEG3-to-OpenROADM-2-2-DEG3 + fiber2213 + 10 1 ROADM-TO-ROADM OpenROADM-2-2-DEG3DEG3-TTP-TX OpenROADM-1-3-DEG3DEG3-TTP-RX - OpenROADM-1-3-DEG3-to-OpenROADM-2-2-DEG3 - 10 - fiber40 true 11.4 12 @@ -5087,15 +5043,14 @@ OpenROADM-2-4-DEG3-to-OpenROADM-3-1-DEG3 OpenROADM-3-1-DEG3-to-OpenROADM-2-4-DEG3 + fiber2431 + 10 1 ROADM-TO-ROADM OpenROADM-2-4-DEG3DEG3-TTP-TX OpenROADM-3-1-DEG3DEG3-TTP-RX - OpenROADM-3-1-DEG3-to-OpenROADM-2-4-DEG3 - 10 - fiber41 true 11.4 12 @@ -5112,15 +5067,14 @@ OpenROADM-3-1-DEG3-to-OpenROADM-2-4-DEG3 OpenROADM-2-4-DEG3-to-OpenROADM-3-1-DEG3 + fiber3124 + 10 1 ROADM-TO-ROADM OpenROADM-3-1-DEG3DEG3-TTP-TX OpenROADM-2-4-DEG3DEG3-TTP-RX - OpenROADM-2-4-DEG3-to-OpenROADM-3-1-DEG3 - 10 - fiber42 true 11.4 12 @@ -5137,15 +5091,14 @@ OpenROADM-2-3-DEG3-to-OpenROADM-3-2-DEG3 OpenROADM-3-2-DEG3-to-OpenROADM-2-3-DEG3 + fiber2332 + 10 1 ROADM-TO-ROADM OpenROADM-2-3-DEG3DEG3-TTP-TX OpenROADM-3-2-DEG3DEG3-TTP-RX - OpenROADM-3-2-DEG3-to-OpenROADM-2-3-DEG3 - 10 - fiber43 true 11.4 12 @@ -5162,15 +5115,14 @@ OpenROADM-3-2-DEG3-to-OpenROADM-2-3-DEG3 OpenROADM-2-3-DEG3-to-OpenROADM-3-2-DEG3 + fiber3223 + 10 1 ROADM-TO-ROADM OpenROADM-3-2-DEG3DEG3-TTP-TX OpenROADM-2-3-DEG3DEG3-TTP-RX - OpenROADM-2-3-DEG3-to-OpenROADM-3-2-DEG3 - 10 - fiber44 true 11.4 12 @@ -5187,15 +5139,14 @@ OpenROADM-3-4-DEG3-to-OpenROADM-4-1-DEG3 OpenROADM-4-1-DEG3-to-OpenROADM-3-4-DEG3 + fiber3441 + 10 1 ROADM-TO-ROADM OpenROADM-3-4-DEG3DEG3-TTP-TX OpenROADM-4-1-DEG3DEG3-TTP-RX - OpenROADM-4-1-DEG3-to-OpenROADM-3-4-DEG3 - 10 - fiber45 true 11.4 12 @@ -5212,15 +5163,14 @@ OpenROADM-4-1-DEG3-to-OpenROADM-3-4-DEG3 OpenROADM-3-4-DEG3-to-OpenROADM-4-1-DEG3 + fiber4134 + 10 1 ROADM-TO-ROADM OpenROADM-4-1-DEG3DEG3-TTP-TX OpenROADM-3-4-DEG3DEG3-TTP-RX - OpenROADM-3-4-DEG3-to-OpenROADM-4-1-DEG3 - 10 - fiber46 true 11.4 12 @@ -5237,15 +5187,14 @@ OpenROADM-3-3-DEG3-to-OpenROADM-4-2-DEG3 OpenROADM-4-2-DEG3-to-OpenROADM-3-3-DEG3 + fiber3342 + 10 1 ROADM-TO-ROADM OpenROADM-3-3-DEG3DEG3-TTP-TX OpenROADM-4-2-DEG3DEG3-TTP-RX - OpenROADM-4-2-DEG3-to-OpenROADM-3-3-DEG3 - 10 - fiber47 true 11.4 12 @@ -5262,15 +5211,14 @@ OpenROADM-4-2-DEG3-to-OpenROADM-3-3-DEG3 OpenROADM-3-3-DEG3-to-OpenROADM-4-2-DEG3 + fiber4233 + 10 1 ROADM-TO-ROADM OpenROADM-4-2-DEG3DEG3-TTP-TX OpenROADM-3-3-DEG3DEG3-TTP-RX - OpenROADM-3-3-DEG3-to-OpenROADM-4-2-DEG3 - 10 - fiber48 true 11.4 12 @@ -5287,15 +5235,14 @@ OpenROADM-4-4-DEG3-to-OpenROADM-5-1-DEG3 OpenROADM-5-1-DEG3-to-OpenROADM-4-4-DEG3 + fiber4451 + 10 1 ROADM-TO-ROADM OpenROADM-4-4-DEG3DEG3-TTP-TX OpenROADM-5-1-DEG3DEG3-TTP-RX - OpenROADM-5-1-DEG3-to-OpenROADM-4-4-DEG3 - 10 - fiber49 true 11.4 12 @@ -5312,15 +5259,14 @@ OpenROADM-5-1-DEG3-to-OpenROADM-4-4-DEG3 OpenROADM-4-4-DEG3-to-OpenROADM-5-1-DEG3 + fiber5144 + 10 1 ROADM-TO-ROADM OpenROADM-5-1-DEG3DEG3-TTP-TX OpenROADM-4-4-DEG3DEG3-TTP-RX - OpenROADM-4-4-DEG3-to-OpenROADM-5-1-DEG3 - 10 - fiber50 true 11.4 12 @@ -5337,15 +5283,14 @@ OpenROADM-4-3-DEG3-to-OpenROADM-5-2-DEG3 OpenROADM-5-2-DEG3-to-OpenROADM-4-3-DEG3 + fiber4352 + 10 10 ROADM-TO-ROADM OpenROADM-4-3-DEG3DEG3-TTP-TX OpenROADM-5-2-DEG3DEG3-TTP-RX - OpenROADM-5-2-DEG3-to-OpenROADM-4-3-DEG3 - 10 - fiber51 true 11.4 12 @@ -5362,15 +5307,14 @@ OpenROADM-5-2-DEG3-to-OpenROADM-4-3-DEG3 OpenROADM-4-3-DEG3-to-OpenROADM-5-2-DEG3 + fiber5243 + 10 10 ROADM-TO-ROADM OpenROADM-5-2-DEG3DEG3-TTP-TX OpenROADM-4-3-DEG3DEG3-TTP-RX - OpenROADM-4-3-DEG3-to-OpenROADM-5-2-DEG3 - 10 - fiber52 true 11.4 12 @@ -5387,15 +5331,14 @@ OpenROADM-5-4-DEG3-to-OpenROADM-1-1-DEG3 OpenROADM-1-1-DEG3-to-OpenROADM-5-4-DEG3 + fiber5411 + 10 1 ROADM-TO-ROADM OpenROADM-5-4-DEG3DEG3-TTP-TX OpenROADM-1-1-DEG3DEG3-TTP-RX - OpenROADM-1-1-DEG3-to-OpenROADM-5-4-DEG3 - 10 - fiber53 true 11.4 12 @@ -5412,15 +5355,14 @@ OpenROADM-1-1-DEG3-to-OpenROADM-5-4-DEG3 OpenROADM-5-4-DEG3-to-OpenROADM-1-1-DEG3 + fiber1154 + 10 1 ROADM-TO-ROADM OpenROADM-1-1-DEG3DEG3-TTP-TX OpenROADM-5-4-DEG3DEG3-TTP-RX - OpenROADM-5-4-DEG3-to-OpenROADM-1-1-DEG3 - 10 - fiber54 true 11.4 12 @@ -5437,15 +5379,14 @@ OpenROADM-5-3-DEG3-to-OpenROADM-1-2-DEG3 OpenROADM-1-2-DEG3-to-OpenROADM-5-3-DEG3 + fiber5312 + 10 10 ROADM-TO-ROADM OpenROADM-5-3-DEG3DEG3-TTP-TX OpenROADM-1-2-DEG3DEG3-TTP-RX - OpenROADM-1-2-DEG3-to-OpenROADM-5-3-DEG3 - 10 - fiber55 true 11.4 12 @@ -5462,15 +5403,14 @@ OpenROADM-1-2-DEG3-to-OpenROADM-5-3-DEG3 OpenROADM-5-3-DEG3-to-OpenROADM-1-2-DEG3 + fiber1253 + 10 10 ROADM-TO-ROADM OpenROADM-1-2-DEG3DEG3-TTP-TX OpenROADM-5-3-DEG3DEG3-TTP-RX - OpenROADM-5-3-DEG3-to-OpenROADM-1-2-DEG3 - 10 - fiber56 true 11.4 12 diff --git a/tests/sample_configs/NW-simple-topology.xml b/tests/sample_configs/NW-simple-topology.xml index 90be88eca..deaf1caf4 100644 --- a/tests/sample_configs/NW-simple-topology.xml +++ b/tests/sample_configs/NW-simple-topology.xml @@ -2081,15 +2081,14 @@ OpenROADM-1-1-DEG1-to-OpenROADM-1-2-DEG1 OpenROADM-1-2-DEG1-to-OpenROADM-1-1-DEG1 + fiber1112a + 10 1 ROADM-TO-ROADM OpenROADM-1-1-DEG1DEG1-TTP-TX OpenROADM-1-2-DEG1DEG1-TTP-RX - OpenROADM-1-2-DEG1-to-OpenROADM-1-1-DEG1 - 10 - fiber1 true 11.4 12 @@ -2106,15 +2105,14 @@ OpenROADM-1-2-DEG1-to-OpenROADM-1-1-DEG1 OpenROADM-1-1-DEG1-to-OpenROADM-1-2-DEG1 + fiber1211a + 10 1 ROADM-TO-ROADM OpenROADM-1-2-DEG1DEG1-TTP-TX OpenROADM-1-1-DEG1DEG1-TTP-RX - OpenROADM-1-1-DEG1-to-OpenROADM-1-2-DEG1 - 10 - fiber2 true 11.4 12 @@ -2132,14 +2130,13 @@ OpenROADM-1-2-DEG2-to-OpenROADM-1-1-DEG2 OpenROADM-1-1-DEG2-to-OpenROADM-1-2-DEG2 1 + fiber1211b + 10 ROADM-TO-ROADM OpenROADM-1-2-DEG2DEG2-TTP-TX OpenROADM-1-1-DEG2DEG2-TTP-RX - OpenROADM-1-1-DEG2-to-OpenROADM-1-2-DEG2 - 10 - fiber3 true 11.4 12 @@ -2156,15 +2153,14 @@ OpenROADM-1-1-DEG2-to-OpenROADM-1-2-DEG2 OpenROADM-1-2-DEG2-to-OpenROADM-1-1-DEG2 + fiber1112b + 10 1 ROADM-TO-ROADM OpenROADM-1-1-DEG2DEG2-TTP-TX OpenROADM-1-2-DEG2DEG2-TTP-RX - OpenROADM-1-2-DEG2-to-OpenROADM-1-1-DEG2 - 10 - fiber4 true 11.4 12 diff --git a/tests/sample_configs/gnpy/openroadmTopology.json b/tests/sample_configs/gnpy/openroadmTopology.json index 99fe2304e..6b7c84619 100644 --- a/tests/sample_configs/gnpy/openroadmTopology.json +++ b/tests/sample_configs/gnpy/openroadmTopology.json @@ -504,7 +504,6 @@ "source-tp": "DEG1-TTP-TX" }, "org-openroadm-network-topology:OMS-attributes": { - "opposite-link": "OpenROADM-2-DEG1-to-OpenROADM-1-DEG1", "span": { "spanloss-base": 28.4, "link-concatenation": [ @@ -517,12 +516,12 @@ ], "spanloss-current": 29, "engineered-spanloss": 30.2, - "clfi": "fiber12", "auto-spanloss": true - }, - "TE-metric": 10 + } }, "org-openroadm-common-network:link-type": "ROADM-TO-ROADM", + "org-openroadm-common-network:clfi": "fiber12", + "org-openroadm-common-network:TE-metric": 10, "org-openroadm-network-topology:link-latency": 1, "destination": { "dest-node": "OpenROADM-2-DEG1", @@ -537,7 +536,6 @@ "source-tp": "DEG2-TTP-TX" }, "org-openroadm-network-topology:OMS-attributes": { - "opposite-link": "OpenROADM-3-DEG1-to-OpenROADM-1-DEG2", "span": { "spanloss-base": 11.4, "link-concatenation": [ @@ -550,12 +548,12 @@ ], "spanloss-current": 12, "engineered-spanloss": 12.2, - "clfi": "fiber13", "auto-spanloss": true - }, - "TE-metric": 10 + } }, "org-openroadm-common-network:link-type": "ROADM-TO-ROADM", + "org-openroadm-common-network:clfi": "fiber13", + "org-openroadm-common-network:TE-metric": 10, "org-openroadm-network-topology:link-latency": 1, "destination": { "dest-node": "OpenROADM-3-DEG1", @@ -570,7 +568,6 @@ "source-tp": "DEG1-TTP-TX" }, "org-openroadm-network-topology:OMS-attributes": { - "opposite-link": "OpenROADM-1-DEG1-to-OpenROADM-2-DEG1", "span": { "spanloss-base": 28.4, "link-concatenation": [ @@ -583,12 +580,12 @@ ], "spanloss-current": 29, "engineered-spanloss": 30.2, - "clfi": "fiber21", "auto-spanloss": true - }, - "TE-metric": 10 + } }, "org-openroadm-common-network:link-type": "ROADM-TO-ROADM", + "org-openroadm-common-network:clfi": "fiber21", + "org-openroadm-common-network:TE-metric": 10, "org-openroadm-network-topology:link-latency": 1, "destination": { "dest-node": "OpenROADM-1-DEG1", @@ -603,7 +600,6 @@ "source-tp": "DEG2-TTP-TX" }, "org-openroadm-network-topology:OMS-attributes": { - "opposite-link": "OpenROADM-3-DEG2-to-OpenROADM-2-DEG2", "span": { "spanloss-base": 28.4, "link-concatenation": [ @@ -616,12 +612,12 @@ ], "spanloss-current": 29, "engineered-spanloss": 30.2, - "clfi": "fiber23", "auto-spanloss": true - }, - "TE-metric": 10 + } }, "org-openroadm-common-network:link-type": "ROADM-TO-ROADM", + "org-openroadm-common-network:clfi": "fiber23", + "org-openroadm-common-network:TE-metric": 10, "org-openroadm-network-topology:link-latency": 1, "destination": { "dest-node": "OpenROADM-3-DEG2", @@ -636,7 +632,6 @@ "source-tp": "DEG3-TTP-TX" }, "org-openroadm-network-topology:OMS-attributes": { - "opposite-link": "OpenROADM-5-DEG3-to-OpenROADM-2-DEG3", "span": { "spanloss-base": 7.1, "link-concatenation": [ @@ -649,12 +644,12 @@ ], "spanloss-current": 7.2, "engineered-spanloss": 7.5, - "clfi": "fiber25", "auto-spanloss": true - }, - "TE-metric": 10 + } }, "org-openroadm-common-network:link-type": "ROADM-TO-ROADM", + "org-openroadm-common-network:clfi": "fiber25", + "org-openroadm-common-network:TE-metric": 10, "org-openroadm-network-topology:link-latency": 1, "destination": { "dest-node": "OpenROADM-5-DEG3", @@ -669,7 +664,6 @@ "source-tp": "DEG1-TTP-TX" }, "org-openroadm-network-topology:OMS-attributes": { - "opposite-link": "OpenROADM-1-DEG2-to-OpenROADM-3-DEG1", "span": { "spanloss-base": 11.4, "link-concatenation": [ @@ -682,12 +676,12 @@ ], "spanloss-current": 12, "engineered-spanloss": 12.2, - "clfi": "fiber31", "auto-spanloss": true - }, - "TE-metric": 10 + } }, "org-openroadm-common-network:link-type": "ROADM-TO-ROADM", + "org-openroadm-common-network:clfi": "fiber31", + "org-openroadm-common-network:TE-metric": 10, "org-openroadm-network-topology:link-latency": 1, "destination": { "dest-node": "OpenROADM-1-DEG2", @@ -702,7 +696,6 @@ "source-tp": "DEG2-TTP-TX" }, "org-openroadm-network-topology:OMS-attributes": { - "opposite-link": "OpenROADM-2-DEG2-to-OpenROADM-3-DEG2", "span": { "spanloss-base": 28.4, "link-concatenation": [ @@ -715,12 +708,12 @@ ], "spanloss-current": 29, "engineered-spanloss": 30.2, - "clfi": "fiber32", "auto-spanloss": true - }, - "TE-metric": 10 + } }, "org-openroadm-common-network:link-type": "ROADM-TO-ROADM", + "org-openroadm-common-network:clfi": "fiber32", + "org-openroadm-common-network:TE-metric": 10, "org-openroadm-network-topology:link-latency": 1, "destination": { "dest-node": "OpenROADM-2-DEG2", @@ -735,7 +728,6 @@ "source-tp": "DEG3-TTP-TX" }, "org-openroadm-network-topology:OMS-attributes": { - "opposite-link": "OpenROADM-5-DEG2-to-OpenROADM-3-DEG3", "span": { "spanloss-base": 7.1, "link-concatenation": [ @@ -748,12 +740,12 @@ ], "spanloss-current": 7.2, "engineered-spanloss": 7.5, - "clfi": "fiber35", "auto-spanloss": true - }, - "TE-metric": 10 + } }, "org-openroadm-common-network:link-type": "ROADM-TO-ROADM", + "org-openroadm-common-network:clfi": "fiber35", + "org-openroadm-common-network:TE-metric": 10, "org-openroadm-network-topology:link-latency": 1, "destination": { "dest-node": "OpenROADM-5-DEG2", @@ -768,7 +760,6 @@ "source-tp": "DEG2-TTP-TX" }, "org-openroadm-network-topology:OMS-attributes": { - "opposite-link": "OpenROADM-4-DEG2-to-OpenROADM-3-DEG4", "span": { "spanloss-base": 28.4, "link-concatenation": [ @@ -781,12 +772,12 @@ ], "spanloss-current": 29, "engineered-spanloss": 30.2, - "clfi": "fiber34", "auto-spanloss": true - }, - "TE-metric": 10 + } }, "org-openroadm-common-network:link-type": "ROADM-TO-ROADM", + "org-openroadm-common-network:clfi": "fiber34", + "org-openroadm-common-network:TE-metric": 10, "org-openroadm-network-topology:link-latency": 1, "destination": { "dest-node": "OpenROADM-4-DEG2", @@ -801,7 +792,6 @@ "source-tp": "DEG1-TTP-TX" }, "org-openroadm-network-topology:OMS-attributes": { - "opposite-link": "OpenROADM-4-DEG1-to-OpenROADM-5-DEG1", "span": { "spanloss-base": 28.4, "link-concatenation": [ @@ -814,12 +804,12 @@ ], "spanloss-current": 29, "engineered-spanloss": 30.2, - "clfi": "fiber45", "auto-spanloss": true - }, - "TE-metric": 10 + } }, "org-openroadm-common-network:link-type": "ROADM-TO-ROADM", + "org-openroadm-common-network:clfi": "fiber45", + "org-openroadm-common-network:TE-metric": 10, "org-openroadm-network-topology:link-latency": 1, "destination": { "dest-node": "OpenROADM-5-DEG1", @@ -834,7 +824,6 @@ "source-tp": "DEG2-TTP-TX" }, "org-openroadm-network-topology:OMS-attributes": { - "opposite-link": "OpenROADM-3-DEG4-to-OpenROADM-4-DEG2", "span": { "spanloss-base": 28.4, "link-concatenation": [ @@ -847,12 +836,12 @@ ], "spanloss-current": 29, "engineered-spanloss": 30.2, - "clfi": "fiber43", "auto-spanloss": true - }, - "TE-metric": 10 + } }, "org-openroadm-common-network:link-type": "ROADM-TO-ROADM", + "org-openroadm-common-network:clfi": "fiber43", + "org-openroadm-common-network:TE-metric": 10, "org-openroadm-network-topology:link-latency": 1, "destination": { "dest-node": "OpenROADM-3-DEG4", @@ -867,7 +856,6 @@ "source-tp": "DEG1-TTP-TX" }, "org-openroadm-network-topology:OMS-attributes": { - "opposite-link": "OpenROADM-4-DEG1-to-OpenROADM-5-DEG1", "span": { "spanloss-base": 28.4, "link-concatenation": [ @@ -880,12 +868,12 @@ ], "spanloss-current": 29, "engineered-spanloss": 30.2, - "clfi": "fiber54", "auto-spanloss": true - }, - "TE-metric": 10 + } }, "org-openroadm-common-network:link-type": "ROADM-TO-ROADM", + "org-openroadm-common-network:clfi": "fiber54", + "org-openroadm-common-network:TE-metric": 10, "org-openroadm-network-topology:link-latency": 1, "destination": { "dest-node": "OpenROADM-4-DEG1", @@ -900,7 +888,6 @@ "source-tp": "DEG2-TTP-TX" }, "org-openroadm-network-topology:OMS-attributes": { - "opposite-link": "OpenROADM-3-DEG3-to-OpenROADM-5-DEG2", "span": { "spanloss-base": 7.1, "link-concatenation": [ @@ -913,12 +900,12 @@ ], "spanloss-current": 7.2, "engineered-spanloss": 7.5, - "clfi": "fiber53", "auto-spanloss": true - }, - "TE-metric": 10 + } }, "org-openroadm-common-network:link-type": "ROADM-TO-ROADM", + "org-openroadm-common-network:clfi": "fiber53", + "org-openroadm-common-network:TE-metric": 10, "org-openroadm-network-topology:link-latency": 1, "destination": { "dest-node": "OpenROADM-3-DEG3", @@ -933,7 +920,6 @@ "source-tp": "DEG3-TTP-TX" }, "org-openroadm-network-topology:OMS-attributes": { - "opposite-link": "OpenROADM-2-DEG3-to-OpenROADM-5-DEG3", "span": { "spanloss-base": 7.1, "link-concatenation": [ @@ -946,12 +932,12 @@ ], "spanloss-current": 7.2, "engineered-spanloss": 7.5, - "clfi": "fiber52", "auto-spanloss": true - }, - "TE-metric": 10 + } }, "org-openroadm-common-network:link-type": "ROADM-TO-ROADM", + "org-openroadm-common-network:clfi": "fiber52", + "org-openroadm-common-network:TE-metric": 10, "org-openroadm-network-topology:link-latency": 1, "destination": { "dest-node": "OpenROADM-2-DEG3", diff --git a/tests/sample_configs/honeynode-topo.xml b/tests/sample_configs/honeynode-topo.xml index bc18c1359..086a0601c 100644 --- a/tests/sample_configs/honeynode-topo.xml +++ b/tests/sample_configs/honeynode-topo.xml @@ -120,6 +120,8 @@ ROADMA01-DEG1-DEG1-TTP-TXRXtoROADMC01-DEG2-DEG2-TTP-TXRX ROADMC01-DEG2-DEG2-TTP-TXRXtoROADMA01-DEG1-DEG1-TTP-TXRX + fiberA01C01 + 10 DEG2-TTP-TXRX ROADMC01-DEG2 @@ -129,10 +131,7 @@ DEG1-TTP-TXRX - ROADMC01-DEG2-DEG2-TTP-TXRXtoROADMA01-DEG1-DEG1-TTP-TXRX - 10 - fiber1 true 11.4 12 @@ -164,6 +163,8 @@ ROADMC01-DEG2-DEG2-TTP-TXRXtoROADMA01-DEG1-DEG1-TTP-TXRX ROADMA01-DEG1-DEG1-TTP-TXRXtoROADMC01-DEG2-DEG2-TTP-TXRX + fiberC01A01 + 10 DEG1-TTP-TXRX ROADMA01-DEG1 @@ -173,10 +174,7 @@ DEG2-TTP-TXRX - ROADMA01-DEG1-DEG1-TTP-TXRXtoROADMC01-DEG2-DEG2-TTP-TXRX - 10 - fiber2 true 11.4 12 diff --git a/tests/sample_configs/openroadm/1.2.1/oper-XPDRC.xml b/tests/sample_configs/openroadm/1.2.1/oper-XPDRC.xml index 9d1fcd6b2..0a0cb5134 100644 --- a/tests/sample_configs/openroadm/1.2.1/oper-XPDRC.xml +++ b/tests/sample_configs/openroadm/1.2.1/oper-XPDRC.xml @@ -16,7 +16,7 @@ vendorA 1 00001 - 127.0.0.12 + 127.0.0.11 28 127.0.0.20 static diff --git a/tests/sample_configs/openroadm/2.2.1/oper-ROADMB.xml b/tests/sample_configs/openroadm/2.2.1/oper-ROADMB.xml index 45e2142b2..94162d572 100644 --- a/tests/sample_configs/openroadm/2.2.1/oper-ROADMB.xml +++ b/tests/sample_configs/openroadm/2.2.1/oper-ROADMB.xml @@ -16,11 +16,11 @@ vendorA model2 0002 - 127.0.0.11 + 127.0.0.12 28 127.0.0.20 static - 127.0.0.11 + 127.0.0.12 28 127.0.0.20 00:01:02:03:04:05 diff --git a/tests/sample_configs/openroadm/2.2.1/oper-ROADMC.xml b/tests/sample_configs/openroadm/2.2.1/oper-ROADMC.xml index 49d3bf617..1bd584bd0 100644 --- a/tests/sample_configs/openroadm/2.2.1/oper-ROADMC.xml +++ b/tests/sample_configs/openroadm/2.2.1/oper-ROADMC.xml @@ -16,11 +16,11 @@ vendorA model2 0002 - 127.0.0.11 + 127.0.0.13 28 127.0.0.20 static - 127.0.0.11 + 127.0.0.13 28 127.0.0.20 00:01:02:03:04:05 diff --git a/tests/sample_configs/openroadm/2.2.1/oper-XPDRC.xml b/tests/sample_configs/openroadm/2.2.1/oper-XPDRC.xml index 9eb2bb9c2..e055b4f29 100644 --- a/tests/sample_configs/openroadm/2.2.1/oper-XPDRC.xml +++ b/tests/sample_configs/openroadm/2.2.1/oper-XPDRC.xml @@ -15,15 +15,15 @@ NodeC vendorA model2 - nodeid-1234 - 1.2.3.4 + nodeid-1235 + 1.2.3.5 24 - 1.2.3.4 + 1.2.3.5 static - 1.2.3.4 + 1.2.3.5 10 1.2.3.1 - 00:01:02:03:04:05 + 00:01:02:03:04:06 swversion1234 2.2 diff --git a/tests/transportpce_tests/1.2.1/test_end2end.py b/tests/transportpce_tests/1.2.1/test_end2end.py index 06edb27de..a4b4ac05d 100644 --- a/tests/transportpce_tests/1.2.1/test_end2end.py +++ b/tests/transportpce_tests/1.2.1/test_end2end.py @@ -267,7 +267,6 @@ class TransportPCEFulltesting(unittest.TestCase): "OMS-attributes/span" .format(self.restconf_baseurl)) data = {"span": { - "clfi": "fiber1", "auto-spanloss": "true", "spanloss-base": 11.4, "spanloss-current": 12, @@ -290,7 +289,6 @@ class TransportPCEFulltesting(unittest.TestCase): "OMS-attributes/span" .format(self.restconf_baseurl)) data = {"span": { - "clfi": "fiber1", "auto-spanloss": "true", "spanloss-base": 11.4, "spanloss-current": 12, diff --git a/tests/transportpce_tests/1.2.1/test_topology.py b/tests/transportpce_tests/1.2.1/test_topology.py index 5e8aed0af..3aaa1a6cf 100644 --- a/tests/transportpce_tests/1.2.1/test_topology.py +++ b/tests/transportpce_tests/1.2.1/test_topology.py @@ -494,13 +494,12 @@ class TransportPCETopologyTesting(unittest.TestCase): time.sleep(20) def test_14_omsAttributes_ROADMA_ROADMC(self): - # Config ROADMA-ROADMC oms-attributes + # Config ROADMA01-ROADMC01 oms-attributes url = ("{}/config/ietf-network:networks/network/openroadm-topology/ietf-network-topology:" "link/ROADMA01-DEG1-DEG1-TTP-TXRXtoROADMC01-DEG2-DEG2-TTP-TXRX/org-openroadm-network-topology:" "OMS-attributes/span" .format(self.restconf_baseurl)) data = {"span": { - "clfi": "fiber1", "auto-spanloss": "true", "engineered-spanloss": 12.2, "link-concatenation": [{ @@ -521,7 +520,6 @@ class TransportPCETopologyTesting(unittest.TestCase): "OMS-attributes/span" .format(self.restconf_baseurl)) data = {"span": { - "clfi": "fiber1", "auto-spanloss": "true", "engineered-spanloss": 12.2, "link-concatenation": [{ @@ -790,10 +788,10 @@ class TransportPCETopologyTesting(unittest.TestCase): def test_21_connect_ROADMB(self): url = ("{}/config/network-topology:" - "network-topology/topology/topology-netconf/node/ROADMB" + "network-topology/topology/topology-netconf/node/ROADMB01" .format(self.restconf_baseurl)) data = {"node": [{ - "node-id": "ROADMB", + "node-id": "ROADMB01", "netconf-node-topology:username": "admin", "netconf-node-topology:password": "admin", "netconf-node-topology:host": "127.0.0.1", @@ -808,13 +806,12 @@ class TransportPCETopologyTesting(unittest.TestCase): time.sleep(20) def test_22_omsAttributes_ROADMA_ROADMB(self): - # Config ROADMA-ROADMB oms-attributes + # Config ROADMA01-ROADMB01 oms-attributes url = ("{}/config/ietf-network:networks/network/openroadm-topology/ietf-network-topology:" - "link/ROADMA01-DEG2-DEG2-TTP-TXRXtoROADMB-DEG1-DEG1-TTP-TXRX/org-openroadm-network-topology:" + "link/ROADMA01-DEG2-DEG2-TTP-TXRXtoROADMB01-DEG1-DEG1-TTP-TXRX/org-openroadm-network-topology:" "OMS-attributes/span" .format(self.restconf_baseurl)) data = {"span": { - "clfi": "fiber1", "auto-spanloss": "true", "engineered-spanloss": 12.2, "link-concatenation": [{ @@ -829,13 +826,12 @@ class TransportPCETopologyTesting(unittest.TestCase): self.assertEqual(response.status_code, requests.codes.created) def test_23_omsAttributes_ROADMB_ROADMA(self): - # Config ROADMB-ROADMA oms-attributes + # Config ROADMB01-ROADMA01 oms-attributes url = ("{}/config/ietf-network:networks/network/openroadm-topology/ietf-network-topology:" - "link/ROADMB-DEG1-DEG1-TTP-TXRXtoROADMA01-DEG2-DEG2-TTP-TXRX/org-openroadm-network-topology:" + "link/ROADMB01-DEG1-DEG1-TTP-TXRXtoROADMA01-DEG2-DEG2-TTP-TXRX/org-openroadm-network-topology:" "OMS-attributes/span" .format(self.restconf_baseurl)) data = {"span": { - "clfi": "fiber1", "auto-spanloss": "true", "engineered-spanloss": 12.2, "link-concatenation": [{ @@ -850,13 +846,12 @@ class TransportPCETopologyTesting(unittest.TestCase): self.assertEqual(response.status_code, requests.codes.created) def test_24_omsAttributes_ROADMB_ROADMC(self): - # Config ROADMB-ROADMC oms-attributes + # Config ROADMB01-ROADMC01 oms-attributes url = ("{}/config/ietf-network:networks/network/openroadm-topology/ietf-network-topology:" - "link/ROADMB-DEG2-DEG2-TTP-TXRXtoROADMC01-DEG1-DEG1-TTP-TXRX/org-openroadm-network-topology:" + "link/ROADMB01-DEG2-DEG2-TTP-TXRXtoROADMC01-DEG1-DEG1-TTP-TXRX/org-openroadm-network-topology:" "OMS-attributes/span" .format(self.restconf_baseurl)) data = {"span": { - "clfi": "fiber1", "auto-spanloss": "true", "engineered-spanloss": 12.2, "link-concatenation": [{ @@ -871,13 +866,12 @@ class TransportPCETopologyTesting(unittest.TestCase): self.assertEqual(response.status_code, requests.codes.created) def test_25_omsAttributes_ROADMC_ROADMB(self): - # Config ROADMC01-ROADMB oms-attributes + # Config ROADMC01-ROADMB01 oms-attributes url = ("{}/config/ietf-network:networks/network/openroadm-topology/ietf-network-topology:" - "link/ROADMC01-DEG1-DEG1-TTP-TXRXtoROADMB-DEG2-DEG2-TTP-TXRX/org-openroadm-network-topology:" + "link/ROADMC01-DEG1-DEG1-TTP-TXRXtoROADMB01-DEG2-DEG2-TTP-TXRX/org-openroadm-network-topology:" "OMS-attributes/span" .format(self.restconf_baseurl)) data = {"span": { - "clfi": "fiber1", "auto-spanloss": "true", "engineered-spanloss": 12.2, "link-concatenation": [{ @@ -925,8 +919,8 @@ class TransportPCETopologyTesting(unittest.TestCase): #Tests related to links nbLink=len(res['network'][0]['ietf-network-topology:link']) listR2RLink=['ROADMA01-DEG1-DEG1-TTP-TXRXtoROADMC01-DEG2-DEG2-TTP-TXRX','ROADMC01-DEG2-DEG2-TTP-TXRXtoROADMA01-DEG1-DEG1-TTP-TXRX', - 'ROADMA01-DEG2-DEG2-TTP-TXRXtoROADMB-DEG1-DEG1-TTP-TXRX','ROADMC01-DEG1-DEG1-TTP-TXRXtoROADMB-DEG2-DEG2-TTP-TXRX', - 'ROADMB-DEG1-DEG1-TTP-TXRXtoROADMA01-DEG2-DEG2-TTP-TXRX','ROADMB-DEG2-DEG2-TTP-TXRXtoROADMC01-DEG1-DEG1-TTP-TXRX'] + 'ROADMA01-DEG2-DEG2-TTP-TXRXtoROADMB01-DEG1-DEG1-TTP-TXRX','ROADMC01-DEG1-DEG1-TTP-TXRXtoROADMB01-DEG2-DEG2-TTP-TXRX', + 'ROADMB01-DEG1-DEG1-TTP-TXRXtoROADMA01-DEG2-DEG2-TTP-TXRX','ROADMB01-DEG2-DEG2-TTP-TXRXtoROADMC01-DEG1-DEG1-TTP-TXRX'] for i in range(0,nbLink): if res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-common-network:link-type'] == 'ROADM-TO-ROADM': link_id = res['network'][0]['ietf-network-topology:link'][i]['link-id'] @@ -987,10 +981,10 @@ class TransportPCETopologyTesting(unittest.TestCase): nbLink=len(res['network'][0]['ietf-network-topology:link']) R2RLink = ['ROADMA01-DEG1-DEG1-TTP-TXRXtoROADMC01-DEG2-DEG2-TTP-TXRX', 'ROADMC01-DEG2-DEG2-TTP-TXRXtoROADMA01-DEG1-DEG1-TTP-TXRX', - 'ROADMA01-DEG2-DEG2-TTP-TXRXtoROADMB-DEG1-DEG1-TTP-TXRX', - 'ROADMC01-DEG1-DEG1-TTP-TXRXtoROADMB-DEG2-DEG2-TTP-TXRX', - 'ROADMB-DEG1-DEG1-TTP-TXRXtoROADMA01-DEG2-DEG2-TTP-TXRX', - 'ROADMB-DEG2-DEG2-TTP-TXRXtoROADMC01-DEG1-DEG1-TTP-TXRX'] + 'ROADMA01-DEG2-DEG2-TTP-TXRXtoROADMB01-DEG1-DEG1-TTP-TXRX', + 'ROADMC01-DEG1-DEG1-TTP-TXRXtoROADMB01-DEG2-DEG2-TTP-TXRX', + 'ROADMB01-DEG1-DEG1-TTP-TXRXtoROADMA01-DEG2-DEG2-TTP-TXRX', + 'ROADMB01-DEG2-DEG2-TTP-TXRXtoROADMC01-DEG1-DEG1-TTP-TXRX'] for i in range(0,nbLink): nodeType = res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-common-network:link-type'] link_id=res['network'][0]['ietf-network-topology:link'][i]['link-id'] @@ -1009,7 +1003,7 @@ class TransportPCETopologyTesting(unittest.TestCase): def test_30_disconnect_ROADMB(self): #Delete in the topology-netconf url = ("{}/config/network-topology:" - "network-topology/topology/topology-netconf/node/ROADMB" + "network-topology/topology/topology-netconf/node/ROADMB01" .format(self.restconf_baseurl)) data = {} headers = {'content-type': 'application/json'} @@ -1143,7 +1137,7 @@ class TransportPCETopologyTesting(unittest.TestCase): self.assertEqual(nbNode,2) for i in range(0,nbNode-1): self.assertNotEqual(res['network'][0]['node'][i]['node-id'],'ROADMC01') - self.assertNotEqual(res['network'][0]['node'][i]['node-id'],'ROADMB') + self.assertNotEqual(res['network'][0]['node'][i]['node-id'],'ROADMB01') def test_34_getClliNetwork(self): url = ("{}/config/ietf-network:networks/network/clli-network" diff --git a/tests/transportpce_tests/2.2.1/test_end2end.py b/tests/transportpce_tests/2.2.1/test_end2end.py index 9603f50eb..5f8e42045 100644 --- a/tests/transportpce_tests/2.2.1/test_end2end.py +++ b/tests/transportpce_tests/2.2.1/test_end2end.py @@ -267,7 +267,6 @@ class TransportPCEFulltesting(unittest.TestCase): "OMS-attributes/span" .format(self.restconf_baseurl)) data = {"span": { - "clfi": "fiber1", "auto-spanloss": "true", "spanloss-base": 11.4, "spanloss-current": 12, @@ -290,7 +289,6 @@ class TransportPCEFulltesting(unittest.TestCase): "OMS-attributes/span" .format(self.restconf_baseurl)) data = {"span": { - "clfi": "fiber1", "auto-spanloss": "true", "spanloss-base": 11.4, "spanloss-current": 12, @@ -947,7 +945,6 @@ class TransportPCEFulltesting(unittest.TestCase): time.sleep(self.WAITING) # add a test that check the openroadm-service-list still only contains 2 elements - def test_29_delete_eth_service3(self): url = ("{}/operations/org-openroadm-service:service-delete" .format(self.restconf_baseurl)) diff --git a/tests/transportpce_tests/2.2.1/test_topology.py b/tests/transportpce_tests/2.2.1/test_topology.py index ac0838cff..9d299df75 100644 --- a/tests/transportpce_tests/2.2.1/test_topology.py +++ b/tests/transportpce_tests/2.2.1/test_topology.py @@ -501,7 +501,48 @@ class TransportPCEtesting(unittest.TestCase): self.assertEqual(response.status_code, requests.codes.created) time.sleep(20) - def test_14_getClliNetwork(self): + def test_14_omsAttributes_ROADMA_ROADMC(self): + # Config ROADMA-ROADMC oms-attributes + url = ("{}/config/ietf-network:networks/network/openroadm-topology/ietf-network-topology:" + "link/ROADM-A1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG1-DEG1-TTP-TXRX/org-openroadm-network-topology:" + "OMS-attributes/span" + .format(self.restconf_baseurl)) + data = {"span": { + "auto-spanloss": "true", + "engineered-spanloss": 12.2, + "link-concatenation": [{ + "SRLG-Id": 0, + "fiber-type": "smf", + "SRLG-length": 100000, + "pmd": 0.5}]}} + headers = {'content-type': 'application/json'} + response = requests.request( + "PUT", url, data=json.dumps(data), headers=headers, + auth=('admin', 'admin')) + self.assertEqual(response.status_code, requests.codes.created) + + def test_15_omsAttributes_ROADMC_ROADMA(self): + # Config ROADM-C1-ROADM-A1 oms-attributes + url = ("{}/config/ietf-network:networks/network/openroadm-topology/ietf-network-topology:" + "link/ROADM-C1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG2-DEG2-TTP-TXRX/org-openroadm-network-topology:" + "OMS-attributes/span" + .format(self.restconf_baseurl)) + data = {"span": { + "auto-spanloss": "true", + "engineered-spanloss": 12.2, + "link-concatenation": [{ + "SRLG-Id": 0, + "fiber-type": "smf", + "SRLG-length": 100000, + "pmd": 0.5}]}} + + headers = {'content-type': 'application/json'} + response = requests.request( + "PUT", url, data=json.dumps(data), headers=headers, + auth=('admin', 'admin')) + self.assertEqual(response.status_code, requests.codes.created) + + def test_16_getClliNetwork(self): url = ("{}/config/ietf-network:networks/network/clli-network" .format(self.restconf_baseurl)) headers = {'content-type': 'application/json'} @@ -522,7 +563,7 @@ class TransportPCEtesting(unittest.TestCase): listNode.remove(nodeId) self.assertEqual(len(listNode),0) - def test_15_getOpenRoadmNetwork(self): + def test_17_getOpenRoadmNetwork(self): url = ("{}/config/ietf-network:networks/network/openroadm-network" .format(self.restconf_baseurl)) headers = {'content-type': 'application/json'} @@ -555,7 +596,7 @@ class TransportPCEtesting(unittest.TestCase): self.assertFalse(True) self.assertEqual(len(listNode),0) - def test_16_getROADMLinkOpenRoadmTopology(self): + def test_18_getROADMLinkOpenRoadmTopology(self): url = ("{}/config/ietf-network:networks/network/openroadm-topology" .format(self.restconf_baseurl)) headers = {'content-type': 'application/json'} @@ -613,7 +654,35 @@ class TransportPCEtesting(unittest.TestCase): self.assertEqual(len(XPDR_IN),0) self.assertEqual(len(XPDR_OUT),0) - def test_17_getNodes_OpenRoadmTopology(self): + def test_19_getLinkOmsAttributesOpenRoadmTopology(self): + url = ("{}/config/ietf-network:networks/network/openroadm-topology" + .format(self.restconf_baseurl)) + headers = {'content-type': 'application/json'} + response = requests.request( + "GET", url, headers=headers, auth=('admin', 'admin')) + self.assertEqual(response.status_code, requests.codes.ok) + res = response.json() + #Tests related to links + nbLink=len(res['network'][0]['ietf-network-topology:link']) + self.assertEqual(nbLink,20) + R2RLink=['ROADM-A1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG1-DEG1-TTP-TXRX', + 'ROADM-C1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG2-DEG2-TTP-TXRX'] + for i in range(0,nbLink): + nodeType = res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-common-network:link-type'] + link_id=res['network'][0]['ietf-network-topology:link'][i]['link-id'] + if(link_id in R2RLink): + find = False + spanLoss = res['network'][0]['ietf-network-topology:link'][i][ + 'org-openroadm-network-topology:OMS-attributes']['span']["engineered-spanloss"] + length = res['network'][0]['ietf-network-topology:link'][i][ + 'org-openroadm-network-topology:OMS-attributes']['span']['link-concatenation'][0]['SRLG-length'] + if((spanLoss!=None)&(length!=None)): + find = True + self.assertTrue(find) + R2RLink.remove(link_id) + self.assertEqual(len(R2RLink),0) + + def test_20_getNodes_OpenRoadmTopology(self): url = ("{}/config/ietf-network:networks/network/openroadm-topology" .format(self.restconf_baseurl)) headers = {'content-type': 'application/json'} @@ -725,7 +794,7 @@ class TransportPCEtesting(unittest.TestCase): self.assertFalse(True) self.assertEqual(len(listNode),0) - def test_18_connect_ROADMB(self): + def test_21_connect_ROADMB(self): url = ("{}/config/network-topology:" "network-topology/topology/topology-netconf/node/ROADM-B1" .format(self.restconf_baseurl)) @@ -744,7 +813,93 @@ class TransportPCEtesting(unittest.TestCase): self.assertEqual(response.status_code, requests.codes.created) time.sleep(20) - def test_19_getClliNetwork(self): + def test_22_omsAttributes_ROADMA_ROADMB(self): + # Config ROADM-A1-ROADM-B1 oms-attributes + url = ("{}/config/ietf-network:networks/network/openroadm-topology/ietf-network-topology:" + "link/ROADM-A1-DEG1-DEG1-TTP-TXRXtoROADM-B1-DEG1-DEG1-TTP-TXRX/org-openroadm-network-topology:" + "OMS-attributes/span" + .format(self.restconf_baseurl)) + data = {"span": { + "auto-spanloss": "true", + "engineered-spanloss": 12.2, + "spanloss-current": 12, + "spanloss-base": 11.4, + "link-concatenation": [{ + "SRLG-Id": 0, + "fiber-type": "smf", + "SRLG-length": 100000, + "pmd": 0.5}]}} + headers = {'content-type': 'application/json'} + response = requests.request( + "PUT", url, data=json.dumps(data), headers=headers, + auth=('admin', 'admin')) + self.assertEqual(response.status_code, requests.codes.created) + + def test_23_omsAttributes_ROADMB_ROADMA(self): + # Config ROADM-B1-ROADM-A1 oms-attributes + url = ("{}/config/ietf-network:networks/network/openroadm-topology/ietf-network-topology:" + "link/ROADM-B1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG1-DEG1-TTP-TXRX/org-openroadm-network-topology:" + "OMS-attributes/span" + .format(self.restconf_baseurl)) + data = {"span": { + "auto-spanloss": "true", + "engineered-spanloss": 12.2, + "spanloss-current": 12, + "spanloss-base": 11.4, + "link-concatenation": [{ + "SRLG-Id": 0, + "fiber-type": "smf", + "SRLG-length": 100000, + "pmd": 0.5}]}} + headers = {'content-type': 'application/json'} + response = requests.request( + "PUT", url, data=json.dumps(data), headers=headers, + auth=('admin', 'admin')) + self.assertEqual(response.status_code, requests.codes.created) + + def test_24_omsAttributes_ROADMB_ROADMC(self): + # Config ROADM-B1-ROADM-C1 oms-attributes + url = ("{}/config/ietf-network:networks/network/openroadm-topology/ietf-network-topology:" + "link/ROADM-B1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG2-DEG2-TTP-TXRX/org-openroadm-network-topology:" + "OMS-attributes/span" + .format(self.restconf_baseurl)) + data = {"span": { + "auto-spanloss": "true", + "engineered-spanloss": 12.2, + "spanloss-current": 12, + "spanloss-base": 11.4, + "link-concatenation": [{ + "SRLG-Id": 0, + "fiber-type": "smf", + "SRLG-length": 100000, + "pmd": 0.5}]}} + headers = {'content-type': 'application/json'} + response = requests.request( + "PUT", url, data=json.dumps(data), headers=headers, + auth=('admin', 'admin')) + self.assertEqual(response.status_code, requests.codes.created) + + def test_25_omsAttributes_ROADMC_ROADMB(self): + # Config ROADM-C1-ROADM-B1 oms-attributes + url = ("{}/config/ietf-network:networks/network/openroadm-topology/ietf-network-topology:" + "link/ROADM-C1-DEG2-DEG2-TTP-TXRXtoROADM-B1-DEG2-DEG2-TTP-TXRX/org-openroadm-network-topology:" + "OMS-attributes/span" + .format(self.restconf_baseurl)) + data = {"span": { + "auto-spanloss": "true", + "engineered-spanloss": 12.2, + "link-concatenation": [{ + "SRLG-Id": 0, + "fiber-type": "smf", + "SRLG-length": 100000, + "pmd": 0.5}]}} + headers = {'content-type': 'application/json'} + response = requests.request( + "PUT", url, data=json.dumps(data), headers=headers, + auth=('admin', 'admin')) + self.assertEqual(response.status_code, requests.codes.created) + + def test_26_getClliNetwork(self): url = ("{}/config/ietf-network:networks/network/clli-network" .format(self.restconf_baseurl)) headers = {'content-type': 'application/json'} @@ -767,7 +922,7 @@ class TransportPCEtesting(unittest.TestCase): listNode.remove(nodeId) self.assertEqual(len(listNode),0) - def test_20_verifyDegree(self): + def test_27_verifyDegree(self): url = ("{}/config/ietf-network:networks/network/openroadm-topology" .format(self.restconf_baseurl)) headers = {'content-type': 'application/json'} @@ -788,7 +943,7 @@ class TransportPCEtesting(unittest.TestCase): listR2RLink.remove(link_id) self.assertEqual(len(listR2RLink),0) - def test_21_verifyOppositeLinkTopology(self): + def test_28_verifyOppositeLinkTopology(self): url = ("{}/config/ietf-network:networks/network/openroadm-topology" .format(self.restconf_baseurl)) headers = {'content-type': 'application/json'} @@ -829,7 +984,37 @@ class TransportPCEtesting(unittest.TestCase): elif link_type=='XPONDER-OUTPUT': self.assertEqual(oppLink_type, 'XPONDER-INPUT') - def test_22_disconnect_ROADMB(self): + def test_29_getLinkOmsAttributesOpenRoadmTopology(self): + url = ("{}/config/ietf-network:networks/network/openroadm-topology" + .format(self.restconf_baseurl)) + headers = {'content-type': 'application/json'} + response = requests.request( + "GET", url, headers=headers, auth=('admin', 'admin')) + self.assertEqual(response.status_code, requests.codes.ok) + res = response.json() + nbLink=len(res['network'][0]['ietf-network-topology:link']) + R2RLink = ['ROADM-A1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG1-DEG1-TTP-TXRX', + 'ROADM-C1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG2-DEG2-TTP-TXRX', + 'ROADM-A1-DEG1-DEG1-TTP-TXRXtoROADM-B1-DEG1-DEG1-TTP-TXRX', + 'ROADM-C1-DEG2-DEG2-TTP-TXRXtoROADM-B1-DEG2-DEG2-TTP-TXRX', + 'ROADM-B1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG1-DEG1-TTP-TXRX', + 'ROADM-B1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG2-DEG2-TTP-TXRX'] + for i in range(0,nbLink): + nodeType = res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-common-network:link-type'] + link_id=res['network'][0]['ietf-network-topology:link'][i]['link-id'] + if(link_id in R2RLink): + find = False + spanLoss = res['network'][0]['ietf-network-topology:link'][i][ + 'org-openroadm-network-topology:OMS-attributes']['span']["engineered-spanloss"] + length = res['network'][0]['ietf-network-topology:link'][i][ + 'org-openroadm-network-topology:OMS-attributes']['span']['link-concatenation'][0]['SRLG-length'] + if((spanLoss!=None)&(length!=None)): + find = True + self.assertTrue(find) + R2RLink.remove(link_id) + self.assertEqual(len(R2RLink),0) + + def test_30_disconnect_ROADMB(self): #Delete in the topology-netconf url = ("{}/config/network-topology:" "network-topology/topology/topology-netconf/node/ROADM-B1" @@ -850,7 +1035,7 @@ class TransportPCEtesting(unittest.TestCase): auth=('admin', 'admin')) self.assertEqual(response.status_code, requests.codes.ok) - def test_23_disconnect_ROADMC(self): + def test_31_disconnect_ROADMC(self): #Delete in the topology-netconf url = ("{}/config/network-topology:" "network-topology/topology/topology-netconf/node/ROADM-C1" @@ -930,7 +1115,7 @@ class TransportPCEtesting(unittest.TestCase): # self.assertNotEqual(res['network'][0]['ietf-network-topology:link'][i]['link-id'],'ROADMC-DEG1-DEG1-CTP-TXRXtoROADMC-DEG2-DEG2-CTP-TXRX') # self.assertNotEqual(res['network'][0]['ietf-network-topology:link'][i]['link-id'],'ROADMC-DEG2-DEG2-CTP-TXRXtoROADMC-DEG1-DEG1-CTP-TXRX') - def test_25_getNodes_OpenRoadmTopology(self): + def test_32_getNodes_OpenRoadmTopology(self): url = ("{}/config/ietf-network:networks/network/openroadm-topology" .format(self.restconf_baseurl)) headers = {'content-type': 'application/json'} @@ -1013,7 +1198,7 @@ class TransportPCEtesting(unittest.TestCase): self.assertNotEqual(res['network'][0]['node'][i]['node-id'],'ROADM-C1-DEG1') self.assertNotEqual(res['network'][0]['node'][i]['node-id'],'ROADM-C1-DEG2') - def test_26_getOpenRoadmNetwork(self): + def test_33_getOpenRoadmNetwork(self): url = ("{}/config/ietf-network:networks/network/openroadm-network" .format(self.restconf_baseurl)) headers = {'content-type': 'application/json'} @@ -1027,7 +1212,7 @@ class TransportPCEtesting(unittest.TestCase): self.assertNotEqual(res['network'][0]['node'][i]['node-id'],'ROADM-C1') self.assertNotEqual(res['network'][0]['node'][i]['node-id'],'ROADM-B1') - def test_27_getClliNetwork(self): + def test_34_getClliNetwork(self): url = ("{}/config/ietf-network:networks/network/clli-network" .format(self.restconf_baseurl)) headers = {'content-type': 'application/json'} @@ -1040,7 +1225,7 @@ class TransportPCEtesting(unittest.TestCase): for i in range(0,nbNode-1): self.assertNotEqual(res['network'][0]['node'][1]['org-openroadm-clli-network:clli'],'NodeC') - def test_28_disconnect_XPDRA(self): + def test_35_disconnect_XPDRA(self): url = ("{}/config/network-topology:" "network-topology/topology/topology-netconf/node/XPDR-A1" .format(self.restconf_baseurl)) @@ -1051,7 +1236,7 @@ class TransportPCEtesting(unittest.TestCase): auth=('admin', 'admin')) self.assertEqual(response.status_code, requests.codes.ok) - def test_29_getClliNetwork(self): + def test_36_getClliNetwork(self): url = ("{}/config/ietf-network:networks/network/clli-network" .format(self.restconf_baseurl)) headers = {'content-type': 'application/json'} @@ -1063,7 +1248,7 @@ class TransportPCEtesting(unittest.TestCase): self.assertEqual(nbNode,1) self.assertEqual(res['network'][0]['node'][0]['org-openroadm-clli-network:clli'],'NodeA') - def test_30_getOpenRoadmNetwork(self): + def test_37_getOpenRoadmNetwork(self): url = ("{}/config/ietf-network:networks/network/openroadm-network" .format(self.restconf_baseurl)) headers = {'content-type': 'application/json'} @@ -1076,7 +1261,7 @@ class TransportPCEtesting(unittest.TestCase): for i in range(0,nbNode): self.assertNotEqual(res['network'][0]['node'][i]['node-id'],'XPDR-A1') - def test_31_getNodes_OpenRoadmTopology(self): + def test_38_getNodes_OpenRoadmTopology(self): url = ("{}/config/ietf-network:networks/network/openroadm-topology" .format(self.restconf_baseurl)) headers = {'content-type': 'application/json'} @@ -1131,7 +1316,7 @@ class TransportPCEtesting(unittest.TestCase): self.assertFalse(True) self.assertEqual(len(listNode),0) - def test_32_disconnect_ROADM_XPDRA_link(self): + def test_39_disconnect_ROADM_XPDRA_link(self): #Link-1 url = ("{}/config/ietf-network:networks/network/openroadm-topology/ietf-network-topology:" "link/XPDR-A1-XPDR1-XPDR1-NETWORK1toROADM-A1-SRG1-SRG1-PP1-TXRX" @@ -1153,7 +1338,7 @@ class TransportPCEtesting(unittest.TestCase): auth=('admin', 'admin')) self.assertEqual(response.status_code, requests.codes.ok) - def test_33_getLinks_OpenRoadmTopology(self): + def test_40_getLinks_OpenRoadmTopology(self): url = ("{}/config/ietf-network:networks/network/openroadm-topology" .format(self.restconf_baseurl)) headers = {'content-type': 'application/json'} @@ -1195,7 +1380,7 @@ class TransportPCEtesting(unittest.TestCase): self.assertNotEqual(res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-common-network:link-type'],'XPONDER-OUTPUT') self.assertNotEqual(res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-common-network:link-type'],'XPONDER-INPUT') - def test_34_disconnect_ROADMA(self): + def test_41_disconnect_ROADMA(self): url = ("{}/config/network-topology:" "network-topology/topology/topology-netconf/node/ROADM-A1" .format(self.restconf_baseurl)) @@ -1215,7 +1400,7 @@ class TransportPCEtesting(unittest.TestCase): auth=('admin', 'admin')) self.assertEqual(response.status_code, requests.codes.ok) - def test_35_getClliNetwork(self): + def test_42_getClliNetwork(self): url = ("{}/config/ietf-network:networks/network/clli-network" .format(self.restconf_baseurl)) headers = {'content-type': 'application/json'} @@ -1225,7 +1410,7 @@ class TransportPCEtesting(unittest.TestCase): res = response.json() self.assertNotIn('node', res['network'][0]) - def test_36_getOpenRoadmNetwork(self): + def test_43_getOpenRoadmNetwork(self): url = ("{}/config/ietf-network:networks/network/openroadm-network" .format(self.restconf_baseurl)) headers = {'content-type': 'application/json'} @@ -1235,7 +1420,7 @@ class TransportPCEtesting(unittest.TestCase): res = response.json() self.assertNotIn('node', res['network'][0]) - def test_37_check_roadm2roadm_link_persistence(self): + def test_44_check_roadm2roadm_link_persistence(self): url = ("{}/config/ietf-network:networks/network/openroadm-topology" .format(self.restconf_baseurl)) headers = {'content-type': 'application/json'} -- 2.36.6