From 6bb5391db7481775991661ae582ad9a3f6de1a77 Mon Sep 17 00:00:00 2001 From: Gilles Thouenon Date: Tue, 2 Feb 2021 18:36:21 +0100 Subject: [PATCH] Update topology input files for Tapi topology UT - to take into acount Administrative and operational states present in openroadm-topology and otn-topology, as well as flexgrid data - fix issues in ConvertORTopoToTapiTopo.java when converting openroadm supported interfaces to tapi supported layer protocoles (extend the number of supported interfaces handled, use Set interface instead of List to avoid possible duplication of entries) - adapt UT consequently JIRA: TRNSPRTPCE-393 Signed-off-by: Gilles Thouenon Change-Id: I4f69329734f9533eb8f1549ca08cd3dd631de597 --- .../topology/ConvertORTopoToTapiTopo.java | 50 +- ...onvertORTopoObjectToTapiTooObjectTest.java | 11 +- .../src/test/resources/openroadm-topology.xml | 917 ++++---- tapi/src/test/resources/otn-topology.xml | 1907 +++++++++-------- tapi/src/test/resources/portmapping.xml | 1104 +++++----- 5 files changed, 2140 insertions(+), 1849 deletions(-) diff --git a/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/ConvertORTopoToTapiTopo.java b/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/ConvertORTopoToTapiTopo.java index a0d87ae12..2d999780a 100644 --- a/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/ConvertORTopoToTapiTopo.java +++ b/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/ConvertORTopoToTapiTopo.java @@ -12,10 +12,12 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; import java.util.HashMap; +import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Map.Entry; +import java.util.Set; import java.util.UUID; import java.util.stream.Collectors; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.TerminationPoint1; @@ -52,6 +54,7 @@ import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.glob import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.global._class.NameKey; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.dsr.rev181210.DIGITALSIGNALTYPE100GigE; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.dsr.rev181210.DIGITALSIGNALTYPE10GigELAN; +import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.odu.rev181210.ODUTYPEODU2; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.odu.rev181210.ODUTYPEODU2E; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.odu.rev181210.ODUTYPEODU4; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.photonic.media.rev181210.PHOTONICLAYERQUALIFIEROMS; @@ -565,7 +568,7 @@ public class ConvertORTopoToTapiTopo { private List> createSupportedCepLayerProtocolQualifier(TerminationPoint tp, LayerProtocolName lpn) { - List> sclpqList = new ArrayList<>(); + Set> sclpqSet = new HashSet<>(); List sicList = new ArrayList<>( tp.augmentation(org.opendaylight.yang.gen.v1.http .org.openroadm.otn.network.topology.rev200529.TerminationPoint1.class).getTpSupportedInterfaces() @@ -573,22 +576,39 @@ public class ConvertORTopoToTapiTopo { for (SupportedInterfaceCapability sic : sicList) { switch (lpn.getName()) { case "DSR": - if (sic.getIfCapType().getSimpleName().equals("If10GEODU2e")) { - sclpqList.add(DIGITALSIGNALTYPE10GigELAN.class); - sclpqList.add(ODUTYPEODU2E.class); - } else if (sic.getIfCapType().getSimpleName().equals("IfOCHOTU4ODU4")) { - sclpqList.add(ODUTYPEODU4.class); - } else if (sic.getIfCapType().getSimpleName().equals("If100GEODU4")) { - sclpqList.add(DIGITALSIGNALTYPE100GigE.class); - sclpqList.add(ODUTYPEODU4.class); - } else if (sic.getIfCapType().getSimpleName().equals("If100GE")) { - sclpqList.add(DIGITALSIGNALTYPE100GigE.class); + switch (sic.getIfCapType().getSimpleName()) { + case "If10GEODU2e": + sclpqSet.add(ODUTYPEODU2E.class); + sclpqSet.add(DIGITALSIGNALTYPE10GigELAN.class); + break; + case "If10GEODU2": + sclpqSet.add(ODUTYPEODU2.class); + sclpqSet.add(DIGITALSIGNALTYPE10GigELAN.class); + break; + case "If10GE": + sclpqSet.add(DIGITALSIGNALTYPE10GigELAN.class); + break; + case "If100GEODU4": + sclpqSet.add(DIGITALSIGNALTYPE100GigE.class); + sclpqSet.add(ODUTYPEODU4.class); + break; + case "If100GE": + sclpqSet.add(DIGITALSIGNALTYPE100GigE.class); + break; + case "IfOCHOTU4ODU4": + case "IfOCH": + sclpqSet.add(ODUTYPEODU4.class); + break; + default: + LOG.error("IfCapability type not managed"); + break; } break; case "PHOTONIC_MEDIA": - if (sic.getIfCapType().getSimpleName().equals("IfOCHOTU4ODU4")) { - sclpqList.add(PHOTONICLAYERQUALIFIEROTSi.class); - sclpqList.add(PHOTONICLAYERQUALIFIEROMS.class); + if (sic.getIfCapType().getSimpleName().equals("IfOCHOTU4ODU4") + || sic.getIfCapType().getSimpleName().equals("IfOCH")) { + sclpqSet.add(PHOTONICLAYERQUALIFIEROTSi.class); + sclpqSet.add(PHOTONICLAYERQUALIFIEROMS.class); } break; default: @@ -596,7 +616,7 @@ public class ConvertORTopoToTapiTopo { break; } } - return sclpqList; + return new ArrayList<>(sclpqSet); } private void createTapiTransitionalLinks() { diff --git a/tapi/src/test/java/org/opendaylight/transportpce/tapi/topology/ConvertORTopoObjectToTapiTooObjectTest.java b/tapi/src/test/java/org/opendaylight/transportpce/tapi/topology/ConvertORTopoObjectToTapiTooObjectTest.java index abe843129..b1e072abb 100644 --- a/tapi/src/test/java/org/opendaylight/transportpce/tapi/topology/ConvertORTopoObjectToTapiTooObjectTest.java +++ b/tapi/src/test/java/org/opendaylight/transportpce/tapi/topology/ConvertORTopoObjectToTapiTooObjectTest.java @@ -61,6 +61,7 @@ import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.glob import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.global._class.NameKey; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.dsr.rev181210.DIGITALSIGNALTYPE100GigE; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.dsr.rev181210.DIGITALSIGNALTYPE10GigELAN; +import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.odu.rev181210.ODUTYPEODU2; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.odu.rev181210.ODUTYPEODU2E; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.odu.rev181210.ODUTYPEODU4; import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.photonic.media.rev181210.PHOTONICLAYERQUALIFIEROMS; @@ -544,11 +545,11 @@ public class ConvertORTopoObjectToTapiTooObjectTest extends AbstractTest { portName, name.getValue()); assertEquals("value-name of client nep for '" + portName + "' should be '" + nepName + "'", nepName, name.getValueName()); - assertEquals("Client nep should support 2 kind of cep", - 2, nep.getSupportedCepLayerProtocolQualifier().size()); - assertThat("client nep should support 2 kind of cep", + assertEquals("Client nep should support 3 kind of cep", + 3, nep.getSupportedCepLayerProtocolQualifier().size()); + assertThat("client nep should support 3 kind of cep", nep.getSupportedCepLayerProtocolQualifier(), - hasItems(ODUTYPEODU2E.class, DIGITALSIGNALTYPE10GigELAN.class)); + hasItems(ODUTYPEODU2.class, ODUTYPEODU2E.class, DIGITALSIGNALTYPE10GigELAN.class)); assertEquals("client nep should be of ETH protocol type", LayerProtocolName.ETH, nep.getLayerProtocolName()); checkCommonPartOfNep(nep, false); } @@ -559,7 +560,7 @@ public class ConvertORTopoObjectToTapiTooObjectTest extends AbstractTest { Name name = nameList.get(0); assertEquals("value of network nep should be '" + portName + "'", portName, name.getValue()); - assertEquals("value-name of client nep for '" + portName + "' should be '" + nepName + "'", + assertEquals("value-name of network nep for '" + portName + "' should be '" + nepName + "'", nepName, name.getValueName()); assertEquals("Network nep should support 1 kind of cep", 1, nep.getSupportedCepLayerProtocolQualifier().size()); diff --git a/tapi/src/test/resources/openroadm-topology.xml b/tapi/src/test/resources/openroadm-topology.xml index a7d2a5cf4..54068af22 100644 --- a/tapi/src/test/resources/openroadm-topology.xml +++ b/tapi/src/test/resources/openroadm-topology.xml @@ -3,46 +3,51 @@ openroadm-topology - + ROADM-A1-SRG3 - + SRG + inService + inService + SRG3-PP3-TXRX + inService + inService SRG-TXRX-PP - + SRG3-PP2-TXRX + inService + inService SRG-TXRX-PP - + SRG3-CP-TXRX + inService + inService SRG-TXRX-CP - + SRG3-PP1-TXRX + inService + inService SRG-TXRX-PP - + SRG3-PP4-TXRX + inService + inService SRG-TXRX-PP - - + + cband - 191.325 - 6.25 - 8 - //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - - + 6.25 + 191.325 + 768 + //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + clli-network @@ -52,41 +57,41 @@ openroadm-network ROADM-A1 - SRG XPDR-C1-XPDR1 - + XPONDER + inService + inService + XPDR1-CLIENT1 - XPDR1-NETWORK1 + XPDR1-NETWORK1 + inService + inService XPONDER-CLIENT - + XPDR1-CLIENT2 - XPDR1-NETWORK2 + XPDR1-NETWORK2 + inService + inService XPONDER-CLIENT - + XPDR1-NETWORK2 - XPDR1-CLIENT2 + XPDR1-CLIENT2 + inService + inService XPONDER-NETWORK - + XPDR1-NETWORK1 - XPDR1-CLIENT1 - - ROADM-C1-SRG1--SRG1-PP1-TXRX - + XPDR1-CLIENT1 + + ROADM-C1-SRG1--SRG1-PP1-TXRX + inService + inService XPONDER-NETWORK @@ -97,45 +102,50 @@ openroadm-network XPDR-C1 - XPONDER ROADM-A1-SRG1 - + SRG + inService + inService + SRG1-PP4-TXRX + inService + inService SRG-TXRX-PP - + SRG1-PP1-TXRX + inService + inService SRG-TXRX-PP - + SRG1-PP2-TXRX + inService + inService SRG-TXRX-PP - + SRG1-PP3-TXRX + inService + inService SRG-TXRX-PP - + SRG1-CP-TXRX + inService + inService SRG-TXRX-CP - - + + cband - 191.325 - 6.25 - 8 - //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - - + 6.25 + 191.325 + 768 + //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + clli-network @@ -145,31 +155,34 @@ openroadm-network ROADM-A1 - SRG ROADM-A1-DEG1 - + DEGREE + inService + inService + DEG1-CTP-TXRX + inService + inService DEGREE-TXRX-CTP - + DEG1-TTP-TXRX + inService + inService DEGREE-TXRX-TTP - + 1 - + cband - 191.325 - 6.25 - 8 - //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - - + 6.25 + 191.325 + 768 + //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + + clli-network NodeA @@ -178,41 +191,74 @@ openroadm-network ROADM-A1 + + + ROADM-A1-DEG2 DEGREE + inService + inService + + DEG2-TTP-TXRX + inService + inService + DEGREE-TXRX-TTP + + + DEG2-CTP-TXRX + inService + inService + DEGREE-TXRX-CTP + + + 2 + + cband + 6.25 + 191.325 + 768 + //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + + + + clli-network + NodeA + + + openroadm-network + ROADM-A1 + XPDR-A1-XPDR1 - + XPONDER + inService + inService + XPDR1-CLIENT1 - XPDR1-NETWORK1 + XPDR1-NETWORK1 + inService + inService XPONDER-CLIENT - + XPDR1-CLIENT2 - XPDR1-NETWORK2 + XPDR1-NETWORK2 + inService + inService XPONDER-CLIENT - + XPDR1-NETWORK2 - XPDR1-CLIENT2 + XPDR1-CLIENT2 + inService + inService XPONDER-NETWORK - + XPDR1-NETWORK1 - XPDR1-CLIENT1 - - ROADM-A1-SRG1--SRG1-PP1-TXRX - - + XPDR1-CLIENT1 + inService + inService XPONDER-NETWORK @@ -223,78 +269,51 @@ clli-network NodeA - XPONDER - - - ROADM-A1-DEG2 - - DEG2-TTP-TXRX - DEGREE-TXRX-TTP - - - DEG2-CTP-TXRX - DEGREE-TXRX-CTP - - - 2 - - cband - 191.325 - 6.25 - 8 - //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - - - - clli-network - NodeA - - - openroadm-network - ROADM-A1 - - DEGREE ROADM-C1-SRG1 - + SRG + inService + inService + SRG1-PP4-TXRX + inService + inService SRG-TXRX-PP - + SRG1-PP1-TXRX + inService + inService SRG-TXRX-PP - + SRG1-PP2-TXRX + inService + inService SRG-TXRX-PP - + SRG1-PP3-TXRX + inService + inService SRG-TXRX-PP - + SRG1-CP-TXRX + inService + inService SRG-TXRX-CP - - + + cband - 191.325 - 6.25 - 8 - //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - - + 6.25 + 191.325 + 768 + //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + + clli-network NodeC @@ -303,19 +322,20 @@ openroadm-network ROADM-C1 - SRG SPDR-SA1-XPDR1 - + XPONDER + inService + inService + XPDR1-NETWORK1 - XPONDER-NETWORK - - ROADM-A1-SRG1--SRG1-PP2-TXRX - + + ROADM-A1-SRG1--SRG1-PP2-TXRX + inService + inService + XPONDER-NETWORK openroadm-network @@ -325,31 +345,34 @@ clli-network NodeSA - XPONDER ROADM-C1-DEG1 - + DEGREE + inService + inService + DEG1-CTP-TXRX + inService + inService DEGREE-TXRX-CTP - + DEG1-TTP-TXRX + inService + inService DEGREE-TXRX-TTP - + 1 - + cband - 191.325 - 6.25 - 8 - //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - - + 6.25 + 191.325 + 768 + //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + + clli-network NodeC @@ -358,19 +381,20 @@ openroadm-network ROADM-C1 - DEGREE SPDR-SC1-XPDR1 - + XPONDER + inService + inService + XPDR1-NETWORK1 - XPONDER-NETWORK - - ROADM-C1-SRG1--SRG1-PP2-TXRX - + + ROADM-C1-SRG1--SRG1-PP2-TXRX + inService + inService + XPONDER-NETWORK openroadm-network @@ -380,31 +404,33 @@ clli-network NodeSC - XPONDER ROADM-C1-DEG2 - + DEGREE + inService + inService + DEG2-TTP-TXRX + inService + inService DEGREE-TXRX-TTP - + DEG2-CTP-TXRX + inService + inService DEGREE-TXRX-CTP - + 2 - + cband - 191.325 - 6.25 - 8 - //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - - + 6.25 + 191.325 + 768 + //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// + clli-network @@ -414,38 +440,80 @@ openroadm-network ROADM-C1 - DEGREE + + + SPDR-SA1-XPDR3 + XPONDER + inService + inService + + XPDR3-NETWORK1 + inService + inService + XPONDER-NETWORK + + + openroadm-network + SPDR-SA1 + + + clli-network + NodeSA + + + + SPDR-SC1-XPDR3 + XPONDER + inService + inService + + XPDR3-NETWORK1 + inService + inService + XPONDER-NETWORK + + + openroadm-network + SPDR-SC1 + + + clli-network + NodeSC + SPDR-SA1-XPDR2 - + XPONDER + inService + inService + XPDR2-NETWORK1 + inService + inService XPONDER-NETWORK - + XPDR2-NETWORK3 - XPONDER-NETWORK - - ROADM-A1-SRG1--SRG1-PP4-TXRX - + + ROADM-A1-SRG1--SRG1-PP4-TXRX + inService + inService + XPONDER-NETWORK - + XPDR2-NETWORK2 - XPONDER-NETWORK - - ROADM-A1-SRG1--SRG1-PP3-TXRX - + + ROADM-A1-SRG1--SRG1-PP3-TXRX + inService + inService + XPONDER-NETWORK - + XPDR2-NETWORK4 + inService + inService XPONDER-NETWORK @@ -456,38 +524,40 @@ clli-network NodeSA - XPONDER SPDR-SC1-XPDR2 - + XPONDER + inService + inService + XPDR2-NETWORK1 + inService + inService XPONDER-NETWORK - + XPDR2-NETWORK3 - XPONDER-NETWORK - - ROADM-C1-SRG1--SRG1-PP4-TXRX - + + ROADM-C1-SRG1--SRG1-PP4-TXRX + inService + inService + XPONDER-NETWORK - + XPDR2-NETWORK2 - XPONDER-NETWORK - - ROADM-C1-SRG1--SRG1-PP3-TXRX - + + ROADM-C1-SRG1--SRG1-PP3-TXRX + inService + inService + XPONDER-NETWORK - + XPDR2-NETWORK4 + inService + inService XPONDER-NETWORK @@ -498,558 +568,517 @@ clli-network NodeSC - XPONDER - ROADM-C1-SRG1-SRG1-PP2-TXRXtoSPDR-SC1-XPDR1-XPDR1-NETWORK1 - + ROADM-C1-SRG1-SRG1-PP2-TXRXtoSPDR-SC1-XPDR1-XPDR1-NETWORK1 ROADM-C1-SRG1 SRG1-PP2-TXRX + XPONDER-INPUT + inService + SPDR-SC1-XPDR1-XPDR1-NETWORK1toROADM-C1-SRG1-SRG1-PP2-TXRX + inService XPDR1-NETWORK1 SPDR-SC1-XPDR1 - SPDR-SC1-XPDR1-XPDR1-NETWORK1toROADM-C1-SRG1-SRG1-PP2-TXRX - - XPONDER-INPUT - ROADM-A1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG1-DEG1-TTP-TXRX - + ROADM-A1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG1-DEG1-TTP-TXRX ROADM-A1-DEG2 DEG2-TTP-TXRX - - + ROADM-TO-ROADM + inService + ROADM-C1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG2-DEG2-TTP-TXRX + inService DEG1-TTP-TXRX ROADM-C1-DEG1 - ROADM-C1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG2-DEG2-TTP-TXRX - - ROADM-TO-ROADM - XPDR-C1-XPDR1-XPDR1-NETWORK1toROADM-C1-SRG1-SRG1-PP1-TXRX - + XPDR-C1-XPDR1-XPDR1-NETWORK1toROADM-C1-SRG1-SRG1-PP1-TXRX XPDR-C1-XPDR1 XPDR1-NETWORK1 + XPONDER-OUTPUT + inService + ROADM-C1-SRG1-SRG1-PP1-TXRXtoXPDR-C1-XPDR1-XPDR1-NETWORK1 + inService SRG1-PP1-TXRX ROADM-C1-SRG1 - ROADM-C1-SRG1-SRG1-PP1-TXRXtoXPDR-C1-XPDR1-XPDR1-NETWORK1 - - XPONDER-OUTPUT - ROADM-C1-SRG1-SRG1-PP3-TXRXtoSPDR-SC1-XPDR2-XPDR2-NETWORK2 - + ROADM-C1-SRG1-SRG1-PP3-TXRXtoSPDR-SC1-XPDR2-XPDR2-NETWORK2 ROADM-C1-SRG1 SRG1-PP3-TXRX + XPONDER-INPUT + inService + SPDR-SC1-XPDR2-XPDR2-NETWORK2toROADM-C1-SRG1-SRG1-PP3-TXRX + inService XPDR2-NETWORK2 SPDR-SC1-XPDR2 - SPDR-SC1-XPDR2-XPDR2-NETWORK2toROADM-C1-SRG1-SRG1-PP3-TXRX - - XPONDER-INPUT - ROADM-A1-SRG1-SRG1-PP4-TXRXtoSPDR-SA1-XPDR2-XPDR2-NETWORK3 - + ROADM-A1-SRG1-SRG1-PP4-TXRXtoSPDR-SA1-XPDR2-XPDR2-NETWORK3 ROADM-A1-SRG1 SRG1-PP4-TXRX + XPONDER-INPUT + inService + SPDR-SA1-XPDR2-XPDR2-NETWORK3toROADM-A1-SRG1-SRG1-PP4-TXRX + inService XPDR2-NETWORK3 SPDR-SA1-XPDR2 - SPDR-SA1-XPDR2-XPDR2-NETWORK3toROADM-A1-SRG1-SRG1-PP4-TXRX - - XPONDER-INPUT - ROADM-C1-DEG1-DEG1-CTP-TXRXtoROADM-C1-SRG1-SRG1-CP-TXRX - + ROADM-C1-DEG1-DEG1-CTP-TXRXtoROADM-C1-SRG1-SRG1-CP-TXRX ROADM-C1-DEG1 DEG1-CTP-TXRX + DROP-LINK + inService + ROADM-C1-SRG1-SRG1-CP-TXRXtoROADM-C1-DEG1-DEG1-CTP-TXRX + inService SRG1-CP-TXRX ROADM-C1-SRG1 - ROADM-C1-SRG1-SRG1-CP-TXRXtoROADM-C1-DEG1-DEG1-CTP-TXRX - - DROP-LINK - SPDR-SA1-XPDR2-XPDR2-NETWORK3toROADM-A1-SRG1-SRG1-PP4-TXRX - + SPDR-SA1-XPDR2-XPDR2-NETWORK3toROADM-A1-SRG1-SRG1-PP4-TXRX SPDR-SA1-XPDR2 XPDR2-NETWORK3 + XPONDER-OUTPUT + inService + ROADM-A1-SRG1-SRG1-PP4-TXRXtoSPDR-SA1-XPDR2-XPDR2-NETWORK3 + inService SRG1-PP4-TXRX ROADM-A1-SRG1 - ROADM-A1-SRG1-SRG1-PP4-TXRXtoSPDR-SA1-XPDR2-XPDR2-NETWORK3 - - XPONDER-OUTPUT - SPDR-SC1-XPDR1-XPDR1-NETWORK1toROADM-C1-SRG1-SRG1-PP2-TXRX - + SPDR-SC1-XPDR1-XPDR1-NETWORK1toROADM-C1-SRG1-SRG1-PP2-TXRX SPDR-SC1-XPDR1 XPDR1-NETWORK1 + XPONDER-OUTPUT + inService + ROADM-C1-SRG1-SRG1-PP2-TXRXtoSPDR-SC1-XPDR1-XPDR1-NETWORK1 + inService SRG1-PP2-TXRX ROADM-C1-SRG1 - ROADM-C1-SRG1-SRG1-PP2-TXRXtoSPDR-SC1-XPDR1-XPDR1-NETWORK1 - - XPONDER-OUTPUT - ROADM-A1-SRG3-SRG3-CP-TXRXtoROADM-A1-DEG1-DEG1-CTP-TXRX - + ROADM-A1-SRG3-SRG3-CP-TXRXtoROADM-A1-DEG1-DEG1-CTP-TXRX ROADM-A1-SRG3 SRG3-CP-TXRX + ADD-LINK + inService + ROADM-A1-DEG1-DEG1-CTP-TXRXtoROADM-A1-SRG3-SRG3-CP-TXRX + inService DEG1-CTP-TXRX ROADM-A1-DEG1 - ROADM-A1-DEG1-DEG1-CTP-TXRXtoROADM-A1-SRG3-SRG3-CP-TXRX - - ADD-LINK - SPDR-SC1-XPDR2-XPDR2-NETWORK2toROADM-C1-SRG1-SRG1-PP3-TXRX - + SPDR-SC1-XPDR2-XPDR2-NETWORK2toROADM-C1-SRG1-SRG1-PP3-TXRX SPDR-SC1-XPDR2 XPDR2-NETWORK2 + XPONDER-OUTPUT + inService + ROADM-C1-SRG1-SRG1-PP3-TXRXtoSPDR-SC1-XPDR2-XPDR2-NETWORK2 + inService SRG1-PP3-TXRX ROADM-C1-SRG1 - ROADM-C1-SRG1-SRG1-PP3-TXRXtoSPDR-SC1-XPDR2-XPDR2-NETWORK2 - - XPONDER-OUTPUT - ROADM-A1-SRG3-SRG3-CP-TXRXtoROADM-A1-DEG2-DEG2-CTP-TXRX - + ROADM-A1-SRG3-SRG3-CP-TXRXtoROADM-A1-DEG2-DEG2-CTP-TXRX ROADM-A1-SRG3 SRG3-CP-TXRX + ADD-LINK + inService + ROADM-A1-DEG2-DEG2-CTP-TXRXtoROADM-A1-SRG3-SRG3-CP-TXRX + inService DEG2-CTP-TXRX ROADM-A1-DEG2 - ROADM-A1-DEG2-DEG2-CTP-TXRXtoROADM-A1-SRG3-SRG3-CP-TXRX - - ADD-LINK - ROADM-C1-SRG1-SRG1-PP4-TXRXtoSPDR-SC1-XPDR2-XPDR2-NETWORK3 - + ROADM-C1-SRG1-SRG1-PP4-TXRXtoSPDR-SC1-XPDR2-XPDR2-NETWORK3 ROADM-C1-SRG1 SRG1-PP4-TXRX + XPONDER-INPUT + inService + SPDR-SC1-XPDR2-XPDR2-NETWORK3toROADM-C1-SRG1-SRG1-PP4-TXRX + inService XPDR2-NETWORK3 SPDR-SC1-XPDR2 - SPDR-SC1-XPDR2-XPDR2-NETWORK3toROADM-C1-SRG1-SRG1-PP4-TXRX - - XPONDER-INPUT - ROADM-A1-DEG1-DEG1-CTP-TXRXtoROADM-A1-SRG3-SRG3-CP-TXRX - + ROADM-A1-DEG1-DEG1-CTP-TXRXtoROADM-A1-SRG3-SRG3-CP-TXRX ROADM-A1-DEG1 DEG1-CTP-TXRX + DROP-LINK + inService + ROADM-A1-SRG3-SRG3-CP-TXRXtoROADM-A1-DEG1-DEG1-CTP-TXRX + inService SRG3-CP-TXRX ROADM-A1-SRG3 - ROADM-A1-SRG3-SRG3-CP-TXRXtoROADM-A1-DEG1-DEG1-CTP-TXRX - - DROP-LINK - ROADM-A1-SRG1-SRG1-PP1-TXRXtoXPDR-A1-XPDR1-XPDR1-NETWORK1 - + ROADM-A1-SRG1-SRG1-PP1-TXRXtoXPDR-A1-XPDR1-XPDR1-NETWORK1 ROADM-A1-SRG1 SRG1-PP1-TXRX + XPONDER-INPUT + inService + XPDR-A1-XPDR1-XPDR1-NETWORK1toROADM-A1-SRG1-SRG1-PP1-TXRX + inService XPDR1-NETWORK1 XPDR-A1-XPDR1 - XPDR-A1-XPDR1-XPDR1-NETWORK1toROADM-A1-SRG1-SRG1-PP1-TXRX - - XPONDER-INPUT - SPDR-SA1-XPDR1-XPDR1-NETWORK1toROADM-A1-SRG1-SRG1-PP2-TXRX - + SPDR-SA1-XPDR1-XPDR1-NETWORK1toROADM-A1-SRG1-SRG1-PP2-TXRX SPDR-SA1-XPDR1 XPDR1-NETWORK1 + XPONDER-OUTPUT + inService + ROADM-A1-SRG1-SRG1-PP2-TXRXtoSPDR-SA1-XPDR1-XPDR1-NETWORK1 + inService SRG1-PP2-TXRX ROADM-A1-SRG1 - ROADM-A1-SRG1-SRG1-PP2-TXRXtoSPDR-SA1-XPDR1-XPDR1-NETWORK1 - - XPONDER-OUTPUT - ROADM-C1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG2-DEG2-TTP-TXRX - + ROADM-C1-DEG1-DEG1-TTP-TXRXtoROADM-A1-DEG2-DEG2-TTP-TXRX ROADM-C1-DEG1 DEG1-TTP-TXRX - - + ROADM-TO-ROADM + inService + ROADM-A1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG1-DEG1-TTP-TXRX + inService DEG2-TTP-TXRX ROADM-A1-DEG2 - ROADM-A1-DEG2-DEG2-TTP-TXRXtoROADM-C1-DEG1-DEG1-TTP-TXRX - - ROADM-TO-ROADM - ROADM-A1-SRG1-SRG1-PP2-TXRXtoSPDR-SA1-XPDR1-XPDR1-NETWORK1 - + ROADM-A1-SRG1-SRG1-PP2-TXRXtoSPDR-SA1-XPDR1-XPDR1-NETWORK1 ROADM-A1-SRG1 SRG1-PP2-TXRX + XPONDER-INPUT + inService + SPDR-SA1-XPDR1-XPDR1-NETWORK1toROADM-A1-SRG1-SRG1-PP2-TXRX + inService XPDR1-NETWORK1 SPDR-SA1-XPDR1 - SPDR-SA1-XPDR1-XPDR1-NETWORK1toROADM-A1-SRG1-SRG1-PP2-TXRX - - XPONDER-INPUT - ROADM-C1-DEG2-DEG2-CTP-TXRXtoROADM-C1-DEG1-DEG1-CTP-TXRX - + ROADM-C1-DEG2-DEG2-CTP-TXRXtoROADM-C1-DEG1-DEG1-CTP-TXRX ROADM-C1-DEG2 DEG2-CTP-TXRX + EXPRESS-LINK + inService + ROADM-C1-DEG1-DEG1-CTP-TXRXtoROADM-C1-DEG2-DEG2-CTP-TXRX + inService DEG1-CTP-TXRX ROADM-C1-DEG1 - ROADM-C1-DEG1-DEG1-CTP-TXRXtoROADM-C1-DEG2-DEG2-CTP-TXRX - - EXPRESS-LINK - ROADM-C1-DEG2-DEG2-CTP-TXRXtoROADM-C1-SRG1-SRG1-CP-TXRX - + ROADM-C1-DEG2-DEG2-CTP-TXRXtoROADM-C1-SRG1-SRG1-CP-TXRX ROADM-C1-DEG2 DEG2-CTP-TXRX + DROP-LINK + inService + ROADM-C1-SRG1-SRG1-CP-TXRXtoROADM-C1-DEG2-DEG2-CTP-TXRX + inService SRG1-CP-TXRX ROADM-C1-SRG1 - ROADM-C1-SRG1-SRG1-CP-TXRXtoROADM-C1-DEG2-DEG2-CTP-TXRX - - DROP-LINK - ROADM-A1-DEG2-DEG2-CTP-TXRXtoROADM-A1-SRG1-SRG1-CP-TXRX - + ROADM-A1-DEG2-DEG2-CTP-TXRXtoROADM-A1-SRG1-SRG1-CP-TXRX ROADM-A1-DEG2 DEG2-CTP-TXRX + DROP-LINK + inService + ROADM-A1-SRG1-SRG1-CP-TXRXtoROADM-A1-DEG2-DEG2-CTP-TXRX + inService SRG1-CP-TXRX ROADM-A1-SRG1 - ROADM-A1-SRG1-SRG1-CP-TXRXtoROADM-A1-DEG2-DEG2-CTP-TXRX - - DROP-LINK - ROADM-C1-DEG1-DEG1-CTP-TXRXtoROADM-C1-DEG2-DEG2-CTP-TXRX - + ROADM-C1-DEG1-DEG1-CTP-TXRXtoROADM-C1-DEG2-DEG2-CTP-TXRX ROADM-C1-DEG1 DEG1-CTP-TXRX + EXPRESS-LINK + inService + ROADM-C1-DEG2-DEG2-CTP-TXRXtoROADM-C1-DEG1-DEG1-CTP-TXRX + inService DEG2-CTP-TXRX ROADM-C1-DEG2 - ROADM-C1-DEG2-DEG2-CTP-TXRXtoROADM-C1-DEG1-DEG1-CTP-TXRX - - EXPRESS-LINK - SPDR-SC1-XPDR2-XPDR2-NETWORK3toROADM-C1-SRG1-SRG1-PP4-TXRX - + SPDR-SC1-XPDR2-XPDR2-NETWORK3toROADM-C1-SRG1-SRG1-PP4-TXRX SPDR-SC1-XPDR2 XPDR2-NETWORK3 + XPONDER-OUTPUT + inService + ROADM-C1-SRG1-SRG1-PP4-TXRXtoSPDR-SC1-XPDR2-XPDR2-NETWORK3 + inService SRG1-PP4-TXRX ROADM-C1-SRG1 - ROADM-C1-SRG1-SRG1-PP4-TXRXtoSPDR-SC1-XPDR2-XPDR2-NETWORK3 - - XPONDER-OUTPUT - XPDR-A1-XPDR1-XPDR1-NETWORK1toROADM-A1-SRG1-SRG1-PP1-TXRX - + XPDR-A1-XPDR1-XPDR1-NETWORK1toROADM-A1-SRG1-SRG1-PP1-TXRX XPDR-A1-XPDR1 XPDR1-NETWORK1 + XPONDER-OUTPUT + inService + ROADM-A1-SRG1-SRG1-PP1-TXRXtoXPDR-A1-XPDR1-XPDR1-NETWORK1 + inService SRG1-PP1-TXRX ROADM-A1-SRG1 - ROADM-A1-SRG1-SRG1-PP1-TXRXtoXPDR-A1-XPDR1-XPDR1-NETWORK1 - - XPONDER-OUTPUT - ROADM-A1-DEG2-DEG2-CTP-TXRXtoROADM-A1-DEG1-DEG1-CTP-TXRX - + ROADM-A1-DEG2-DEG2-CTP-TXRXtoROADM-A1-DEG1-DEG1-CTP-TXRX ROADM-A1-DEG2 DEG2-CTP-TXRX + EXPRESS-LINK + inService + ROADM-A1-DEG1-DEG1-CTP-TXRXtoROADM-A1-DEG2-DEG2-CTP-TXRX + inService DEG1-CTP-TXRX ROADM-A1-DEG1 - ROADM-A1-DEG1-DEG1-CTP-TXRXtoROADM-A1-DEG2-DEG2-CTP-TXRX - - EXPRESS-LINK - ROADM-A1-SRG1-SRG1-CP-TXRXtoROADM-A1-DEG1-DEG1-CTP-TXRX - + ROADM-A1-SRG1-SRG1-CP-TXRXtoROADM-A1-DEG1-DEG1-CTP-TXRX ROADM-A1-SRG1 SRG1-CP-TXRX + ADD-LINK + inService + ROADM-A1-DEG1-DEG1-CTP-TXRXtoROADM-A1-SRG1-SRG1-CP-TXRX + inService DEG1-CTP-TXRX ROADM-A1-DEG1 - ROADM-A1-DEG1-DEG1-CTP-TXRXtoROADM-A1-SRG1-SRG1-CP-TXRX - - ADD-LINK - ROADM-C1-SRG1-SRG1-PP1-TXRXtoXPDR-C1-XPDR1-XPDR1-NETWORK1 - + ROADM-C1-SRG1-SRG1-PP1-TXRXtoXPDR-C1-XPDR1-XPDR1-NETWORK1 ROADM-C1-SRG1 SRG1-PP1-TXRX + XPONDER-INPUT + inService + XPDR-C1-XPDR1-XPDR1-NETWORK1toROADM-C1-SRG1-SRG1-PP1-TXRX + inService XPDR1-NETWORK1 XPDR-C1-XPDR1 - XPDR-C1-XPDR1-XPDR1-NETWORK1toROADM-C1-SRG1-SRG1-PP1-TXRX - - XPONDER-INPUT - ROADM-A1-DEG2-DEG2-CTP-TXRXtoROADM-A1-SRG3-SRG3-CP-TXRX - + ROADM-A1-DEG2-DEG2-CTP-TXRXtoROADM-A1-SRG3-SRG3-CP-TXRX ROADM-A1-DEG2 DEG2-CTP-TXRX + DROP-LINK + inService + ROADM-A1-SRG3-SRG3-CP-TXRXtoROADM-A1-DEG2-DEG2-CTP-TXRX + inService SRG3-CP-TXRX ROADM-A1-SRG3 - ROADM-A1-SRG3-SRG3-CP-TXRXtoROADM-A1-DEG2-DEG2-CTP-TXRX - - DROP-LINK - ROADM-A1-SRG1-SRG1-CP-TXRXtoROADM-A1-DEG2-DEG2-CTP-TXRX - + ROADM-A1-SRG1-SRG1-CP-TXRXtoROADM-A1-DEG2-DEG2-CTP-TXRX ROADM-A1-SRG1 SRG1-CP-TXRX + ADD-LINK + inService + ROADM-A1-DEG2-DEG2-CTP-TXRXtoROADM-A1-SRG1-SRG1-CP-TXRX + inService DEG2-CTP-TXRX ROADM-A1-DEG2 - ROADM-A1-DEG2-DEG2-CTP-TXRXtoROADM-A1-SRG1-SRG1-CP-TXRX - - ADD-LINK - SPDR-SA1-XPDR2-XPDR2-NETWORK2toROADM-A1-SRG1-SRG1-PP3-TXRX - + SPDR-SA1-XPDR2-XPDR2-NETWORK2toROADM-A1-SRG1-SRG1-PP3-TXRX SPDR-SA1-XPDR2 XPDR2-NETWORK2 + XPONDER-OUTPUT + inService + ROADM-A1-SRG1-SRG1-PP3-TXRXtoSPDR-SA1-XPDR2-XPDR2-NETWORK2 + inService SRG1-PP3-TXRX ROADM-A1-SRG1 - ROADM-A1-SRG1-SRG1-PP3-TXRXtoSPDR-SA1-XPDR2-XPDR2-NETWORK2 - - XPONDER-OUTPUT - ROADM-A1-SRG1-SRG1-PP3-TXRXtoSPDR-SA1-XPDR2-XPDR2-NETWORK2 - + ROADM-A1-SRG1-SRG1-PP3-TXRXtoSPDR-SA1-XPDR2-XPDR2-NETWORK2 ROADM-A1-SRG1 SRG1-PP3-TXRX + XPONDER-INPUT + inService + SPDR-SA1-XPDR2-XPDR2-NETWORK2toROADM-A1-SRG1-SRG1-PP3-TXRX + inService XPDR2-NETWORK2 SPDR-SA1-XPDR2 - SPDR-SA1-XPDR2-XPDR2-NETWORK2toROADM-A1-SRG1-SRG1-PP3-TXRX - - XPONDER-INPUT - ROADM-C1-SRG1-SRG1-CP-TXRXtoROADM-C1-DEG2-DEG2-CTP-TXRX - + ROADM-C1-SRG1-SRG1-CP-TXRXtoROADM-C1-DEG2-DEG2-CTP-TXRX ROADM-C1-SRG1 SRG1-CP-TXRX + ADD-LINK + inService + ROADM-C1-DEG2-DEG2-CTP-TXRXtoROADM-C1-SRG1-SRG1-CP-TXRX + inService DEG2-CTP-TXRX ROADM-C1-DEG2 - ROADM-C1-DEG2-DEG2-CTP-TXRXtoROADM-C1-SRG1-SRG1-CP-TXRX - - ADD-LINK - ROADM-A1-DEG1-DEG1-CTP-TXRXtoROADM-A1-SRG1-SRG1-CP-TXRX - + ROADM-A1-DEG1-DEG1-CTP-TXRXtoROADM-A1-SRG1-SRG1-CP-TXRX ROADM-A1-DEG1 DEG1-CTP-TXRX + DROP-LINK + inService + ROADM-A1-SRG1-SRG1-CP-TXRXtoROADM-A1-DEG1-DEG1-CTP-TXRX + inService SRG1-CP-TXRX ROADM-A1-SRG1 - ROADM-A1-SRG1-SRG1-CP-TXRXtoROADM-A1-DEG1-DEG1-CTP-TXRX - - DROP-LINK - ROADM-C1-SRG1-SRG1-CP-TXRXtoROADM-C1-DEG1-DEG1-CTP-TXRX - + ROADM-C1-SRG1-SRG1-CP-TXRXtoROADM-C1-DEG1-DEG1-CTP-TXRX ROADM-C1-SRG1 SRG1-CP-TXRX + ADD-LINK + inService + ROADM-C1-DEG1-DEG1-CTP-TXRXtoROADM-C1-SRG1-SRG1-CP-TXRX + inService DEG1-CTP-TXRX ROADM-C1-DEG1 - ROADM-C1-DEG1-DEG1-CTP-TXRXtoROADM-C1-SRG1-SRG1-CP-TXRX - - ADD-LINK - ROADM-A1-DEG1-DEG1-CTP-TXRXtoROADM-A1-DEG2-DEG2-CTP-TXRX - + ROADM-A1-DEG1-DEG1-CTP-TXRXtoROADM-A1-DEG2-DEG2-CTP-TXRX ROADM-A1-DEG1 DEG1-CTP-TXRX + EXPRESS-LINK + inService + ROADM-A1-DEG2-DEG2-CTP-TXRXtoROADM-A1-DEG1-DEG1-CTP-TXRX + inService DEG2-CTP-TXRX ROADM-A1-DEG2 - ROADM-A1-DEG2-DEG2-CTP-TXRXtoROADM-A1-DEG1-DEG1-CTP-TXRX - - EXPRESS-LINK - + \ No newline at end of file diff --git a/tapi/src/test/resources/otn-topology.xml b/tapi/src/test/resources/otn-topology.xml index bf7e734ce..0134fca52 100644 --- a/tapi/src/test/resources/otn-topology.xml +++ b/tapi/src/test/resources/otn-topology.xml @@ -3,89 +3,78 @@ otn-topology - + XPDR-C1-XPDR1 - + TPDR + inService + inService + XPDR1-CLIENT1 - XPDR1-NETWORK1 - - + XPDR1-NETWORK1 + - x:if-100GE + x:if-100GE + + inService + inService XPONDER-CLIENT - + XPDR1-CLIENT2 - XPDR1-NETWORK2 - - + XPDR1-NETWORK2 + - x:if-100GE + x:if-100GE + + inService + inService XPONDER-CLIENT - + XPDR1-NETWORK2 openroadm-topology XPDR-C1-XPDR1 XPDR1-NETWORK2 - XPDR1-CLIENT2 - - x:ODU4 - - + XPDR1-CLIENT2 + - x:if-OCH-OTU4-ODU4 + x:if-OCH + + inService + inService XPONDER-NETWORK - + XPDR1-NETWORK1 openroadm-topology XPDR-C1-XPDR1 XPDR1-NETWORK1 - XPDR1-CLIENT1 - - x:ODU4 - - + XPDR1-CLIENT1 + - x:if-OCH-OTU4-ODU4 + x:if-OCH + + inService + inService XPONDER-NETWORK + + 1 + clli-network NodeC @@ -98,406 +87,385 @@ openroadm-topology XPDR-C1-XPDR1 - TPDR - - 1 - SPDR-SA1-XPDR1 - + MUXPDR + inService + inService + XPDR1-CLIENT1 - - x:ODU2e - - + + + x:if-10GE-ODU2 + - x:if-10GE-ODU2e + x:if-10GE-ODU2e + + x:ODU2e + + inService + inService XPONDER-CLIENT - + XPDR1-CLIENT3 - - x:ODU2e - - + + + x:if-10GE + + + x:if-10GE-ODU2 + - x:if-10GE-ODU2e + x:if-10GE-ODU2e + + inService + inService XPONDER-CLIENT - + XPDR1-CLIENT2 - - x:ODU2e - - + + + x:if-10GE-ODU2 + - x:if-10GE-ODU2e + x:if-10GE-ODU2e + + x:ODU2e + + inService + inService XPONDER-CLIENT - + XPDR1-NETWORK1 openroadm-topology SPDR-SA1-XPDR1 XPDR1-NETWORK1 - + + + x:if-OCH-OTU4-ODU4 + + + + 7 + 6 + 9 + 8 + 3 + 2 + 5 + 4 + 1 + 39 + 38 + 41 + 40 + 35 + 34 + 37 + 36 + 31 + 30 + 33 + 32 + 27 + 26 + 29 + 28 + 23 + 22 + 25 + 24 + 19 + 18 + 21 + 20 + 15 + 14 + 17 + 16 + 11 + 10 + 13 + 12 + 71 + 70 + 73 + 72 + 67 + 66 + 69 + 68 + 63 + 62 + 65 + 64 + 59 + 58 + 61 + 60 + 55 + 54 + 57 + 56 + 51 + 50 + 53 + 52 + 47 + 46 + 49 + 48 + 43 + 42 + 45 + 44 + 79 + 78 + 80 + 75 + 74 + 77 + 76 + x:ODU4 - x:ODTU4.ts-Allocated - 2 - 1 - 12 - 11 - 14 - 13 - 16 - 15 + x:ODTU4.ts-Allocated + 80 + 79 + 74 + 73 + 72 + 71 + 78 + 77 + 76 + 75 + 66 + 65 + 64 + 63 + 70 + 69 + 68 + 67 + 58 + 57 + 56 + 55 + 62 + 61 + 60 + 59 18 17 - 4 - 3 - 6 - 5 - 8 - 7 - 10 - 9 - 28 - 27 - 30 - 29 - 32 - 31 - 34 - 33 - 20 - 19 + 16 + 15 22 21 - 24 - 23 - 26 - 25 - 44 - 43 - 46 - 45 - 48 - 47 + 20 + 19 + 10 + 9 + 8 + 7 + 14 + 13 + 12 + 11 + 2 + 1 + 6 + 5 + 4 + 3 50 49 - 36 - 35 - 38 - 37 - 40 - 39 - 42 - 41 - 60 - 59 - 62 - 61 - 64 - 63 - 66 - 65 - 52 - 51 + 48 + 47 54 53 - 56 - 55 - 58 - 57 - 76 - 75 - 78 - 77 - 80 - 79 - 68 - 67 - 70 - 69 - 72 - 71 - 74 - 73 - - x:ODU4 - 48 - 49 - 46 - 47 - 52 - 53 - 50 - 51 - 40 - 41 - 38 - 39 - 44 - 45 - 42 - 43 - 64 - 65 - 62 - 63 - 68 - 69 - 66 - 67 - 56 - 57 - 54 - 55 - 60 - 61 - 58 - 59 - 80 - 78 - 79 - 72 - 73 - 70 - 71 - 76 - 77 - 74 - 75 - 1 - 4 - 5 - 2 - 3 - 16 - 17 - 14 - 15 - 20 - 21 - 18 - 19 - 8 - 9 - 6 - 7 - 12 - 13 - 10 - 11 - 32 - 33 - 30 - 31 - 36 - 37 - 34 - 35 - 24 - 25 - 22 - 23 - 28 - 29 - 26 - 27 + 52 + 51 + 42 + 41 + 40 + 39 + 46 + 45 + 44 + 43 + 34 + 33 + 32 + 31 + 38 + 37 + 36 + 35 + 26 + 25 + 24 + 23 + 30 + 29 + 28 + 27 + - - - x:if-OCH-OTU4-ODU4 - - + inService + inService XPONDER-NETWORK - + XPDR1-CLIENT4 - - x:ODU2e - - + + + x:if-10GE + + + x:if-10GE-ODU2 + - x:if-10GE-ODU2e + x:if-10GE-ODU2e + + inService + inService XPONDER-CLIENT - - openroadm-network - SPDR-SA1 - - - clli-network - NodeSA - - - openroadm-topology - SPDR-SA1-XPDR1 - - MUXPDR - + + 1 + + + 1 + non-blocking 4 - 10 - - 1000000000 - + 1000000000 XPDR1-CLIENT4 XPDR1-NETWORK1 + 10 1 - 10 - - 1000000000 - - XPDR1-CLIENT1 + 1000000000 XPDR1-NETWORK1 + XPDR1-CLIENT1 + 10 - 2 - 10 - - 1000000000 - + 3 + 1000000000 XPDR1-NETWORK1 - XPDR1-CLIENT2 + XPDR1-CLIENT3 + 10 - 3 - 10 - - 1000000000 - + 2 + 1000000000 XPDR1-NETWORK1 - XPDR1-CLIENT3 + XPDR1-CLIENT2 + 10 - non-blocking - - - 1 - + + openroadm-network + SPDR-SA1 + + + clli-network + NodeSA + + + openroadm-topology + SPDR-SA1-XPDR1 + XPDR-A1-XPDR1 - + TPDR + inService + inService + XPDR1-CLIENT1 - XPDR1-NETWORK1 - - + XPDR1-NETWORK1 + - x:if-100GE + x:if-100GE + + inService + inService XPONDER-CLIENT - + XPDR1-CLIENT2 - XPDR1-NETWORK2 - - + XPDR1-NETWORK2 + - x:if-100GE + x:if-100GE + + inService + inService XPONDER-CLIENT - + XPDR1-NETWORK2 openroadm-topology XPDR-A1-XPDR1 XPDR1-NETWORK2 - XPDR1-CLIENT2 - - x:ODU4 - - + XPDR1-CLIENT2 + - x:if-OCH-OTU4-ODU4 + x:if-OCH + + inService + inService XPONDER-NETWORK - + XPDR1-NETWORK1 openroadm-topology XPDR-A1-XPDR1 XPDR1-NETWORK1 - XPDR1-CLIENT1 - - x:ODU4 - - + XPDR1-CLIENT1 + - x:if-OCH-OTU4-ODU4 + x:if-OCH + + inService + inService XPONDER-NETWORK + + 1 + openroadm-network XPDR-A1 @@ -510,476 +478,747 @@ openroadm-topology XPDR-A1-XPDR1 - TPDR - - 1 - SPDR-SC1-XPDR1 - + MUXPDR + inService + inService + XPDR1-CLIENT1 - - x:ODU2e - - + + + x:if-10GE-ODU2 + - x:if-10GE-ODU2e + x:if-10GE-ODU2e + + x:ODU2e + + inService + inService XPONDER-CLIENT - + XPDR1-CLIENT3 - - x:ODU2e - - + + + x:if-10GE + + + x:if-10GE-ODU2 + - x:if-10GE-ODU2e + x:if-10GE-ODU2e + + inService + inService XPONDER-CLIENT - + XPDR1-CLIENT2 - - x:ODU2e - - + + + x:if-10GE-ODU2 + - x:if-10GE-ODU2e + x:if-10GE-ODU2e + + x:ODU2e + + inService + inService XPONDER-CLIENT - + XPDR1-NETWORK1 openroadm-topology SPDR-SC1-XPDR1 XPDR1-NETWORK1 - + + + x:if-OCH-OTU4-ODU4 + + + + 7 + 6 + 9 + 8 + 3 + 2 + 5 + 4 + 1 + 39 + 38 + 41 + 40 + 35 + 34 + 37 + 36 + 31 + 30 + 33 + 32 + 27 + 26 + 29 + 28 + 23 + 22 + 25 + 24 + 19 + 18 + 21 + 20 + 15 + 14 + 17 + 16 + 11 + 10 + 13 + 12 + 71 + 70 + 73 + 72 + 67 + 66 + 69 + 68 + 63 + 62 + 65 + 64 + 59 + 58 + 61 + 60 + 55 + 54 + 57 + 56 + 51 + 50 + 53 + 52 + 47 + 46 + 49 + 48 + 43 + 42 + 45 + 44 + 79 + 78 + 80 + 75 + 74 + 77 + 76 + x:ODU4 - x:ODTU4.ts-Allocated - 2 - 1 - 12 - 11 - 14 - 13 - 16 - 15 - 18 + x:ODTU4.ts-Allocated + 80 + 79 + 74 + 73 + 72 + 71 + 78 + 77 + 76 + 75 + 66 + 65 + 64 + 63 + 70 + 69 + 68 + 67 + 58 + 57 + 56 + 55 + 62 + 61 + 60 + 59 + 18 17 - 4 - 3 - 6 - 5 - 8 - 7 - 10 - 9 - 28 - 27 - 30 - 29 - 32 - 31 - 34 - 33 - 20 - 19 + 16 + 15 22 21 - 24 - 23 - 26 - 25 - 44 - 43 - 46 - 45 - 48 - 47 + 20 + 19 + 10 + 9 + 8 + 7 + 14 + 13 + 12 + 11 + 2 + 1 + 6 + 5 + 4 + 3 50 49 - 36 - 35 - 38 - 37 - 40 - 39 - 42 - 41 - 60 - 59 - 62 - 61 - 64 - 63 - 66 - 65 - 52 - 51 + 48 + 47 54 53 - 56 - 55 - 58 - 57 - 76 - 75 - 78 - 77 - 80 - 79 - 68 - 67 - 70 - 69 - 72 - 71 - 74 - 73 + 52 + 51 + 42 + 41 + 40 + 39 + 46 + 45 + 44 + 43 + 34 + 33 + 32 + 31 + 38 + 37 + 36 + 35 + 26 + 25 + 24 + 23 + 30 + 29 + 28 + 27 + + inService + inService + XPONDER-NETWORK + + + XPDR1-CLIENT4 + + + x:if-10GE + + + x:if-10GE-ODU2 + + + x:if-10GE-ODU2e + + + + inService + inService + XPONDER-CLIENT + + + 1 + + + + + 1 + non-blocking + + 4 + 1000000000 + XPDR1-CLIENT4 + XPDR1-NETWORK1 + 10 + + + 1 + 1000000000 + XPDR1-NETWORK1 + XPDR1-CLIENT1 + 10 + + + 3 + 1000000000 + XPDR1-NETWORK1 + XPDR1-CLIENT3 + 10 + + + 2 + 1000000000 + XPDR1-NETWORK1 + XPDR1-CLIENT2 + 10 + + + + + openroadm-network + SPDR-SC1 + + + clli-network + NodeSC + + + openroadm-topology + SPDR-SC1-XPDR1 + + + + SPDR-SA1-XPDR3 + MUXPDR + inService + inService + + XPDR3-CLIENT1 + + + x:if-1GE-ODU0 + + + + x:ODU0 + + inService + inService + XPONDER-CLIENT + + + XPDR3-NETWORK1 + + openroadm-topology + SPDR-SA1-XPDR3 + XPDR3-NETWORK1 + + + + x:if-OCH-OTU4-ODU4 + + + x:ODU4 - 48 - 49 - 46 - 47 - 52 - 53 - 50 - 51 - 40 - 41 - 38 - 39 - 44 - 45 - 42 - 43 - 64 - 65 - 62 - 63 - 68 - 69 - 66 - 67 - 56 - 57 - 54 - 55 - 60 - 61 - 58 - 59 - 80 - 78 - 79 - 72 - 73 - 70 - 71 - 76 - 77 - 74 - 75 - 1 - 4 - 5 - 2 - 3 - 16 - 17 - 14 - 15 - 20 - 21 - 18 - 19 - 8 - 9 - 6 - 7 - 12 - 13 - 10 - 11 - 32 - 33 - 30 - 31 - 36 - 37 - 34 - 35 - 24 - 25 - 22 - 23 - 28 - 29 - 26 - 27 - + inService + inService + XPONDER-NETWORK + + + XPDR3-CLIENT4 + + + x:if-1GE-ODU0 + + + + x:ODU0 + + inService + inService + XPONDER-CLIENT + + + XPDR3-CLIENT2 + + + x:if-1GE-ODU0 + + + + x:ODU0 + + inService + inService + XPONDER-CLIENT + + + XPDR3-CLIENT3 + + + x:if-1GE-ODU0 + + + + x:ODU0 + + inService + inService + XPONDER-CLIENT + + + 3 + + + + + 1 + non-blocking + + 4 + 1000000000 + XPDR3-NETWORK1 + XPDR3-CLIENT4 + 10 + + + 1 + 1000000000 + XPDR3-NETWORK1 + XPDR3-CLIENT1 + 10 + + + 3 + 1000000000 + XPDR3-CLIENT3 + XPDR3-NETWORK1 + 10 + + + 2 + 1000000000 + XPDR3-CLIENT2 + XPDR3-NETWORK1 + 10 + + + + + openroadm-network + SPDR-SA1 + + + clli-network + NodeSA + + + openroadm-topology + SPDR-SA1-XPDR3 + + + + SPDR-SC1-XPDR3 + MUXPDR + inService + inService + + XPDR3-CLIENT1 + + + x:if-1GE-ODU0 + + + + x:ODU0 + + inService + inService + XPONDER-CLIENT + + + XPDR3-NETWORK1 + + openroadm-topology + SPDR-SC1-XPDR3 + XPDR3-NETWORK1 + + - x:if-OCH-OTU4-ODU4 + x:if-OCH-OTU4-ODU4 + + x:ODU4 + + inService + inService XPONDER-NETWORK - - XPDR1-CLIENT4 - - x:ODU2e + + XPDR3-CLIENT4 + + + x:if-1GE-ODU0 + + + + x:ODU0 - + inService + inService + XPONDER-CLIENT + + + XPDR3-CLIENT2 + - x:if-10GE-ODU2e + x:if-1GE-ODU0 + + x:ODU0 + + inService + inService XPONDER-CLIENT - - openroadm-network - SPDR-SC1 - - - clli-network - NodeSC - - - openroadm-topology - SPDR-SC1-XPDR1 - - MUXPDR - + + XPDR3-CLIENT3 + + + x:if-1GE-ODU0 + + + + x:ODU0 + + inService + inService + XPONDER-CLIENT + + + 3 + + + 1 + non-blocking 4 - 10 - - 1000000000 - - XPDR1-CLIENT4 - XPDR1-NETWORK1 + 1000000000 + XPDR3-NETWORK1 + XPDR3-CLIENT4 + 10 1 - 10 - - 1000000000 - - XPDR1-CLIENT1 - XPDR1-NETWORK1 + 1000000000 + XPDR3-NETWORK1 + XPDR3-CLIENT1 + 10 - 2 - 10 - - 1000000000 - - XPDR1-NETWORK1 - XPDR1-CLIENT2 + 3 + 1000000000 + XPDR3-CLIENT3 + XPDR3-NETWORK1 + 10 - 3 - 10 - - 1000000000 - - XPDR1-NETWORK1 - XPDR1-CLIENT3 + 2 + 1000000000 + XPDR3-CLIENT2 + XPDR3-NETWORK1 + 10 - non-blocking - - - 1 - + + openroadm-topology + SPDR-SC1-XPDR3 + + + openroadm-network + SPDR-SC1 + + + clli-network + NodeSC + SPDR-SA1-XPDR2 - + SWITCH + inService + inService + XPDR2-NETWORK1 openroadm-topology SPDR-SA1-XPDR2 XPDR2-NETWORK1 - - x:ODU4 - - + - x:if-OCH-OTU4-ODU4 + x:if-OCH-OTU4-ODU4 + + x:ODU4 + + inService + inService XPONDER-NETWORK - + XPDR2-NETWORK3 openroadm-topology SPDR-SA1-XPDR2 XPDR2-NETWORK3 - - x:ODU4 - - + - x:if-OCH-OTU4-ODU4 + x:if-OCH-OTU4-ODU4 + + x:ODU4 + + inService + inService XPONDER-NETWORK - + XPDR2-NETWORK2 openroadm-topology SPDR-SA1-XPDR2 XPDR2-NETWORK2 - - x:ODU4 - - + - x:if-OCH-OTU4-ODU4 + x:if-OCH-OTU4-ODU4 + + x:ODU4 + + inService + inService XPONDER-NETWORK - + XPDR2-NETWORK4 openroadm-topology SPDR-SA1-XPDR2 XPDR2-NETWORK4 - - x:ODU4 - - + - x:if-OCH-OTU4-ODU4 + x:if-OCH-OTU4-ODU4 + + x:ODU4 + + inService + inService XPONDER-NETWORK - + XPDR2-CLIENT3 - - x:ODU4 - - + + + x:if-100GE + - x:if-100GE-ODU4 + x:if-100GE-ODU4 + + x:ODU4 + + inService + inService XPONDER-CLIENT - + XPDR2-CLIENT4 - - x:ODU4 - - + + + x:if-100GE + - x:if-100GE-ODU4 + x:if-100GE-ODU4 + + x:ODU4 + + inService + inService XPONDER-CLIENT - + XPDR2-CLIENT1 - - x:ODU4 - - + + + x:if-100GE + - x:if-100GE-ODU4 + x:if-100GE-ODU4 + + x:ODU4 + + inService + inService XPONDER-CLIENT - + XPDR2-CLIENT2 - - x:ODU4 - - + + + x:if-100GE + - x:if-100GE-ODU4 + x:if-100GE-ODU4 + + x:ODU4 + + inService + inService XPONDER-CLIENT + + 2 + + + + + 1 + non-blocking + + 1 + XPDR2-CLIENT4 + XPDR2-CLIENT3 + XPDR2-NETWORK4 + XPDR2-NETWORK3 + XPDR2-NETWORK2 + XPDR2-CLIENT2 + XPDR2-NETWORK1 + XPDR2-CLIENT1 + + + openroadm-network SPDR-SA1 @@ -992,182 +1231,177 @@ openroadm-topology SPDR-SA1-XPDR2 - SWITCH - - - 1 - - 1 - XPDR2-CLIENT1 - XPDR2-NETWORK4 - XPDR2-CLIENT2 - XPDR2-NETWORK1 - XPDR2-CLIENT3 - XPDR2-NETWORK2 - XPDR2-CLIENT4 - XPDR2-NETWORK3 - - non-blocking - - - - - 2 - SPDR-SC1-XPDR2 - + SWITCH + inService + inService + XPDR2-NETWORK1 openroadm-topology SPDR-SC1-XPDR2 XPDR2-NETWORK1 - - x:ODU4 - - + - x:if-OCH-OTU4-ODU4 + x:if-OCH-OTU4-ODU4 + + x:ODU4 + + inService + inService XPONDER-NETWORK - + XPDR2-NETWORK3 openroadm-topology SPDR-SC1-XPDR2 XPDR2-NETWORK3 - - x:ODU4 - - + - x:if-OCH-OTU4-ODU4 + x:if-OCH-OTU4-ODU4 + + x:ODU4 + + inService + inService XPONDER-NETWORK - + XPDR2-NETWORK2 openroadm-topology SPDR-SC1-XPDR2 XPDR2-NETWORK2 - - x:ODU4 - - + - x:if-OCH-OTU4-ODU4 + x:if-OCH-OTU4-ODU4 + + x:ODU4 + + inService + inService XPONDER-NETWORK - + XPDR2-NETWORK4 openroadm-topology SPDR-SC1-XPDR2 XPDR2-NETWORK4 - - x:ODU4 - - + - x:if-OCH-OTU4-ODU4 + x:if-OCH-OTU4-ODU4 + + x:ODU4 + + inService + inService XPONDER-NETWORK - + XPDR2-CLIENT3 - - x:ODU4 - - + + + x:if-100GE + - x:if-100GE-ODU4 + x:if-100GE-ODU4 + + x:ODU4 + + inService + inService XPONDER-CLIENT - + XPDR2-CLIENT4 - - x:ODU4 - - + + + x:if-100GE + - x:if-100GE-ODU4 + x:if-100GE-ODU4 + + x:ODU4 + + inService + inService XPONDER-CLIENT - + XPDR2-CLIENT1 - - x:ODU4 - - + + + x:if-100GE + - x:if-100GE-ODU4 + x:if-100GE-ODU4 + + x:ODU4 + + inService + inService XPONDER-CLIENT - + XPDR2-CLIENT2 - - x:ODU4 - - + + + x:if-100GE + - x:if-100GE-ODU4 + x:if-100GE-ODU4 + + x:ODU4 + + inService + inService XPONDER-CLIENT + + 2 + + + + + 1 + non-blocking + + 1 + XPDR2-CLIENT4 + XPDR2-CLIENT3 + XPDR2-NETWORK4 + XPDR2-NETWORK3 + XPDR2-NETWORK2 + XPDR2-CLIENT2 + XPDR2-NETWORK1 + XPDR2-CLIENT1 + + + openroadm-topology SPDR-SC1-XPDR2 @@ -1180,115 +1414,78 @@ clli-network NodeSC - SWITCH - - - 1 - - 1 - XPDR2-CLIENT1 - XPDR2-NETWORK4 - XPDR2-CLIENT2 - XPDR2-NETWORK1 - XPDR2-CLIENT3 - XPDR2-NETWORK2 - XPDR2-CLIENT4 - XPDR2-NETWORK3 - - non-blocking - - - - - 2 - - OTU4-SPDR-SC1-XPDR1-XPDR1-NETWORK1toSPDR-SA1-XPDR1-XPDR1-NETWORK1 - + OTU4-SPDR-SC1-XPDR1-XPDR1-NETWORK1toSPDR-SA1-XPDR1-XPDR1-NETWORK1 SPDR-SC1-XPDR1 XPDR1-NETWORK1 - OTU4 + 0 + 100000 + OTN-LINK + inService + OTU4-SPDR-SA1-XPDR1-XPDR1-NETWORK1toSPDR-SC1-XPDR1-XPDR1-NETWORK1 + inService XPDR1-NETWORK1 SPDR-SA1-XPDR1 - 0 - 100000 - OTU4-SPDR-SA1-XPDR1-XPDR1-NETWORK1toSPDR-SC1-XPDR1-XPDR1-NETWORK1 - - OTN-LINK + OTU4 - OTU4-SPDR-SA1-XPDR1-XPDR1-NETWORK1toSPDR-SC1-XPDR1-XPDR1-NETWORK1 - + OTU4-SPDR-SA1-XPDR1-XPDR1-NETWORK1toSPDR-SC1-XPDR1-XPDR1-NETWORK1 SPDR-SA1-XPDR1 XPDR1-NETWORK1 - OTU4 + 0 + 100000 + OTN-LINK + inService + OTU4-SPDR-SC1-XPDR1-XPDR1-NETWORK1toSPDR-SA1-XPDR1-XPDR1-NETWORK1 + inService XPDR1-NETWORK1 SPDR-SC1-XPDR1 - 0 - 100000 - OTU4-SPDR-SC1-XPDR1-XPDR1-NETWORK1toSPDR-SA1-XPDR1-XPDR1-NETWORK1 - - OTN-LINK + OTU4 - ODU4-SPDR-SC1-XPDR1-XPDR1-NETWORK1toSPDR-SA1-XPDR1-XPDR1-NETWORK1 - + ODU4-SPDR-SC1-XPDR1-XPDR1-NETWORK1toSPDR-SA1-XPDR1-XPDR1-NETWORK1 SPDR-SC1-XPDR1 XPDR1-NETWORK1 - ODTU4 + 100000 + 0 + OTN-LINK + inService + ODU4-SPDR-SA1-XPDR1-XPDR1-NETWORK1toSPDR-SC1-XPDR1-XPDR1-NETWORK1 + inService XPDR1-NETWORK1 SPDR-SA1-XPDR1 - 100000 - 0 - ODU4-SPDR-SA1-XPDR1-XPDR1-NETWORK1toSPDR-SC1-XPDR1-XPDR1-NETWORK1 - - OTN-LINK + ODTU4 - ODU4-SPDR-SA1-XPDR1-XPDR1-NETWORK1toSPDR-SC1-XPDR1-XPDR1-NETWORK1 - + ODU4-SPDR-SA1-XPDR1-XPDR1-NETWORK1toSPDR-SC1-XPDR1-XPDR1-NETWORK1 SPDR-SA1-XPDR1 XPDR1-NETWORK1 - ODTU4 + 100000 + 0 + OTN-LINK + inService + ODU4-SPDR-SC1-XPDR1-XPDR1-NETWORK1toSPDR-SA1-XPDR1-XPDR1-NETWORK1 + inService XPDR1-NETWORK1 SPDR-SC1-XPDR1 - 100000 - 0 - ODU4-SPDR-SC1-XPDR1-XPDR1-NETWORK1toSPDR-SA1-XPDR1-XPDR1-NETWORK1 - - OTN-LINK + ODTU4 diff --git a/tapi/src/test/resources/portmapping.xml b/tapi/src/test/resources/portmapping.xml index d165489a1..ef5e30744 100644 --- a/tapi/src/test/resources/portmapping.xml +++ b/tapi/src/test/resources/portmapping.xml @@ -1,696 +1,740 @@ - XPDR-C1 + XPDR-A1 - XPDR1-CLIENT2 - xpdr-client + XPDR1-NETWORK1 + 1/0/1-PLUG-NET + x:if-OCH + AMkDwQ7xTmRI + bidirectional + 1 + xpdr-network + XPDR1-CLIENT1 + + + XPDR1-NETWORK2 + 1/0/2-PLUG-NET + x:if-OCH + AMkDwQ7xTmRL + bidirectional + 1 + xpdr-network + XPDR1-CLIENT2 + + + XPDR1-CLIENT1 + 1/0/1-PLUG-CLIENT + x:if-100GE + AJUUr6I5fALj + bidirectional C1 + xpdr-client + XPDR1-NETWORK1 + + + XPDR1-CLIENT2 + 1/0/2-PLUG-CLIENT + x:if-100GE + AJUUr6I5fALg bidirectional - x:if-100GE + C1 + xpdr-client XPDR1-NETWORK2 - fHpE8JbDyn4= - 1/0/2-PLUG-CLIENT - + + xpdr + model2 + 1.2.3.4 + NodeA + 2.2.1 + vendorA + + + + XPDR-C1 - XPDR1-NETWORK2 - - xpdr-network + XPDR1-NETWORK1 + 1/0/1-PLUG-NET + x:if-OCH + AJUlmCIYKpQi + bidirectional 1 + xpdr-network + XPDR1-CLIENT1 + + + XPDR1-NETWORK2 + 1/0/2-PLUG-NET + x:if-OCH + AJUlmCIYKpQh bidirectional - x:if-OCH + 1 + xpdr-network XPDR1-CLIENT2 - AJUlmCIYKpQh - 1/0/2-PLUG-NET - XPDR1-CLIENT1 - xpdr-client - C1 + 1/0/1-PLUG-CLIENT + x:if-100GE + fHpE8JbDyn0= bidirectional - x:if-100GE + C1 + xpdr-client XPDR1-NETWORK1 - fHpE8JbDyn0= - 1/0/1-PLUG-CLIENT - - XPDR1-NETWORK1 - - xpdr-network - 1 + XPDR1-CLIENT2 + 1/0/2-PLUG-CLIENT + x:if-100GE + fHpE8JbDyn4= bidirectional - x:if-OCH - XPDR1-CLIENT1 - AJUlmCIYKpQi - 1/0/1-PLUG-NET - + C1 + xpdr-client + XPDR1-NETWORK2 + xpdr + model2 + 1.2.3.5 NodeC + 2.2.1 vendorA + + + + ROADM-C1 + + rdm model2 - 1.2.3.5 - xpdr + 127.0.0.13 + NodeC 2.2.1 + vendorA + + 1/0/ETH-PLUG + 1 + 1GE-interface-1 + + + 2/0 + 2 + 1GE-interface-2 + + + 2/0/ETH-PLUG + 2 + 1GE-interface-2 + + + 1/0 + 1 + 1GE-interface-1 + + + SRG1-PP3-TXRX + 3/0 + bidirectional + C3 + + + SRG1-PP1-TXRX + 3/0 + bidirectional + C1 + + + DEG1-TTP-TXRX + OMS-DEG1-TTP-TXRX + 1/0 + OTS-DEG1-TTP-TXRX + bidirectional + L1 + + + SRG1-PP2-TXRX + 3/0 + bidirectional + C2 + + + SRG1-PP4-TXRX + 3/0 + bidirectional + C4 + + + DEG2-TTP-TXRX + 2/0 + bidirectional + L1 + + + DEG2-TTP + 50 + 50 + + + DEG1-TTP + 50 + 50 + + + SRG1-PP + 50 + 50 + SPDR-SC1 - NodeSC - vendorC + xpdr universal-switchponder 1.2.3.6 - xpdr + NodeSC 2.2.1 + vendorC - 1 - non-blocking + 3 - 11 - XPDR1-NETWORK1 - XPDR1-CLIENT1 + 83 + XPDR3-NETWORK1 + XPDR3-CLIENT3 + 1000000000 0 - 1000000000 - - 12 - XPDR1-NETWORK1 - XPDR1-CLIENT2 + 82 + XPDR3-CLIENT2 + XPDR3-NETWORK1 + 1000000000 0 - 1000000000 - - 13 - XPDR1-NETWORK1 - XPDR1-CLIENT3 + 81 + XPDR3-CLIENT1 + XPDR3-NETWORK1 + 1000000000 0 - 1000000000 - - 14 - XPDR1-CLIENT4 - XPDR1-NETWORK1 + 84 + XPDR3-NETWORK1 + XPDR3-CLIENT4 + 1000000000 0 - 1000000000 - + non-blocking 2 - non-blocking 2 - XPDR2-NETWORK1 XPDR2-CLIENT4 - XPDR2-CLIENT3 - XPDR2-CLIENT2 - XPDR2-CLIENT1 - XPDR2-NETWORK3 + XPDR2-NETWORK1 XPDR2-NETWORK2 + XPDR2-NETWORK3 XPDR2-NETWORK4 + XPDR2-CLIENT1 + XPDR2-CLIENT3 + XPDR2-CLIENT2 + 1000000000 0 - 1000000000 - + non-blocking + + + 1 + + 11 + XPDR1-CLIENT1 + XPDR1-NETWORK1 + 1000000000 + 0 + + + 14 + XPDR1-CLIENT4 + XPDR1-NETWORK1 + 1000000000 + 0 + + + 13 + XPDR1-NETWORK1 + XPDR1-CLIENT3 + 1000000000 + 0 + + + 12 + XPDR1-CLIENT2 + XPDR1-NETWORK1 + 1000000000 + 0 + + non-blocking - XPDR2-CLIENT3 - switch-client - CP2-QSFP3-P1 + XPDR2-CLIENT2 + CP2-QSFP2 + x:if-100GE-ODU4 + x:if-100GE + BVSiXSSYUCM= bidirectional - x:if-100GE-ODU4 - x:if-100GE - BVSiXSSYUCI= - CP2-QSFP3 - + CP2-QSFP2-P1 + switch-client - XPDR2-CLIENT4 - switch-client - CP2-QSFP4-P1 + XPDR3-CLIENT4 + CP3-SFP4 + x:if-1GE-ODU0 + E4PhpLpbz0Q= bidirectional - x:if-100GE-ODU4 - x:if-100GE - BVSiXSSYUCU= - CP2-QSFP4 - + CP3-SFP4-P1 + xpdr-client XPDR2-CLIENT1 - switch-client - CP2-QSFP1-P1 - bidirectional - x:if-100GE-ODU4 - x:if-100GE + CP2-QSFP1 + x:if-100GE-ODU4 + x:if-100GE BVSiXSSYUCA= - CP2-QSFP1 - + bidirectional + CP2-QSFP1-P1 + switch-client - XPDR2-CLIENT2 - switch-client - CP2-QSFP2-P1 + XPDR2-CLIENT4 + CP2-QSFP4 + x:if-100GE-ODU4 + x:if-100GE + BVSiXSSYUCU= bidirectional - x:if-100GE-ODU4 - x:if-100GE - BVSiXSSYUCM= - CP2-QSFP2 - + CP2-QSFP4-P1 + switch-client - XPDR1-CLIENT3 - xpdr-client - CP1-SFP3-P1 + XPDR3-NETWORK1 + CP3-CFP0 + x:if-OCH-OTU4-ODU4 + FBhfaeWn4kY= bidirectional - x:if-10GE-ODU2 - x:if-10GE-ODU2e - x:if-10GE - L0PHYLgz3+E= - CP1-SFP3 - + mpdr + CP3-CFP0-P1 + xpdr-network - XPDR1-CLIENT2 - xpdr-client - CP1-SFP2-P1 + XPDR2-CLIENT3 + CP2-QSFP3 + x:if-100GE-ODU4 + x:if-100GE + BVSiXSSYUCI= bidirectional - x:if-10GE-ODU2 - x:if-10GE-ODU2e - L0PHYLgz3+A= - CP1-SFP2 - + CP2-QSFP3-P1 + switch-client - XPDR1-CLIENT4 + XPDR1-CLIENT1 + CP1-SFP1 + x:if-10GE-ODU2e + x:if-10GE-ODU2 + L0PHYLgz3+M= + bidirectional + CP1-SFP1-P1 xpdr-client - CP1-SFP4-P1 + + + XPDR1-CLIENT2 + CP1-SFP2 + x:if-10GE-ODU2e + x:if-10GE-ODU2 + L0PHYLgz3+A= bidirectional - x:if-10GE-ODU2 - x:if-10GE-ODU2e - x:if-10GE - L0PHYLgz3+Y= - CP1-SFP4 - + CP1-SFP2-P1 + xpdr-client - XPDR1-CLIENT1 + XPDR1-CLIENT3 + CP1-SFP3 + x:if-10GE + x:if-10GE-ODU2 + x:if-10GE-ODU2e + L0PHYLgz3+E= + bidirectional + CP1-SFP3-P1 xpdr-client - CP1-SFP1-P1 + + + XPDR1-CLIENT4 + CP1-SFP4 + x:if-10GE + x:if-10GE-ODU2 + x:if-10GE-ODU2e + L0PHYLgz3+Y= bidirectional - x:if-10GE-ODU2 - x:if-10GE-ODU2e - L0PHYLgz3+M= - CP1-SFP1 - + CP1-SFP4-P1 + xpdr-client - XPDR2-NETWORK3 - - switch-network - CP8-CFP-P1 + XPDR2-NETWORK1 + CP6-CFP + x:if-OCH-OTU4-ODU4 + ALx70DYYfGTx bidirectional - x:if-OCH-OTU4-ODU4 - ALx70DYYfGTz switch - CP8-CFP - + CP6-CFP-P1 + switch-network - XPDR2-NETWORK2 - - switch-network - CP7-CFP-P1 - bidirectional - x:if-OCH-OTU4-ODU4 + XPDR2-NETWORK2 + CP7-CFP + x:if-OCH-OTU4-ODU4 ALx70DYYfGTy + bidirectional switch - CP7-CFP - + CP7-CFP-P1 + switch-network - XPDR2-NETWORK4 - - switch-network - CP5-CFP-P1 + XPDR2-NETWORK3 + CP8-CFP + x:if-OCH-OTU4-ODU4 + ALx70DYYfGTz bidirectional - x:if-OCH-OTU4-ODU4 - ALx70DYYfGT0 switch - CP5-CFP - + CP8-CFP-P1 + switch-network - XPDR2-NETWORK1 - - switch-network - CP6-CFP-P1 + XPDR2-NETWORK4 + CP5-CFP + x:if-OCH-OTU4-ODU4 + ALx70DYYfGT0 bidirectional - x:if-OCH-OTU4-ODU4 - ALx70DYYfGTx switch - CP6-CFP - + CP5-CFP-P1 + switch-network - XPDR1-NETWORK1 - - xpdr-network - CP1-CFP0-P1 - bidirectional - x:if-OCH-OTU4-ODU4 + XPDR1-NETWORK1 + CP1-CFP0 + x:if-OCH-OTU4-ODU4 fuYZwEO660g= + bidirectional mpdr - CP1-CFP0 - + CP1-CFP0-P1 + xpdr-network + + + XPDR3-CLIENT1 + CP3-SFP1 + x:if-1GE-ODU0 + E4PhpLpbz0E= + bidirectional + CP3-SFP1-P1 + xpdr-client + + + XPDR3-CLIENT3 + CP3-SFP3 + x:if-1GE-ODU0 + E4PhpLpbz0M= + bidirectional + CP3-SFP3-P1 + xpdr-client + + + XPDR3-CLIENT2 + CP3-SFP2 + x:if-1GE-ODU0 + E4PhpLpbz0I= + bidirectional + CP3-SFP2-P1 + xpdr-client SPDR-SA1 - NodeSA - vendorA - universal-switchponder - 1.2.3.4 xpdr + universal-switchponder + 1.2.3.6 + NodeSC 2.2.1 + vendorC - 1 - non-blocking + 3 - 11 - XPDR1-NETWORK1 - XPDR1-CLIENT1 + 83 + XPDR3-NETWORK1 + XPDR3-CLIENT3 + 1000000000 0 - 1000000000 - - 12 - XPDR1-NETWORK1 - XPDR1-CLIENT2 + 82 + XPDR3-CLIENT2 + XPDR3-NETWORK1 + 1000000000 0 - 1000000000 - - 13 - XPDR1-NETWORK1 - XPDR1-CLIENT3 + 81 + XPDR3-CLIENT1 + XPDR3-NETWORK1 + 1000000000 0 - 1000000000 - - 14 - XPDR1-CLIENT4 - XPDR1-NETWORK1 + 84 + XPDR3-NETWORK1 + XPDR3-CLIENT4 + 1000000000 0 - 1000000000 - + non-blocking 2 - non-blocking 2 - XPDR2-NETWORK1 XPDR2-CLIENT4 - XPDR2-CLIENT3 - XPDR2-CLIENT2 - XPDR2-CLIENT1 - XPDR2-NETWORK3 + XPDR2-NETWORK1 XPDR2-NETWORK2 + XPDR2-NETWORK3 XPDR2-NETWORK4 + XPDR2-CLIENT1 + XPDR2-CLIENT3 + XPDR2-CLIENT2 + 1000000000 0 - 1000000000 - + non-blocking + + + 1 + + 11 + XPDR1-CLIENT1 + XPDR1-NETWORK1 + 1000000000 + 0 + + + 14 + XPDR1-CLIENT4 + XPDR1-NETWORK1 + 1000000000 + 0 + + + 13 + XPDR1-NETWORK1 + XPDR1-CLIENT3 + 1000000000 + 0 + + + 12 + XPDR1-CLIENT2 + XPDR1-NETWORK1 + 1000000000 + 0 + + non-blocking - XPDR2-CLIENT3 - switch-client - CP2-QSFP3-P1 - bidirectional - x:if-100GE-ODU4 - x:if-100GE - AN/WSSRXne3s - CP2-QSFP3 - - - - XPDR2-CLIENT4 - switch-client - CP2-QSFP4-P1 - bidirectional - x:if-100GE-ODU4 - x:if-100GE - AN/WSSRXne3r - CP2-QSFP4 - - - - XPDR2-CLIENT1 - switch-client - CP2-QSFP1-P1 - bidirectional - x:if-100GE-ODU4 - x:if-100GE - AN/WSSRXne3u - CP2-QSFP1 - - - - XPDR2-CLIENT2 - switch-client - CP2-QSFP2-P1 - bidirectional - x:if-100GE-ODU4 - x:if-100GE - AN/WSSRXne3t - CP2-QSFP2 - - - - XPDR1-CLIENT3 - xpdr-client - CP1-SFP3-P1 - bidirectional - x:if-10GE-ODU2 - x:if-10GE-ODU2e - x:if-10GE - FqlcrxV7p38= - CP1-SFP3 - - - - XPDR1-CLIENT2 - xpdr-client - CP1-SFP2-P1 - bidirectional - x:if-10GE-ODU2 - x:if-10GE-ODU2e - FqlcrxV7p34= - CP1-SFP2 - - - - XPDR1-CLIENT4 - xpdr-client - CP1-SFP4-P1 + XPDR2-CLIENT2 + CP2-QSFP2 + x:if-100GE-ODU4 + x:if-100GE + AN/WSSRXne3t bidirectional - x:if-10GE-ODU2 - x:if-10GE-ODU2e - x:if-10GE - FqlcrxV7p3g= - CP1-SFP4 - + CP2-QSFP2-P1 + switch-client - XPDR1-CLIENT1 - xpdr-client - CP1-SFP1-P1 + XPDR3-CLIENT4 + CP3-SFP4 + x:if-1GE-ODU0 + AKsQ/HRQdtdK bidirectional - x:if-10GE-ODU2 - x:if-10GE-ODU2e - FqlcrxV7p30= - CP1-SFP1 - + CP3-SFP4-P1 + xpdr-client - XPDR2-NETWORK3 - - switch-network - CP8-CFP-P1 + XPDR2-CLIENT1 + CP2-QSFP1 + x:if-100GE-ODU4 + x:if-100GE + AN/WSSRXne3u bidirectional - x:if-OCH-OTU4-ODU4 - exT821pFtOU= - switch - CP8-CFP - + CP2-QSFP1-P1 + switch-client - XPDR2-NETWORK2 - - switch-network - CP7-CFP-P1 + XPDR2-CLIENT4 + CP2-QSFP4 + x:if-100GE-ODU4 + x:if-100GE + AN/WSSRXne3r bidirectional - x:if-OCH-OTU4-ODU4 - exT821pFtOQ= - switch - CP7-CFP - + CP2-QSFP4-P1 + switch-client - XPDR2-NETWORK4 - - switch-network - CP5-CFP-P1 + XPDR3-NETWORK1 + CP3-CFP0 + x:if-OCH-OTU4-ODU4 + ANnxoi7K8q30 bidirectional - x:if-OCH-OTU4-ODU4 - exT821pFtOI= - switch - CP5-CFP - + mpdr + CP3-CFP0-P1 + xpdr-network - XPDR2-NETWORK1 - - switch-network - CP6-CFP-P1 + XPDR2-CLIENT3 + CP2-QSFP3 + x:if-100GE-ODU4 + x:if-100GE + AN/WSSRXne3s bidirectional - x:if-OCH-OTU4-ODU4 - exT821pFtOc= - switch - CP6-CFP - + CP2-QSFP3-P1 + switch-client - XPDR1-NETWORK1 - - xpdr-network - CP1-CFP0-P1 + XPDR1-CLIENT1 + CP1-SFP1 + x:if-10GE-ODU2e + x:if-10GE-ODU2 + FqlcrxV7p30= bidirectional - x:if-OCH-OTU4-ODU4 - Swfw02qXGyI= - mpdr - CP1-CFP0 - + CP1-SFP1-P1 + xpdr-client - - - XPDR-A1 XPDR1-CLIENT2 - xpdr-client - C1 + CP1-SFP2 + x:if-10GE-ODU2e + x:if-10GE-ODU2 + FqlcrxV7p34= bidirectional - x:if-100GE - XPDR1-NETWORK2 - AJUUr6I5fALg - 1/0/2-PLUG-CLIENT - + CP1-SFP2-P1 + xpdr-client - XPDR1-NETWORK2 - - xpdr-network - 1 + XPDR1-CLIENT3 + CP1-SFP3 + x:if-10GE + x:if-10GE-ODU2 + x:if-10GE-ODU2e + FqlcrxV7p38= bidirectional - x:if-OCH - XPDR1-CLIENT2 - AMkDwQ7xTmRL - 1/0/2-PLUG-NET - + CP1-SFP3-P1 + xpdr-client - XPDR1-CLIENT1 + XPDR1-CLIENT4 + CP1-SFP4 + x:if-10GE + x:if-10GE-ODU2 + x:if-10GE-ODU2e + FqlcrxV7p3g= + bidirectional + CP1-SFP4-P1 xpdr-client - C1 + + + XPDR2-NETWORK1 + CP6-CFP + x:if-OCH-OTU4-ODU4 + exT821pFtOc= bidirectional - x:if-100GE - XPDR1-NETWORK1 - AJUUr6I5fALj - 1/0/1-PLUG-CLIENT - + switch + CP6-CFP-P1 + switch-network - XPDR1-NETWORK1 - - xpdr-network - 1 + XPDR2-NETWORK2 + CP7-CFP + x:if-OCH-OTU4-ODU4 + exT821pFtOQ= bidirectional - x:if-OCH - XPDR1-CLIENT1 - AMkDwQ7xTmRI - 1/0/1-PLUG-NET - + switch + CP7-CFP-P1 + switch-network - - NodeA - vendorA - model2 - 1.2.3.4 - xpdr - 2.2.1 - - - - ROADM-C1 - - NodeC - vendorA - model2 - 127.0.0.13 - rdm - 2.2.1 - - - 1/0/ETH-PLUG - 1 - 1GE-interface-1 - - - 2/0 - 2 - 1GE-interface-2 - - - 2/0/ETH-PLUG - 2 - 1GE-interface-2 - - - 1/0 - 1 - 1GE-interface-1 - - DEG2-TTP-TXRX - 2/0 - L1 + XPDR2-NETWORK3 + CP8-CFP + x:if-OCH-OTU4-ODU4 + exT821pFtOU= bidirectional + switch + CP8-CFP-P1 + switch-network - SRG1-PP3-TXRX - 3/0 - C3 + XPDR2-NETWORK4 + CP5-CFP + x:if-OCH-OTU4-ODU4 + exT821pFtOI= bidirectional + switch + CP5-CFP-P1 + switch-network - DEG1-TTP-TXRX - OTS-DEG1-TTP-TXRX - OMS-DEG1-TTP-TXRX - 1/0 - L1 + XPDR1-NETWORK1 + CP1-CFP0 + x:if-OCH-OTU4-ODU4 + Swfw02qXGyI= bidirectional + mpdr + CP1-CFP0-P1 + xpdr-network - SRG1-PP1-TXRX - 3/0 - C1 + XPDR3-CLIENT1 + CP3-SFP1 + x:if-1GE-ODU0 + AKsQ/HRQdtdP bidirectional + CP3-SFP1-P1 + xpdr-client - SRG1-PP2-TXRX - 3/0 - C2 + XPDR3-CLIENT3 + CP3-SFP3 + x:if-1GE-ODU0 + AKsQ/HRQdtdN bidirectional + CP3-SFP3-P1 + xpdr-client - SRG1-PP4-TXRX - 3/0 - C4 + XPDR3-CLIENT2 + CP3-SFP2 + x:if-1GE-ODU0 + AKsQ/HRQdtdM bidirectional + CP3-SFP2-P1 + xpdr-client - - SRG1-PP - 50 - 50 - - - DEG2-TTP - 50 - 50 - - - DEG1-TTP - 50 - 50 - ROADM-A1 - NodeA - vendorA + rdm model2 127.0.0.11 - rdm + NodeA 2.2.1 + vendorA 1/0/ETH-PLUG @@ -713,86 +757,86 @@ 1GE-interface-1 - SRG3-PP3-TXRX - 5/0 - C3 + SRG1-PP3-TXRX + 3/0 bidirectional + C3 - DEG2-TTP-TXRX - OTS-DEG2-TTP-TXRX - OMS-DEG2-TTP-TXRX - 2/0 - L1 + SRG3-PP2-TXRX + 5/0 bidirectional + C2 - SRG1-PP3-TXRX + SRG1-PP1-TXRX 3/0 - C3 bidirectional + C1 DEG1-TTP-TXRX 1/0 - L1 - bidirectional - - - SRG1-PP1-TXRX - 3/0 - C1 bidirectional + L1 - SRG3-PP2-TXRX + SRG3-PP1-TXRX 5/0 - C2 bidirectional + C1 SRG1-PP2-TXRX 3/0 - C2 - bidirectional - - - SRG3-PP1-TXRX - 5/0 - C1 bidirectional + C2 SRG1-PP4-TXRX 3/0 - C4 bidirectional + C4 SRG3-PP4-TXRX 5/0 + bidirectional C4 + + + SRG3-PP3-TXRX + 5/0 bidirectional + C3 + + + DEG2-TTP-TXRX + OMS-DEG2-TTP-TXRX + 2/0 + OTS-DEG2-TTP-TXRX + bidirectional + L1 - - SRG1-PP - 50 - 50 - DEG2-TTP - 50 50 + 50 DEG1-TTP - 50 50 + 50 SRG3-PP + 50 50 + + + SRG1-PP 50 + 50 -- 2.36.6