From 66ccddbe00692f230350a19e1a222f09d6abd9a7 Mon Sep 17 00:00:00 2001 From: Gilles Thouenon Date: Fri, 18 Oct 2019 15:33:42 +0200 Subject: [PATCH] fix deprecated openroadm interfaces/objects Concerns mainly changes on node-type, link-type and tp-type, from org-openroadm-network-topology to org-openroadm-common-network. for example getLinkType() in [].org.openroadm.network.topology.rev181130.Link1 objects must now be called from [].org.openroadm.common.network.rev181130.Link1 modify functional tests and sample configurations accordingly JIRA: TRNSPRTPCE-144 Signed-off-by: Gilles Thouenon Change-Id: I04f69ea5507fbc3a76eceb92ec52efcbb5301c4c --- .../transportpce/networkmodel/OrdLink.java | 12 +- .../networkmodel/Rdm2XpdrLink.java | 26 +- .../networkmodel/util/OpenRoadmNetwork.java | 8 +- .../util/OpenRoadmTopology22.java | 154 +- .../blueprint/networkmodel-blueprint.xml | 1 - .../olm/service/OlmPowerServiceImpl.java | 2 +- .../olm/util/OlmTransactionUtils.java | 39 +- .../transportpce/pce/gnpy/GnpyTopoImpl.java | 40 +- .../pce/networkanalyzer/MapUtils.java | 9 +- .../pce/networkanalyzer/PceCalculation.java | 2 +- .../pce/networkanalyzer/PceNode.java | 28 +- .../NetworkModelWavelengthServiceImpl.java | 166 +- ...NetworkModelWaveLengthServiceFreeTest.java | 142 +- .../NetworkModelWaveLengthServiceUseTest.java | 96 +- .../utils/WaveLengthServiceUtils.java | 84 +- .../ConvertORTopoObjectToTapiTopoObject.java | 2 +- .../tapi/topology/TapiTopologyImpl.java | 10 +- tests/sample_configs/NW-for-test-5-4.xml | 1920 ++++++++--------- tests/sample_configs/NW-simple-topology.xml | 1380 ++++++------ .../sample_configs/gnpy/openroadmNetwork.json | 20 +- .../gnpy/openroadmTopology.json | 590 ++--- tests/sample_configs/honeynode-topo.xml | 152 +- .../transportpce_tests/1.2.1/test_end2end.py | 4 +- .../transportpce_tests/1.2.1/test_topology.py | 164 +- .../transportpce_tests/2.2.1/test_end2end.py | 4 +- .../2.2.1/test_otn_topology.py | 2 +- .../transportpce_tests/2.2.1/test_topology.py | 164 +- 27 files changed, 2772 insertions(+), 2449 deletions(-) diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/OrdLink.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/OrdLink.java index fa202b0d1..c44203cf3 100644 --- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/OrdLink.java +++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/OrdLink.java @@ -45,16 +45,14 @@ final class OrdLink { LinkId oppositeLinkId = LinkIdUtil.getRdm2RdmOppositeLinkId(input); //For setting up attributes for openRoadm augment - Link1Builder link1Builder = new Link1Builder(); - OMSAttributesBuilder omsAttributesBuilder = new OMSAttributesBuilder(); - omsAttributesBuilder.setOppositeLink(oppositeLinkId); - link1Builder.setOMSAttributes(omsAttributesBuilder.build()); + OMSAttributesBuilder omsAttributesBuilder = new OMSAttributesBuilder().setOppositeLink(oppositeLinkId); + Link1Builder link1Builder = new Link1Builder().setOMSAttributes(omsAttributesBuilder.build()); //For opposite link augment org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Link1Builder oppsiteLinkBuilder = - new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Link1Builder(); - oppsiteLinkBuilder.setOppositeLink(oppositeLinkId); - link1Builder.setLinkType(OpenroadmLinkType.ROADMTOROADM); + new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Link1Builder() + .setOppositeLink(oppositeLinkId) + .setLinkType(OpenroadmLinkType.ROADMTOROADM); String srcNode = new StringBuilder(input.getRdmANode()).append("-DEG").append(input.getDegANum()).toString(); String srcTp = input.getTerminationPointA(); String destNode = new StringBuilder(input.getRdmZNode()).append("-DEG").append(input.getDegZNum()).toString(); diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/Rdm2XpdrLink.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/Rdm2XpdrLink.java index bb46715e3..9edfc0685 100644 --- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/Rdm2XpdrLink.java +++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/Rdm2XpdrLink.java @@ -102,21 +102,25 @@ final class Rdm2XpdrLink { private static NetworkBuilder createNetworkBuilder(String srcNode, String srcTp, String destNode, String destTp, boolean isXponderInput, OpenRoadmFactory openRoadmFactory) { - NetworkId nwId = new NetworkId(NetworkUtils.OVERLAY_NETWORK_ID); - NetworkBuilder nwBuilder = new NetworkBuilder(); - nwBuilder.setNetworkId(nwId); - nwBuilder.withKey(new NetworkKey(nwId)); Link1Builder lnk1bldr = new Link1Builder(); - LinkBuilder linkBuilder = openRoadmFactory.createLink(srcNode, destNode, srcTp, destTp); - lnk1bldr.setLinkType(isXponderInput ? OpenroadmLinkType.XPONDERINPUT : OpenroadmLinkType.XPONDEROUTPUT); - lnk1bldr.setOppositeLink(LinkIdUtil.getOppositeLinkId(srcNode, srcTp, destNode, destTp)); - linkBuilder.addAugmentation(Link1.class, lnk1bldr.build()); + org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Link1Builder lnk2bldr + = new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Link1Builder() + .setLinkType(isXponderInput ? OpenroadmLinkType.XPONDERINPUT : OpenroadmLinkType.XPONDEROUTPUT) + .setOppositeLink(LinkIdUtil.getOppositeLinkId(srcNode, srcTp, destNode, destTp)); + LinkBuilder linkBuilder = openRoadmFactory.createLink(srcNode, destNode, srcTp, destTp) + .addAugmentation(Link1.class, lnk1bldr.build()) + .addAugmentation( + org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Link1.class, + lnk2bldr.build()); LOG.info("Link id in the linkbldr {}", linkBuilder.getLinkId()); LOG.info("Link with oppo link {}", linkBuilder.augmentation(Link1.class)); - Network1Builder nwBldr1 = new Network1Builder(); - nwBldr1.setLink(ImmutableList.of(linkBuilder.build())); - nwBuilder.addAugmentation(Network1.class, nwBldr1.build()); + Network1Builder nwBldr1 = new Network1Builder().setLink(ImmutableList.of(linkBuilder.build())); + NetworkId nwId = new NetworkId(NetworkUtils.OVERLAY_NETWORK_ID); + NetworkBuilder nwBuilder = new NetworkBuilder() + .setNetworkId(nwId) + .withKey(new NetworkKey(nwId)) + .addAugmentation(Network1.class, nwBldr1.build()); return nwBuilder; } diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmNetwork.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmNetwork.java index 774d20b85..917926e51 100644 --- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmNetwork.java +++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmNetwork.java @@ -85,16 +85,18 @@ public final class OpenRoadmNetwork { nodeBldr.setNodeId(nwNodeId); nodeBldr.withKey(new NodeKey(nwNodeId)); Node1Builder node1bldr = new Node1Builder(); + org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Node1Builder node2bldr = + new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Node1Builder(); /* * Recognize the node type: 1:ROADM, 2:XPONDER */ switch (nodeInfo.getNodeType().getIntValue()) { case 1: - node1bldr.setNodeType(OpenroadmNodeType.ROADM); + node2bldr.setNodeType(OpenroadmNodeType.ROADM); break; case 2: - node1bldr.setNodeType(OpenroadmNodeType.XPONDER); + node2bldr.setNodeType(OpenroadmNodeType.XPONDER); break; default: LOG.error("No correponsding type for the value: {}", nodeInfo.getNodeType().getName()); @@ -123,6 +125,8 @@ public final class OpenRoadmNetwork { // Augment to the main node builder nodeBldr.addAugmentation(Node1.class, node1bldr.build()); + nodeBldr.addAugmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Node1.class, + node2bldr.build()); return nodeBldr.build(); } diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmTopology22.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmTopology22.java index cce6af114..7fb4a91cd 100644 --- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmTopology22.java +++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmTopology22.java @@ -21,11 +21,12 @@ import java.util.stream.Collectors; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.transportpce.common.NetworkUtils; -import org.opendaylight.transportpce.common.device.DeviceTransactionManager; import org.opendaylight.transportpce.common.network.NetworkTransactionService; import org.opendaylight.transportpce.networkmodel.dto.TopologyShard; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.Nodes; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.Mapping; +import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Link1; +import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Link1Builder; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.NetworkTypes1; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.NetworkTypes1Builder; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.networks.network.network.types.OpenroadmCommonNetworkBuilder; @@ -34,8 +35,6 @@ import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev161014.No import org.opendaylight.yang.gen.v1.http.org.openroadm.degree.rev181130.degree.node.attributes.AvailableWavelengths; import org.opendaylight.yang.gen.v1.http.org.openroadm.degree.rev181130.degree.node.attributes.AvailableWavelengthsBuilder; import org.opendaylight.yang.gen.v1.http.org.openroadm.degree.rev181130.degree.node.attributes.AvailableWavelengthsKey; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev181130.Link1; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev181130.Link1Builder; import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev181130.Node1; import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev181130.Node1Builder; import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev181130.TerminationPoint1; @@ -82,12 +81,9 @@ public class OpenRoadmTopology22 { private static final Logger LOG = LoggerFactory.getLogger(OpenRoadmTopology22.class); private NetworkTransactionService networkTransactionService; - private final DeviceTransactionManager deviceTransactionManager; - public OpenRoadmTopology22(NetworkTransactionService networkTransactionService, - DeviceTransactionManager deviceTransactionManager) { + public OpenRoadmTopology22(NetworkTransactionService networkTransactionService) { this.networkTransactionService = networkTransactionService; - this.deviceTransactionManager = deviceTransactionManager; } /** @@ -140,12 +136,12 @@ public class OpenRoadmTopology22 { if (NodeTypes.Rdm.getIntValue() == mappingNode.getNodeInfo().getNodeType().getIntValue()) { LOG.info("creating rdm node in openroadmtopology for node {}", mappingNode.getNodeId()); // transform flat mapping list to per degree and per srg mapping lists - Map> mapDeg = new HashMap(); - Map> mapSrg = new HashMap(); + Map> mapDeg = new HashMap<>(); + Map> mapSrg = new HashMap<>(); List mappingList = mappingNode.getMapping(); mappingList.sort(Comparator.comparing(Mapping::getLogicalConnectionPoint)); - List nodeShardList = new ArrayList(); + List nodeShardList = new ArrayList<>(); for (Mapping mapping : mappingList) { String str = mapping.getLogicalConnectionPoint().split("-")[0]; if (!nodeShardList.contains(str)) { @@ -153,7 +149,7 @@ public class OpenRoadmTopology22 { } } for (String str : nodeShardList) { - List interList = new ArrayList(); + List interList = new ArrayList<>(); interList = mappingList.stream().filter(x -> x.getLogicalConnectionPoint().contains(str)) .collect(Collectors.toList()); if (str.contains("DEG")) { @@ -197,12 +193,15 @@ public class OpenRoadmTopology22 { // set node-id String nodeIdtopo = new StringBuilder().append(mappingNode.getNodeId()).append("-XPDR1").toString(); // Create openroadm-network-topo augmentation to set node type to Xponder - Node1Builder ontNode1Bldr = new Node1Builder().setNodeType(OpenroadmNodeType.XPONDER); + org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130 + .Node1Builder ocnNode1Bldr = new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130 + .Node1Builder().setNodeType(OpenroadmNodeType.XPONDER); // Create ietf node setting supporting-node data NodeBuilder ietfNodeBldr = createTopoLayerNode(mappingNode.getNodeId()) .setNodeId(new NodeId(nodeIdtopo)) .withKey((new NodeKey(new NodeId(nodeIdtopo)))) - .addAugmentation(Node1.class, ontNode1Bldr.build()); + .addAugmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130 + .Node1.class, ocnNode1Bldr.build()); // Create tp-list List tpList = new ArrayList<>(); @@ -211,27 +210,36 @@ public class OpenRoadmTopology22 { ietfTpBldr = createTpBldr(m.getLogicalConnectionPoint()); // Add openroadm-network-topology tp augmentations TerminationPoint1Builder ontTp1Bldr = new TerminationPoint1Builder(); + org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130 + .TerminationPoint1Builder ocnTp1Bldr = new org.opendaylight.yang.gen.v1.http.org.openroadm.common + .network.rev181130.TerminationPoint1Builder(); if (m.getPortQual().equals("xpdr-network")) { XpdrNetworkAttributesBuilder xpdrNwAttrBldr = new XpdrNetworkAttributesBuilder() .setTailEquipmentId(m.getAssociatedLcp()); - ontTp1Bldr.setTpType(OpenroadmTpType.XPONDERNETWORK).setXpdrNetworkAttributes(xpdrNwAttrBldr.build()); + ontTp1Bldr.setXpdrNetworkAttributes(xpdrNwAttrBldr.build()); + ocnTp1Bldr.setTpType(OpenroadmTpType.XPONDERNETWORK); org.opendaylight.yang.gen.v1.http.transportpce.topology.rev190625.TerminationPoint1Builder tpceTp1Bldr = new org.opendaylight.yang.gen.v1.http.transportpce.topology.rev190625.TerminationPoint1Builder() .setAssociatedConnectionMapPort(m.getAssociatedLcp()); ietfTpBldr.addAugmentation(TerminationPoint1.class, ontTp1Bldr.build()) - .addAugmentation(org.opendaylight.yang.gen.v1.http.transportpce.topology.rev190625 - .TerminationPoint1.class, tpceTp1Bldr.build()); + .addAugmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130 + .TerminationPoint1.class, ocnTp1Bldr.build()) + .addAugmentation(org.opendaylight.yang.gen.v1.http.transportpce.topology.rev190625 + .TerminationPoint1.class, tpceTp1Bldr.build()); tpList.add(ietfTpBldr.build()); } else if (m.getPortQual().equals("xpdr-client")) { XpdrClientAttributesBuilder xpdrNwAttrBldr = new XpdrClientAttributesBuilder() .setTailEquipmentId(m.getAssociatedLcp()); - ontTp1Bldr.setTpType(OpenroadmTpType.XPONDERCLIENT).setXpdrClientAttributes(xpdrNwAttrBldr.build()); + ontTp1Bldr.setXpdrClientAttributes(xpdrNwAttrBldr.build()); + ocnTp1Bldr.setTpType(OpenroadmTpType.XPONDERCLIENT); org.opendaylight.yang.gen.v1.http.transportpce.topology.rev190625.TerminationPoint1Builder tpceTp1Bldr = new org.opendaylight.yang.gen.v1.http.transportpce.topology.rev190625.TerminationPoint1Builder() .setAssociatedConnectionMapPort(m.getAssociatedLcp()); ietfTpBldr.addAugmentation(TerminationPoint1.class, ontTp1Bldr.build()) - .addAugmentation(org.opendaylight.yang.gen.v1.http.transportpce.topology.rev190625 - .TerminationPoint1.class, tpceTp1Bldr.build()); + .addAugmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130 + .TerminationPoint1.class, ocnTp1Bldr.build()) + .addAugmentation(org.opendaylight.yang.gen.v1.http.transportpce.topology.rev190625 + .TerminationPoint1.class, tpceTp1Bldr.build()); tpList.add(ietfTpBldr.build()); } } @@ -254,26 +262,32 @@ public class OpenRoadmTopology22 { for (Mapping m : degListMap) { ietfTpBldr = createTpBldr(m.getLogicalConnectionPoint()); // Add openroadm-network-topology tp augmentations - TerminationPoint1Builder ontTp1Bldr = new TerminationPoint1Builder(); + org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130 + .TerminationPoint1Builder ocnTp1Bldr = new org.opendaylight.yang.gen.v1.http.org.openroadm.common + .network.rev181130.TerminationPoint1Builder(); switch (m.getPortDirection()) { case "bidirectional": - ontTp1Bldr.setTpType(OpenroadmTpType.DEGREETXRXTTP); + ocnTp1Bldr.setTpType(OpenroadmTpType.DEGREETXRXTTP); break; case "tx": - ontTp1Bldr.setTpType(OpenroadmTpType.DEGREETXTTP); + ocnTp1Bldr.setTpType(OpenroadmTpType.DEGREETXTTP); break; case "rx": - ontTp1Bldr.setTpType(OpenroadmTpType.DEGREERXTTP); + ocnTp1Bldr.setTpType(OpenroadmTpType.DEGREERXTTP); break; default: LOG.error("impossible to set tp-type to {}", m.getLogicalConnectionPoint()); } - ietfTpBldr.addAugmentation(TerminationPoint1.class, ontTp1Bldr.build()); + ietfTpBldr.addAugmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130 + .TerminationPoint1.class, ocnTp1Bldr.build()); tpList.add(ietfTpBldr.build()); } // Add CTP to tp-list - TerminationPoint1Builder ontTp1Bldr = new TerminationPoint1Builder().setTpType(OpenroadmTpType.DEGREETXRXCTP); - ietfTpBldr = createTpBldr(degNb + "-CTP-TXRX").addAugmentation(TerminationPoint1.class, ontTp1Bldr.build()); + org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.TerminationPoint1Builder ocnTp1Bldr = + new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.TerminationPoint1Builder() + .setTpType(OpenroadmTpType.DEGREETXRXCTP); + ietfTpBldr = createTpBldr(degNb + "-CTP-TXRX").addAugmentation(org.opendaylight.yang.gen.v1.http.org.openroadm + .common.network.rev181130.TerminationPoint1.class, ocnTp1Bldr.build()); tpList.add(ietfTpBldr.build()); // Create ietf node augmentation to support ietf tp-list @@ -290,13 +304,18 @@ public class OpenRoadmTopology22 { .setAvailableWavelengths(create96AvalWaveDegree()); // Create openroadm-network-topo augmentation to set node type to DEGREE Node1Builder ontNode1Bldr = new Node1Builder() - .setNodeType(OpenroadmNodeType.DEGREE) .setDegreeAttributes(degAttBldr.build()); + org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Node1Builder ocnNode1Bldr = + new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Node1Builder() + .setNodeType(OpenroadmNodeType.DEGREE); + // Create ietf node setting supporting-node data NodeBuilder ietfNodeBldr = createTopoLayerNode(nodeId) .setNodeId(new NodeId(nodeIdtopo)) .withKey((new NodeKey(new NodeId(nodeIdtopo)))) .addAugmentation(Node1.class, ontNode1Bldr.build()) + .addAugmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130 + .Node1.class, ocnNode1Bldr.build()) .addAugmentation( org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.Node1.class, ietfNode1.build()); @@ -310,26 +329,32 @@ public class OpenRoadmTopology22 { for (Mapping m : srgListMap) { ietfTpBldr = createTpBldr(m.getLogicalConnectionPoint()); // Add openroadm-network-topology tp augmentations - TerminationPoint1Builder ontTp1Bldr = new TerminationPoint1Builder(); + org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130 + .TerminationPoint1Builder ocnTp1Bldr = new org.opendaylight.yang.gen.v1.http.org.openroadm.common + .network.rev181130.TerminationPoint1Builder(); switch (m.getPortDirection()) { case "bidirectional": - ontTp1Bldr.setTpType(OpenroadmTpType.SRGTXRXPP); + ocnTp1Bldr.setTpType(OpenroadmTpType.SRGTXRXPP); break; case "tx": - ontTp1Bldr.setTpType(OpenroadmTpType.SRGTXPP); + ocnTp1Bldr.setTpType(OpenroadmTpType.SRGTXPP); break; case "rx": - ontTp1Bldr.setTpType(OpenroadmTpType.SRGRXPP); + ocnTp1Bldr.setTpType(OpenroadmTpType.SRGRXPP); break; default: LOG.error("impossible to set tp-type to {}", m.getLogicalConnectionPoint()); } - ietfTpBldr.addAugmentation(TerminationPoint1.class, ontTp1Bldr.build()); + ietfTpBldr.addAugmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130 + .TerminationPoint1.class, ocnTp1Bldr.build()); tpList.add(ietfTpBldr.build()); } // Add CP to tp-list - TerminationPoint1Builder ontTp1Bldr = new TerminationPoint1Builder().setTpType(OpenroadmTpType.SRGTXRXCP); - ietfTpBldr = createTpBldr(srgNb + "-CP-TXRX").addAugmentation(TerminationPoint1.class, ontTp1Bldr.build()); + org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.TerminationPoint1Builder ocnTp1Bldr = + new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.TerminationPoint1Builder() + .setTpType(OpenroadmTpType.SRGTXRXCP); + ietfTpBldr = createTpBldr(srgNb + "-CP-TXRX").addAugmentation(org.opendaylight.yang.gen.v1.http.org.openroadm + .common.network.rev181130.TerminationPoint1.class, ocnTp1Bldr.build()); tpList.add(ietfTpBldr.build()); // Create ietf node augmentation to support ietf tp-list @@ -344,13 +369,18 @@ public class OpenRoadmTopology22 { SrgAttributesBuilder srgAttrBldr = new SrgAttributesBuilder().setAvailableWavelengths(create96AvalWaveSrg()); // Create openroadm-network-topo augmentation to set node type to DEGREE Node1Builder ontNode1Bldr = new Node1Builder() - .setNodeType(OpenroadmNodeType.SRG) .setSrgAttributes(srgAttrBldr.build()); + org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Node1Builder ocnNode1Bldr = + new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Node1Builder() + .setNodeType(OpenroadmNodeType.SRG); + // Create ietf node setting supporting-node data NodeBuilder ietfNodeBldr = createTopoLayerNode(nodeId) .setNodeId(new NodeId(nodeIdtopo)) .withKey((new NodeKey(new NodeId(nodeIdtopo)))) .addAugmentation(Node1.class, ontNode1Bldr.build()) + .addAugmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Node1.class, + ocnNode1Bldr.build()) .addAugmentation( org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.Node1.class, ietfNode1.build()); @@ -413,44 +443,44 @@ public class OpenRoadmTopology22 { .network.topology.rev180226.Node1.class).getTerminationPoint().stream() .filter(tp -> tp.getTpId().getValue().contains("CP") || tp.getTpId().getValue().contains("CTP")) .findFirst().get().getTpId().getValue(); - LinkBuilder ietfAzLinkBldr = createLink(srcNode, destNode, srcTp, destTp); - Link1Builder ontAzLinkBldr = new Link1Builder(); - int srcNodeType = nodes.get(i).augmentation(Node1.class).getNodeType().getIntValue(); - int destNodeType = nodes.get(j).augmentation(Node1.class).getNodeType().getIntValue(); + Link1Builder ocnAzLinkBldr = new Link1Builder(); + int srcNodeType = nodes.get(i).augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.common + .network.rev181130.Node1.class).getNodeType().getIntValue(); + int destNodeType = nodes.get(j).augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.common + .network.rev181130.Node1.class).getNodeType().getIntValue(); + //The previous 2 lines generate warnings. + //Casting (nodes.get(i or j).augmentation(Node1.class)) to + //(org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Node1) + //breaks the portmapping if (srcNodeType == 11 && destNodeType == 11) { - ontAzLinkBldr.setLinkType(OpenroadmLinkType.EXPRESSLINK); + ocnAzLinkBldr.setLinkType(OpenroadmLinkType.EXPRESSLINK); } else if (srcNodeType == 11 && destNodeType == 12) { - ontAzLinkBldr.setLinkType(OpenroadmLinkType.DROPLINK); + ocnAzLinkBldr.setLinkType(OpenroadmLinkType.DROPLINK); } else if (srcNodeType == 12 && destNodeType == 11) { - ontAzLinkBldr.setLinkType(OpenroadmLinkType.ADDLINK); + ocnAzLinkBldr.setLinkType(OpenroadmLinkType.ADDLINK); } else { continue; } // Z to A direction - LinkBuilder ietfZaLinkBldr = createLink(destNode, srcNode, destTp, srcTp); - Link1Builder ontZaLinkBldr = new Link1Builder(); + Link1Builder ocnZaLinkBldr = new Link1Builder(); if (srcNodeType == 11 && destNodeType == 11) { - ontZaLinkBldr.setLinkType(OpenroadmLinkType.EXPRESSLINK); + ocnZaLinkBldr.setLinkType(OpenroadmLinkType.EXPRESSLINK); } else if (destNodeType == 11 && srcNodeType == 12) { - ontZaLinkBldr.setLinkType(OpenroadmLinkType.DROPLINK); + ocnZaLinkBldr.setLinkType(OpenroadmLinkType.DROPLINK); } else if (destNodeType == 12 && srcNodeType == 11) { - ontZaLinkBldr.setLinkType(OpenroadmLinkType.ADDLINK); + ocnZaLinkBldr.setLinkType(OpenroadmLinkType.ADDLINK); } else { continue; } // set opposite link augmentations - org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Link1Builder ocnAzLinkBldr = - new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Link1Builder() - .setOppositeLink(ietfZaLinkBldr.getLinkId()); - ietfAzLinkBldr.addAugmentation(Link1.class, ontAzLinkBldr.build()) + LinkBuilder ietfAzLinkBldr = createLink(srcNode, destNode, srcTp, destTp); + LinkBuilder ietfZaLinkBldr = createLink(destNode, srcNode, destTp, srcTp); + ocnAzLinkBldr.setOppositeLink(ietfZaLinkBldr.getLinkId()); + ietfAzLinkBldr.addAugmentation(Link1.class, ocnAzLinkBldr.build()) .addAugmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130 .Link1.class, ocnAzLinkBldr.build()); - ietfZaLinkBldr.addAugmentation(Link1.class, ontZaLinkBldr.build()); - org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Link1Builder ocnZaLinkBldr = - new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Link1Builder() - .setOppositeLink(ietfAzLinkBldr.getLinkId()); - ietfZaLinkBldr.addAugmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130 - .Link1.class, ocnZaLinkBldr.build()); + ocnZaLinkBldr.setOppositeLink(ietfAzLinkBldr.getLinkId()); + ietfZaLinkBldr.addAugmentation(Link1.class, ocnZaLinkBldr.build()); links.add(ietfAzLinkBldr.build()); links.add(ietfZaLinkBldr.build()); } @@ -483,10 +513,12 @@ public class OpenRoadmTopology22 { networkTransactionService.read(LogicalDatastoreType.CONFIGURATION,linkIID.build()).get(); if (link.isPresent()) { LinkBuilder linkBuilder = new LinkBuilder(link.get()); - Link1Builder link1Builder = new Link1Builder(linkBuilder.augmentation(org.opendaylight - .yang.gen.v1.http.org.openroadm.network.topology.rev181130.Link1.class)) - .setAdministrativeState(State.OutOfService); - linkBuilder.removeAugmentation(Link1.class).addAugmentation(Link1.class,link1Builder.build()); + org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev181130 + .Link1Builder link1Builder = new org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology + .rev181130.Link1Builder(linkBuilder.augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm + .network.topology.rev181130.Link1.class)).setAdministrativeState(State.OutOfService); + linkBuilder.removeAugmentation(Link1.class).addAugmentation(org.opendaylight.yang.gen.v1.http.org + .openroadm.network.topology.rev181130.Link1.class,link1Builder.build()); networkTransactionService.merge(LogicalDatastoreType.CONFIGURATION, linkIID.build(), linkBuilder.build()); networkTransactionService.commit().get(1, TimeUnit.SECONDS); diff --git a/networkmodel/src/main/resources/OSGI-INF/blueprint/networkmodel-blueprint.xml b/networkmodel/src/main/resources/OSGI-INF/blueprint/networkmodel-blueprint.xml index d1a75ef37..de182178d 100644 --- a/networkmodel/src/main/resources/OSGI-INF/blueprint/networkmodel-blueprint.xml +++ b/networkmodel/src/main/resources/OSGI-INF/blueprint/networkmodel-blueprint.xml @@ -21,7 +21,6 @@ - diff --git a/olm/src/main/java/org/opendaylight/transportpce/olm/service/OlmPowerServiceImpl.java b/olm/src/main/java/org/opendaylight/transportpce/olm/service/OlmPowerServiceImpl.java index 66012228f..b91fe7ccc 100644 --- a/olm/src/main/java/org/opendaylight/transportpce/olm/service/OlmPowerServiceImpl.java +++ b/olm/src/main/java/org/opendaylight/transportpce/olm/service/OlmPowerServiceImpl.java @@ -63,10 +63,10 @@ import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev17 import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.get.pm.output.Measurements; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.Mapping; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.NodeInfo.OpenroadmVersion; +import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Link1; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev161014.RatioDB; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.interfaces.grp.Interface; import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.interfaces.grp.InterfaceBuilder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev181130.Link1; import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev181130.OpenroadmLinkType; import org.opendaylight.yang.gen.v1.http.org.openroadm.optical.transport.interfaces.rev161014.Interface1; import org.opendaylight.yang.gen.v1.http.org.openroadm.optical.transport.interfaces.rev161014.Interface1Builder; diff --git a/olm/src/test/java/org/opendaylight/transportpce/olm/util/OlmTransactionUtils.java b/olm/src/test/java/org/opendaylight/transportpce/olm/util/OlmTransactionUtils.java index 8d6e1a6f7..812269204 100644 --- a/olm/src/test/java/org/opendaylight/transportpce/olm/util/OlmTransactionUtils.java +++ b/olm/src/test/java/org/opendaylight/transportpce/olm/util/OlmTransactionUtils.java @@ -155,49 +155,58 @@ public final class OlmTransactionUtils { amplifiedLinkValues.add(al); amplifiedLinkValues.add(al2); Map>, Augmentation> map = Collections.emptyMap(); - Augmentation aug1 = new Link1Builder().setAdministrativeGroup(Long.valueOf(123)) + Augmentation aug11 = new Link1Builder().setAdministrativeGroup(Long.valueOf(123)) .setAdministrativeState(State.InService) .setAmplified(true) .setLinkLatency(Long.valueOf(123)) .setLinkLength(BigDecimal.valueOf(123)) - .setLinkType(OpenroadmLinkType.ROADMTOROADM) .setOMSAttributes(new OMSAttributesBuilder() .setAmplifiedLink(new AmplifiedLinkBuilder().setAmplifiedLink(amplifiedLinkValues).build()) .setOppositeLink(new LinkId("link 1")) .setSpan(new SpanBuilder().build()) .setTEMetric(Long.valueOf(123)).build()) .setOperationalState(State.InService).build(); - Augmentation aug2 = new Link1Builder().setAdministrativeGroup(Long.valueOf(123)) + org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Link1 aug12 = + new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Link1Builder() + .setLinkType(OpenroadmLinkType.ROADMTOROADM).build(); + Augmentation aug21 = new Link1Builder() + .setAdministrativeGroup(Long.valueOf(123)) .setAdministrativeState(State.InService) .setAmplified(true) .setLinkLatency(Long.valueOf(123)) .setLinkLength(BigDecimal.valueOf(123)) - .setLinkType(OpenroadmLinkType.ROADMTOROADM) .setOMSAttributes(new OMSAttributesBuilder() .setAmplifiedLink(new AmplifiedLinkBuilder().setAmplifiedLink(amplifiedLinkValues).build()) .setOppositeLink(new LinkId("link 1")) .setSpan(new SpanBuilder().build()) .setTEMetric(Long.valueOf(123)).build()) .setOperationalState(State.InService).build(); - + org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Link1 aug22 = + new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Link1Builder() + .setLinkType(OpenroadmLinkType.ROADMTOROADM).build(); // create the roadm-to-roadm link to be measured List ietfLinkList = new ArrayList<>(); Link roadm2roadmLink = new LinkBuilder().setLinkId(new LinkId("ROADM-A1-to-ROADM-C1")) .setSource(new SourceBuilder().setSourceNode(ietfNodeA.getNodeId()).setSourceTp("DEG2-TTP-TXRX").build()) - .setDestination(new DestinationBuilder().setDestNode(ietfNodeC.getNodeId()).setDestTp("DEG1-TTP-TXRX") - .build()) - .addAugmentation(Link1.class, aug1) - .addAugmentation(Link1.class, aug2) + .setDestination( + new DestinationBuilder().setDestNode(ietfNodeC.getNodeId()).setDestTp("DEG1-TTP-TXRX").build()) + .addAugmentation(Link1.class, aug11) + .addAugmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Link1.class, + aug12) + .addAugmentation(Link1.class, aug21) + .addAugmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Link1.class, + aug22) .build(); ietfLinkList.add(roadm2roadmLink); // create the ietf network Network1 openroadmAugmToIetfNetwork = new Network1Builder().setLink(ietfLinkList).build(); - NetworkBuilder ietfNetworkBldr = new NetworkBuilder().setNetworkId(new NetworkId("openroadm-topology")) - .setNode(ietfNodeList).addAugmentation(Network1.class, openroadmAugmToIetfNetwork); - org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.networks.Network - openroadmTopology; - openroadmTopology = ietfNetworkBldr.build(); - return openroadmTopology; + // openroadm Topology builder + NetworkBuilder ietfNetworkBldr = new NetworkBuilder() + .setNetworkId(new NetworkId("openroadm-topology")) + .setNode(ietfNodeList) + .addAugmentation(Network1.class, openroadmAugmToIetfNetwork); + + return ietfNetworkBldr.build(); } public static Mapping getMapping1() { diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/GnpyTopoImpl.java b/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/GnpyTopoImpl.java index de0f7b56c..3bcdc327b 100644 --- a/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/GnpyTopoImpl.java +++ b/pce/src/main/java/org/opendaylight/transportpce/pce/gnpy/GnpyTopoImpl.java @@ -43,12 +43,12 @@ import org.opendaylight.yang.gen.v1.gnpy.gnpy.network.topology.rev181214.topo.El import org.opendaylight.yang.gen.v1.gnpy.gnpy.network.topology.rev181214.topo.ElementsBuilder; import org.opendaylight.yang.gen.v1.gnpy.gnpy.network.topology.rev181214.topo.elements.Metadata; import org.opendaylight.yang.gen.v1.gnpy.gnpy.network.topology.rev181214.topo.elements.MetadataBuilder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Link1; import org.opendaylight.yang.gen.v1.http.org.openroadm.link.rev181130.amplified.link.attributes.AmplifiedLink; import org.opendaylight.yang.gen.v1.http.org.openroadm.link.rev181130.amplified.link.attributes.amplified.link.section.element.section.element.Span; import org.opendaylight.yang.gen.v1.http.org.openroadm.link.rev181130.amplified.link.attributes.amplified.link.section.element.section.element.ila.Ila; import org.opendaylight.yang.gen.v1.http.org.openroadm.link.rev181130.span.attributes.LinkConcatenation; import org.opendaylight.yang.gen.v1.http.org.openroadm.network.rev181130.Node1; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev181130.Link1; import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev181130.networks.network.link.OMSAttributes; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address; @@ -152,22 +152,30 @@ public class GnpyTopoImpl { // topology and openRoadm network mapDisgNodeRefNode.put(openRoadmTopoNode.getNodeId().getValue(), nodeRef); Node1 openRoadmNetNode1 = null; + org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130 + .Node1 commonNetworkNode1 = null; for (Node openRoadmNetNode : openRoadmNetNodeList) { if (openRoadmNetNode.getNodeId().getValue().equals(nodeRef)) { openRoadmNetNode1 = openRoadmNetNode.augmentation(Node1.class); + commonNetworkNode1 = openRoadmNetNode.augmentation(org.opendaylight.yang.gen.v1 + .http.org.openroadm.common.network.rev181130.Node1.class); ipAddress = openRoadmNetNode1.getIp(); mapNodeRefIp.put(nodeRef, ipAddress); break; } } - if (openRoadmNetNode1.getNodeType().getName().equals("ROADM")) { + if (commonNetworkNode1.getNodeType().getName().equals("ROADM")) { + //if (((org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Node1) + // openRoadmNetNode1).getNodeType().getName().equals("ROADM")) { if (!nodesList.contains(nodeRef)) { Elements element = addElementsRoadm(2, 0, nodeRef, openRoadmNetNode1.getShelf(), -20, ipAddress.getIpv4Address().getValue().toString()); topoElements.add(element); nodesList.add(nodeRef); } - } else if (openRoadmNetNode1.getNodeType().getName().equals("XPONDER")) { + } else if (commonNetworkNode1.getNodeType().getName().equals("XPONDER")) { + //} else if (((org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130 + // .Node1) openRoadmNetNode1).getNodeType().getName().equals("XPONDER")) { if (!nodesList.contains(nodeRef)) { Elements element = addElementsTransceiver(2, 0, nodeRef, openRoadmNetNode1.getShelf(), @@ -196,15 +204,25 @@ public class GnpyTopoImpl { LOG.debug("The link list is not empty"); for (Link link : linksList) { Link1 link1 = link.augmentation(Link1.class); + org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev181130 + .Link1 openroadmNetworkLink1 = link.augmentation(org.opendaylight.yang.gen.v1.http.org + .openroadm.network.topology.rev181130.Link1.class); int linkType = link1.getLinkType().getIntValue(); + // the previous line generates a warning + // but the following cast in comment makes the gnpy tox test fail + // ((org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Link1) link1) if (IntStream.of(externalLink).anyMatch(x -> x == linkType)) { // Verify if the node is a ROADM String srcId = mapDisgNodeRefNode.get(link.getSource().getSourceNode().getValue()); IpAddress srcIp = mapNodeRefIp.get(srcId); + String clfi = link1.getClfi(); String destId = null; IpAddress destIp = null; // Add the links between amplifiers - OMSAttributes omsAttributes = link1.getOMSAttributes(); + OMSAttributes omsAttributes = null; + if (linkType == 4) { + omsAttributes = openroadmNetworkLink1.getOMSAttributes(); + } if (omsAttributes != null) { if (omsAttributes.getAmplifiedLink() != null) { List amplifiedLinkList = omsAttributes.getAmplifiedLink() @@ -229,9 +247,6 @@ public class GnpyTopoImpl { } else if (amplifiedLink.getSectionElement() .getSectionElement() instanceof Span) { // Create the location - Span span = (Span) amplifiedLink.getSectionElement() - .getSectionElement(); - String clfi = span.getSpan().getClfi(); IpAddress ipFiber = new IpAddress( new Ipv4Address("2.2.2." + idFiber)); mapLinkFiber.put(link.getLinkId().getValue(), clfi); @@ -257,10 +272,6 @@ public class GnpyTopoImpl { } } } else if (omsAttributes.getSpan() != null) { - org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev181130 - .networks.network.link.oms.attributes.@Nullable Span span - = omsAttributes.getSpan(); - String clfi = span.getClfi(); IpAddress ipFiber = new IpAddress(new Ipv4Address("2.2.2." + idFiber)); mapLinkFiber.put(link.getLinkId().getValue(), clfi); mapFiberIp.put(clfi, ipFiber); @@ -271,6 +282,9 @@ public class GnpyTopoImpl { String typeVariety = "SSMF"; double length = 0; // Compute the length of the link + org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev181130 + .networks.network.link.oms.attributes.@Nullable Span span = + omsAttributes.getSpan(); List linkConcatenationList = span.getLinkConcatenation(); for (LinkConcatenation linkConcatenation : linkConcatenationList) { double srlgLength = linkConcatenation.getSRLGLength(); @@ -293,7 +307,7 @@ public class GnpyTopoImpl { } } else { // Add a fiber - String clfi = "Fiber" + idFiber; + clfi = "Fiber" + idFiber; IpAddress ipFiber = new IpAddress(new Ipv4Address("2.2.2." + idFiber)); mapLinkFiber.put(link.getLinkId().getValue(), clfi); mapFiberIp.put(clfi, ipFiber); @@ -480,4 +494,4 @@ public class GnpyTopoImpl { public void setMapFiberIp(Map mapFiberIp) { this.mapFiberIp = mapFiberIp; } -} \ No newline at end of file +} diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/MapUtils.java b/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/MapUtils.java index 6ee3043d8..de9f0e724 100644 --- a/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/MapUtils.java +++ b/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/MapUtils.java @@ -12,8 +12,8 @@ import java.util.Arrays; import java.util.List; import org.opendaylight.transportpce.pce.constraints.PceConstraints; +import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Link1; import org.opendaylight.yang.gen.v1.http.org.openroadm.link.rev181130.span.attributes.LinkConcatenation; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev181130.Link1; import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev181130.networks.network.link.oms.attributes.Span; import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev181130.OpenroadmLinkType; @@ -107,6 +107,7 @@ public final class MapUtils { } tmplType = link1.getLinkType(); + if (tmplType == null) { LOG.error("MapUtils: No Link type available. {}", link.getLinkId().getValue()); return null; @@ -115,9 +116,11 @@ public final class MapUtils { } public static Span getOmsAttributesSpan(Link link) { - Link1 link1 = null; + org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev181130.Link1 link1 = null; Span tempSpan = null; - link1 = link.augmentation(Link1.class); + link1 = + link.augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev181130.Link1.class); + if (link1 == null) { LOG.error("MapUtils: No Link augmentation available. {}", link.getLinkId().getValue()); } diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceCalculation.java b/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceCalculation.java index 08de48d1a..113135541 100644 --- a/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceCalculation.java +++ b/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceCalculation.java @@ -25,7 +25,7 @@ import org.opendaylight.transportpce.common.ResponseCodes; import org.opendaylight.transportpce.common.network.NetworkTransactionService; import org.opendaylight.transportpce.pce.constraints.PceConstraints; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev190624.PathComputationRequestInput; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev181130.Node1; +import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Node1; import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev181130.OpenroadmLinkType; import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev181130.OpenroadmNodeType; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.NetworkId; diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceNode.java b/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceNode.java index 326a33e4f..c06654416 100644 --- a/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceNode.java +++ b/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceNode.java @@ -16,8 +16,8 @@ import java.util.Optional; import java.util.TreeMap; import org.opendaylight.transportpce.pce.SortPortsByName; +import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.TerminationPoint1; import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev181130.Node1; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev181130.TerminationPoint1; import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev181130.networks.network.node.termination.point.pp.attributes.UsedWavelength; import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev181130.OpenroadmNodeType; import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev181130.OpenroadmTpType; @@ -82,14 +82,19 @@ public class PceNode { } for (org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network .node.TerminationPoint tp : allTps) { - TerminationPoint1 tp1 = tp.augmentation(TerminationPoint1.class); - OpenroadmTpType type = tp1.getTpType(); + TerminationPoint1 cntp1 = tp.augmentation(TerminationPoint1.class); + org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev181130.TerminationPoint1 nttp1 = tp + .augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev181130 + .TerminationPoint1.class); + OpenroadmTpType type = cntp1.getTpType(); + LOG.info("type = {} for tp {}", type.getName(), tp.toString()); + switch (type) { case SRGTXRXCP: case SRGRXCP: case SRGTXCP: LOG.info("initSrgTpList: adding SRG-CP tp = {} ", tp.getTpId().getValue()); - this.availableSrgCp.put(tp.getTpId().getValue(), tp1.getTpType()); + this.availableSrgCp.put(tp.getTpId().getValue(), cntp1.getTpType()); break; case SRGRXPP: case SRGTXPP: @@ -97,7 +102,7 @@ public class PceNode { boolean used = true; LOG.info("initSrgTpList: SRG-PP tp = {} found", tp.getTpId().getValue()); try { - List usedWavelengths = tp1.getPpAttributes().getUsedWavelength(); + List usedWavelengths = nttp1.getPpAttributes().getUsedWavelength(); if (usedWavelengths.isEmpty()) { used = false; } @@ -107,7 +112,7 @@ public class PceNode { } if (!used) { LOG.info("initSrgTpList: adding SRG-PP tp '{}'", tp.getTpId().getValue()); - this.availableSrgPp.put(tp.getTpId().getValue(), tp1.getTpType()); + this.availableSrgPp.put(tp.getTpId().getValue(), cntp1.getTpType()); } else { LOG.warn("initSrgTpList: SRG-PP tp = {} found is busy !!"); } @@ -198,16 +203,19 @@ public class PceNode { this.valid = false; for (org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network .node.TerminationPoint tp : allTps) { - TerminationPoint1 tp1 = tp.augmentation(TerminationPoint1.class); - if (tp1.getTpType() == OpenroadmTpType.XPONDERNETWORK) { - if (tp1.getXpdrNetworkAttributes().getWavelength() != null) { + TerminationPoint1 cntp1 = tp.augmentation(TerminationPoint1.class); + org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev181130.TerminationPoint1 nttp1 = tp + .augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev181130 + .TerminationPoint1.class); + if (cntp1.getTpType() == OpenroadmTpType.XPONDERNETWORK) { + if (nttp1.getXpdrNetworkAttributes().getWavelength() != null) { this.usedXpndrNWTps.add(tp.getTpId().getValue()); LOG.debug("initXndrTps: XPONDER tp = {} is used", tp.getTpId().getValue()); } else { this.valid = true; } // find Client of this network TP - String client = tp1.getXpdrNetworkAttributes().getTailEquipmentId(); + String client = nttp1.getXpdrNetworkAttributes().getTailEquipmentId(); if ((client.equals("")) || (client == null)) { LOG.error("initXndrTps: XPONDER {} NW TP doesn't have defined Client {}", this.toString(), tp .getTpId().getValue()); diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/NetworkModelWavelengthServiceImpl.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/NetworkModelWavelengthServiceImpl.java index fdafa24f5..eee258516 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/NetworkModelWavelengthServiceImpl.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/NetworkModelWavelengthServiceImpl.java @@ -160,6 +160,16 @@ public class NetworkModelWavelengthServiceImpl implements NetworkModelWavelength .Node.class, new NodeKey(new NodeId(nodeId))).augmentation(Node1.class).build(); } + private InstanceIdentifier createNode2IID(String nodeId) { + return InstanceIdentifier + .builder(Networks.class).child(Network.class, new NetworkKey( + new NetworkId(NetworkUtils.OVERLAY_NETWORK_ID))) + .child(org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.networks.network + .Node.class, new NodeKey(new NodeId(nodeId))).augmentation(org.opendaylight.yang.gen.v1.http.org + .openroadm.common.network.rev181130.Node1.class).build(); + } + private Optional getNode1FromDatastore(String nodeId) { InstanceIdentifier nodeIID = createNode1IID(nodeId); @@ -174,25 +184,49 @@ public class NetworkModelWavelengthServiceImpl implements NetworkModelWavelength return nodeOpt; } + private Optional getNode2FromDatastore(String nodeId) { + InstanceIdentifier + nodeIID = createNode2IID(nodeId); + Optional nodeOpt; + try (ReadTransaction nodeReadTx = this.dataBroker.newReadOnlyTransaction()) { + nodeOpt = nodeReadTx.read(LogicalDatastoreType.CONFIGURATION, nodeIID) + .get(Timeouts.DATASTORE_READ, TimeUnit.MILLISECONDS); + } catch (InterruptedException | ExecutionException | TimeoutException e) { + LOG.warn("Exception while getting node from {} topology!", NetworkUtils.OVERLAY_NETWORK_ID, e); + nodeOpt = Optional.empty(); + } + return nodeOpt; + } + private void addAvailableWL(List nodeIds, Long wavelengthNumber) { WriteTransaction nodeWriteTx = this.dataBroker.newWriteOnlyTransaction(); for (String nodeId : nodeIds) { - Optional nodeOpt = - getNode1FromDatastore(nodeId); - Node1 node; - if (nodeOpt.isPresent()) { - node = nodeOpt.get(); + Optional node1Opt = getNode1FromDatastore(nodeId); + Node1 node1; + Optional node2Opt = + getNode2FromDatastore(nodeId); + org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Node1 node2; + if (node2Opt.isPresent()) { + node2 = node2Opt.get(); } else { - LOG.error("Unable to get node {} from topology {}! Skipping addition of available wavelength for this" - + "node.", nodeId, NetworkUtils.OVERLAY_NETWORK_ID); + LOG.error("Unable to get common-network node {} from topology {}! Skipping addition of available" + + "wavelength for this node.", nodeId, NetworkUtils.OVERLAY_NETWORK_ID); + continue; + } + if (node1Opt.isPresent()) { + node1 = node1Opt.get(); + } else { + LOG.error("Unable to get network-topology node {} from topology {}! Skipping addition of available" + + "wavelength for this node.", nodeId, NetworkUtils.OVERLAY_NETWORK_ID); continue; } - Node1Builder node1Builder = new Node1Builder(node); + Node1Builder node1Builder = new Node1Builder(node1); - switch (node1Builder.getNodeType()) { + switch (node2.getNodeType()) { case DEGREE: - DegreeAttributes degreeAttributes = node.getDegreeAttributes(); + DegreeAttributes degreeAttributes = node1.getDegreeAttributes(); DegreeAttributesBuilder degreeAttributesBuilder; if (degreeAttributes == null) { degreeAttributesBuilder = new DegreeAttributesBuilder(); @@ -211,7 +245,7 @@ public class NetworkModelWavelengthServiceImpl implements NetworkModelWavelength node1Builder.setDegreeAttributes(degreeAttributesBuilder.build()); break; case SRG: - SrgAttributes srgAttributes = node.getSrgAttributes(); + SrgAttributes srgAttributes = node1.getSrgAttributes(); SrgAttributesBuilder srgAttributesBuilder; if (srgAttributes == null) { srgAttributesBuilder = new SrgAttributesBuilder(); @@ -244,8 +278,9 @@ public class NetworkModelWavelengthServiceImpl implements NetworkModelWavelength private void deleteAvailableWL(List nodeIds, Long wavelengthNumber) { WriteTransaction nodeWriteTx = this.dataBroker.newWriteOnlyTransaction(); for (String nodeId : nodeIds) { - Optional nodeOpt = getNode1FromDatastore(nodeId); - Node1 node; + Optional nodeOpt = + getNode2FromDatastore(nodeId); + org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Node1 node; if (nodeOpt.isPresent()) { node = nodeOpt.get(); } else { @@ -261,6 +296,8 @@ public class NetworkModelWavelengthServiceImpl implements NetworkModelWavelength InstanceIdentifier availableWlIID; switch (node.getNodeType()) { + //switch (((org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Node1) node) + // .getNodeType()) { case DEGREE: availableWlIID = nodeIIDBuilder.child(DegreeAttributes.class) .child(org.opendaylight.yang.gen.v1.http.org.openroadm.degree.rev181130.degree.node @@ -302,6 +339,19 @@ public class NetworkModelWavelengthServiceImpl implements NetworkModelWavelength .augmentation(TerminationPoint1.class); } + private InstanceIdentifierBuilder createTerminationPoint2IIDBuilder(String nodeId, String tpId) { + return InstanceIdentifier + .builder(Networks.class).child(Network.class, new NetworkKey( + new NetworkId(NetworkUtils.OVERLAY_NETWORK_ID))).child(org.opendaylight.yang.gen.v1.urn.ietf.params.xml + .ns.yang.ietf.network.rev180226.networks.network.Node.class, new NodeKey(new NodeId(nodeId))) + .augmentation(org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226 + .Node1.class).child(org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology + .rev180226.networks.network.node.TerminationPoint.class, new TerminationPointKey(new TpId(tpId))) + .augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130 + .TerminationPoint1.class); + } + private Optional getTerminationPoint1FromDatastore(String nodeId, String tpId) { InstanceIdentifier tpIID = createTerminationPoint1IIDBuilder(nodeId, tpId).build(); Optional tpOpt; @@ -316,14 +366,33 @@ public class NetworkModelWavelengthServiceImpl implements NetworkModelWavelength return tpOpt; } + private Optional getTerminationPoint2FromDatastore(String nodeId, String tpId) { + InstanceIdentifier tpIID = createTerminationPoint2IIDBuilder(nodeId, tpId).build(); + Optional tpOpt; + try (ReadTransaction readTx = this.dataBroker.newReadOnlyTransaction()) { + tpOpt = readTx.read(LogicalDatastoreType.CONFIGURATION, tpIID) + .get(Timeouts.DATASTORE_READ, TimeUnit.MILLISECONDS); + } catch (InterruptedException | ExecutionException | TimeoutException e) { + LOG.warn("Exception while getting termination point from {} topology!", NetworkUtils.OVERLAY_NETWORK_ID, + e); + tpOpt = Optional.empty(); + } + return tpOpt; + } + private void deleteUsedWL(long wavelengthIndex, List tpIds) { WriteTransaction deleteUsedWlTx = this.dataBroker.newWriteOnlyTransaction(); for (NodeIdPair idPair : tpIds) { - Optional tpOpt = getTerminationPoint1FromDatastore(idPair.getNodeID(), idPair.getTpID()); + Optional tp2Opt = getTerminationPoint2FromDatastore(idPair.getNodeID(), idPair.getTpID()); OpenroadmTpType tpType; - if (tpOpt.isPresent()) { - tpType = tpOpt.get().getTpType(); + if (tp2Opt.isPresent()) { + tpType = tp2Opt.get().getTpType(); + // ((org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.TerminationPoint1) + // tpOpt.get()).getTpType(); } else { LOG.error("Unable to get termination point {} from topology {}! Skipping removal of used wavelength" + " for this node.", idPair.getTpID(), NetworkUtils.OVERLAY_NETWORK_ID); @@ -397,24 +466,37 @@ public class NetworkModelWavelengthServiceImpl implements NetworkModelWavelength FixedFlexImpl fixedFlex = new FixedFlexImpl(wavelengthIndex); FrequencyTHz centralTHz = new FrequencyTHz(new BigDecimal(fixedFlex.getCenterFrequency())); for (NodeIdPair idPair : tpIds) { - Optional tpOpt = getTerminationPoint1FromDatastore(idPair.getNodeID(), idPair.getTpID()); - - TerminationPoint1 tp; - if (tpOpt.isPresent()) { - tp = tpOpt.get(); + Optional tp1Opt = + getTerminationPoint1FromDatastore(idPair.getNodeID(), idPair.getTpID()); + TerminationPoint1 tp1 = null; + Optional tp2Opt = getTerminationPoint2FromDatastore(idPair.getNodeID(), idPair.getTpID()); + org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.TerminationPoint1 tp2; + if (tp2Opt.isPresent()) { + tp2 = tp2Opt.get(); } else { LOG.error( - "Unable to get termination point {} from topology {}! Skip removal of used wavelength for the node", - idPair.getTpID(), NetworkUtils.OVERLAY_NETWORK_ID); + "Unable to get common-network termination point {} from topology {}! Skip removal of used" + + "wavelength for the node", idPair.getTpID(), NetworkUtils.OVERLAY_NETWORK_ID); continue; } + TerminationPoint1Builder tp1Builder; + if (tp1Opt.isPresent()) { + tp1 = tp1Opt.get(); + tp1Builder = new TerminationPoint1Builder(tp1); + } else { + tp1Builder = new TerminationPoint1Builder(); + } - TerminationPoint1Builder tp1Builder = new TerminationPoint1Builder(tp); - - switch (tp.getTpType()) { + switch (tp2.getTpType()) { + //switch (((org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.TerminationPoint1) tp) + // .getTpType()) { case DEGREETXTTP: case DEGREETXRXTTP: - TxTtpAttributes txTtpAttributes = tp.getTxTtpAttributes(); + TxTtpAttributes txTtpAttributes = null; + if (tp1 != null) { + txTtpAttributes = tp1.getTxTtpAttributes(); + } TxTtpAttributesBuilder txTtpAttributesBuilder; if (txTtpAttributes == null) { txTtpAttributesBuilder = new TxTtpAttributesBuilder(); @@ -432,7 +514,10 @@ public class NetworkModelWavelengthServiceImpl implements NetworkModelWavelength break; case DEGREERXTTP: - RxTtpAttributes rxTtpAttributes = tp.getRxTtpAttributes(); + RxTtpAttributes rxTtpAttributes = null; + if (tp1 != null) { + rxTtpAttributes = tp1.getRxTtpAttributes(); + } RxTtpAttributesBuilder rxTtpAttributesBuilder; if (rxTtpAttributes == null) { rxTtpAttributesBuilder = new RxTtpAttributesBuilder(); @@ -452,7 +537,10 @@ public class NetworkModelWavelengthServiceImpl implements NetworkModelWavelength case DEGREETXCTP: case DEGREERXCTP: case DEGREETXRXCTP: - CtpAttributes ctpAttributes = tp.getCtpAttributes(); + CtpAttributes ctpAttributes = null; + if (tp1 != null) { + ctpAttributes = tp1.getCtpAttributes(); + } CtpAttributesBuilder ctpAttributesBuilder; if (ctpAttributes == null) { ctpAttributesBuilder = new CtpAttributesBuilder(); @@ -472,7 +560,10 @@ public class NetworkModelWavelengthServiceImpl implements NetworkModelWavelength case SRGTXCP: case SRGRXCP: case SRGTXRXCP: - CpAttributes cpAttributes = tp.getCpAttributes(); + CpAttributes cpAttributes = null; + if (tp1 != null) { + cpAttributes = tp1.getCpAttributes(); + } CpAttributesBuilder cpAttributesBuilder; if (cpAttributes == null) { cpAttributesBuilder = new CpAttributesBuilder(); @@ -496,7 +587,10 @@ public class NetworkModelWavelengthServiceImpl implements NetworkModelWavelength case SRGTXRXPP: case SRGRXPP: case SRGTXPP: - PpAttributes ppAttributes = tp.getPpAttributes(); + PpAttributes ppAttributes = null; + if (tp1 != null) { + ppAttributes = tp1.getPpAttributes(); + } PpAttributesBuilder ppAttributesBuilder; if (ppAttributes == null) { ppAttributesBuilder = new PpAttributesBuilder(); @@ -514,7 +608,10 @@ public class NetworkModelWavelengthServiceImpl implements NetworkModelWavelength break; case XPONDERNETWORK: - XpdrNetworkAttributes xpdrNetworkAttributes = tp.getXpdrNetworkAttributes(); + XpdrNetworkAttributes xpdrNetworkAttributes = null; + if (tp1 != null) { + xpdrNetworkAttributes = tp1.getXpdrNetworkAttributes(); + } XpdrNetworkAttributesBuilder xpdrNetworkAttributesBuilder; if (xpdrNetworkAttributes == null) { xpdrNetworkAttributesBuilder = new XpdrNetworkAttributesBuilder(); @@ -529,7 +626,10 @@ public class NetworkModelWavelengthServiceImpl implements NetworkModelWavelength case XPONDERCLIENT: break; case XPONDERPORT: - XpdrPortAttributes xpdrPortAttributes = tp.getXpdrPortAttributes(); + XpdrPortAttributes xpdrPortAttributes = null; + if (tp1 != null) { + xpdrPortAttributes = tp1.getXpdrPortAttributes(); + } XpdrPortAttributesBuilder xpdrPortAttributesBuilder; if (xpdrPortAttributes == null) { xpdrPortAttributesBuilder = new XpdrPortAttributesBuilder(); diff --git a/renderer/src/test/java/org/opendaylight/transportpce/renderer/NetworkModelWaveLengthServiceFreeTest.java b/renderer/src/test/java/org/opendaylight/transportpce/renderer/NetworkModelWaveLengthServiceFreeTest.java index f11598a2a..6c63508b2 100644 --- a/renderer/src/test/java/org/opendaylight/transportpce/renderer/NetworkModelWaveLengthServiceFreeTest.java +++ b/renderer/src/test/java/org/opendaylight/transportpce/renderer/NetworkModelWaveLengthServiceFreeTest.java @@ -51,21 +51,30 @@ import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev181130.O import org.opendaylight.yang.gen.v1.http.org.openroadm.xponder.rev181130.xpdr.port.connection.attributes.WavelengthBuilder; import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev171017.PathDescription; + @RunWith(Parameterized.class) public class NetworkModelWaveLengthServiceFreeTest extends AbstractTest { - private static final Long WAVE_LENGTH = 20L; private NetworkModelWavelengthService networkModelWavelengthService; private DeviceTransactionManager deviceTransactionManager; private TerminationPoint1 terminationPoint1; + private org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130 + .TerminationPoint1 terminationPoint2; private PathDescription pathDescription; private Node1 node1; + private org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Node1 node2; public NetworkModelWaveLengthServiceFreeTest(PathDescription pathDescription, TerminationPoint1 terminationPoint1, - Node1 node1) { + Node1 node1, + org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.TerminationPoint1 terminationPoint2, + org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Node1 node2) { + this.pathDescription = pathDescription; this.terminationPoint1 = terminationPoint1; + this.terminationPoint2 = terminationPoint2; this.node1 = node1; + this.node2 = node2; + } @Parameterized.Parameters @@ -75,61 +84,91 @@ public class NetworkModelWaveLengthServiceFreeTest extends AbstractTest { PathDescription pathDescription = ServiceDeleteDataUtils.createTransactionPathDescription(StringConstants.TTP_TOKEN); - TerminationPoint1Builder terminationPoint1Builder = new TerminationPoint1Builder(); - terminationPoint1Builder.setCtpAttributes((new CtpAttributesBuilder()).setUsedWavelengths(Collections - .singletonList((new UsedWavelengthsBuilder()).setIndex(WAVE_LENGTH).build())).build()); - terminationPoint1Builder.setCpAttributes((new CpAttributesBuilder()).setUsedWavelengths(Collections - .singletonList((new org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev181130.networks - .network.node.termination.point.cp.attributes.UsedWavelengthsBuilder()) - .setIndex(WAVE_LENGTH).build())).build()); - terminationPoint1Builder.setTxTtpAttributes((new TxTtpAttributesBuilder()).setUsedWavelengths(Collections - .singletonList((new UsedWavelengthsBuilder()).setIndex(WAVE_LENGTH).build())).build()); - terminationPoint1Builder.setRxTtpAttributes((new RxTtpAttributesBuilder()).setUsedWavelengths(Collections - .singletonList((new UsedWavelengthsBuilder()).setIndex(WAVE_LENGTH).build())).build()); - terminationPoint1Builder.setPpAttributes((new PpAttributesBuilder()).setUsedWavelength(Collections - .singletonList((new UsedWavelengthBuilder()).setIndex(WAVE_LENGTH).build())).build()); - FixedFlexImpl fixedFlex = new FixedFlexImpl(); fixedFlex = fixedFlex.getFixedFlexWaveMapping(WAVE_LENGTH); FrequencyGHz frequencyGHz = new FrequencyGHz(new BigDecimal(fixedFlex.getWavelength())); FrequencyTHz frequencyTHz = new FrequencyTHz(new BigDecimal(fixedFlex.getCenterFrequency())); - terminationPoint1Builder.setXpdrClientAttributes((new XpdrClientAttributesBuilder()) - .setWavelength((new WavelengthBuilder()).setFrequency(frequencyTHz).setWidth(frequencyGHz) - .build()).build()); - terminationPoint1Builder.setXpdrNetworkAttributes((new XpdrNetworkAttributesBuilder()) - .setWavelength((new WavelengthBuilder()).setFrequency(frequencyTHz).setWidth(frequencyGHz) - .build()).build()); - terminationPoint1Builder.setXpdrPortAttributes((new XpdrPortAttributesBuilder()) - .setWavelength((new WavelengthBuilder()).setFrequency(frequencyTHz).setWidth(frequencyGHz) - .build()).build()); + TerminationPoint1Builder terminationPoint1Builder = new TerminationPoint1Builder() + .setCtpAttributes((new CtpAttributesBuilder()) + .setUsedWavelengths( + Collections.singletonList((new UsedWavelengthsBuilder()).setIndex(WAVE_LENGTH).build())) + .build()) + .setCpAttributes((new CpAttributesBuilder()) + .setUsedWavelengths( + Collections.singletonList( + (new org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev181130.networks + .network.node.termination.point.cp.attributes.UsedWavelengthsBuilder()) + .setIndex(WAVE_LENGTH) + .build())) + .build()) + .setTxTtpAttributes((new TxTtpAttributesBuilder()) + .setUsedWavelengths( + Collections.singletonList((new UsedWavelengthsBuilder()).setIndex(WAVE_LENGTH).build())) + .build()) + .setRxTtpAttributes((new RxTtpAttributesBuilder()) + .setUsedWavelengths( + Collections.singletonList((new UsedWavelengthsBuilder()).setIndex(WAVE_LENGTH).build())) + .build()) + .setPpAttributes((new PpAttributesBuilder()) + .setUsedWavelength( + Collections.singletonList((new UsedWavelengthBuilder()).setIndex(WAVE_LENGTH).build())) + .build()) + .setXpdrClientAttributes((new XpdrClientAttributesBuilder()) + .setWavelength((new WavelengthBuilder()) + .setFrequency(frequencyTHz) + .setWidth(frequencyGHz) + .build()) + .build()) + .setXpdrNetworkAttributes((new XpdrNetworkAttributesBuilder()) + .setWavelength((new WavelengthBuilder()) + .setFrequency(frequencyTHz) + .setWidth(frequencyGHz) + .build()) + .build()) + .setXpdrPortAttributes((new XpdrPortAttributesBuilder()) + .setWavelength((new WavelengthBuilder()) + .setFrequency(frequencyTHz) + .setWidth(frequencyGHz) + .build()) + .build()); + + Node1Builder node1Builder = new Node1Builder() + .setDegreeAttributes((new DegreeAttributesBuilder()).setAvailableWavelengths(new ArrayList<>()).build()) + .setSrgAttributes((new SrgAttributesBuilder()).setAvailableWavelengths(new ArrayList<>()).build()); - Node1Builder node1Builder = new Node1Builder(); - node1Builder.setDegreeAttributes((new DegreeAttributesBuilder()).setAvailableWavelengths(new ArrayList<>()) - .build()); - node1Builder.setSrgAttributes((new SrgAttributesBuilder()).setAvailableWavelengths(new ArrayList<>()).build()); + org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.TerminationPoint1Builder + terminationPoint2Builder = + new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.TerminationPoint1Builder(); + + org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Node1Builder node2Builder = + new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Node1Builder(); for (OpenroadmNodeType nodeType : Arrays.asList(OpenroadmNodeType.XPONDER, OpenroadmNodeType.DEGREE, OpenroadmNodeType.SRG)) { - node1Builder.setNodeType(nodeType); - terminationPoint1Builder.setTpType(OpenroadmTpType.DEGREETXTTP); - parameters.add(new Object[] { pathDescription, terminationPoint1Builder.build(), node1Builder.build() }); + node2Builder.setNodeType(nodeType); + terminationPoint2Builder.setTpType(OpenroadmTpType.DEGREETXTTP); + parameters.add(new Object[] { pathDescription, terminationPoint1Builder.build(), node1Builder.build(), + terminationPoint2Builder.build(), node2Builder.build() }); } for (OpenroadmTpType tpType : OpenroadmTpType.values()) { - node1Builder.setNodeType(OpenroadmNodeType.DEGREE); + node2Builder.setNodeType(OpenroadmNodeType.DEGREE); node1Builder.setDegreeAttributes(null); - terminationPoint1Builder.setTpType(tpType); - parameters.add(new Object[] { pathDescription, terminationPoint1Builder.build(), node1Builder.build() }); + terminationPoint2Builder.setTpType(tpType); + parameters.add(new Object[] { pathDescription, terminationPoint1Builder.build(), node1Builder.build(), + terminationPoint2Builder.build(), node2Builder.build() }); } - node1Builder.setNodeType(OpenroadmNodeType.SRG); - node1Builder.setDegreeAttributes((new DegreeAttributesBuilder()).setAvailableWavelengths(new ArrayList<>()) - .build()); - node1Builder.setSrgAttributes(null); - terminationPoint1Builder.setTpType(OpenroadmTpType.DEGREETXTTP); - parameters.add(new Object[] { pathDescription, terminationPoint1Builder.build(), node1Builder.build() }); - + node2Builder.setNodeType(OpenroadmNodeType.SRG); + node1Builder + .setDegreeAttributes((new DegreeAttributesBuilder()) + .setAvailableWavelengths(new ArrayList<>()) + .build()) + .setSrgAttributes(null); + terminationPoint2Builder.setTpType(OpenroadmTpType.DEGREETXTTP); + parameters.add(new Object[] { pathDescription, terminationPoint1Builder.build(), node1Builder.build(), + terminationPoint2Builder.build(), node2Builder.build() }); return parameters; } @@ -144,15 +183,28 @@ public class NetworkModelWaveLengthServiceFreeTest extends AbstractTest { public void freeWavelengthsTest() throws ExecutionException, InterruptedException { WaveLengthServiceUtils.putTerminationPoint1ToDatastore("node1" + StringConstants.TTP_TOKEN, StringConstants.TTP_TOKEN, this.terminationPoint1, this.deviceTransactionManager); + WaveLengthServiceUtils.putTerminationPoint2ToDatastore("node1" + StringConstants.TTP_TOKEN, + StringConstants.TTP_TOKEN, this.terminationPoint2, this.deviceTransactionManager); WaveLengthServiceUtils.putNode1ToDatastore("node1" + StringConstants.TTP_TOKEN, this.node1, this.deviceTransactionManager); + WaveLengthServiceUtils.putNode2ToDatastore("node1" + StringConstants.TTP_TOKEN, this.node2, + this.deviceTransactionManager); this.networkModelWavelengthService.freeWavelengths(this.pathDescription); Node1 updatedNode1 = WaveLengthServiceUtils.getNode1FromDatastore("node1" + StringConstants.TTP_TOKEN, this.deviceTransactionManager); + org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Node1 updatedNode2 = + WaveLengthServiceUtils.getNode2FromDatastore("node1" + StringConstants.TTP_TOKEN, + this.deviceTransactionManager); TerminationPoint1 updatedTerminationPoint1 = WaveLengthServiceUtils.getTerminationPoint1FromDatastore("node1" + StringConstants.TTP_TOKEN, StringConstants.TTP_TOKEN, this.deviceTransactionManager); - switch (updatedTerminationPoint1.getTpType()) { + org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130 + .TerminationPoint1 updatedTerminationPoint2 = WaveLengthServiceUtils + .getTerminationPoint2FromDatastore("node1" + StringConstants.TTP_TOKEN, StringConstants.TTP_TOKEN, + this.deviceTransactionManager); + switch (updatedTerminationPoint2.getTpType()) { + //switch (((org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.TerminationPoint1) + // updatedTerminationPoint1).getTpType()) { case DEGREETXRXCTP: case DEGREETXCTP: case DEGREERXCTP: @@ -251,7 +303,9 @@ public class NetworkModelWaveLengthServiceFreeTest extends AbstractTest { Assert.assertNotNull(updatedTerminationPoint1.getXpdrPortAttributes().getWavelength()); break; } - switch (updatedNode1.getNodeType()) { + switch (updatedNode2.getNodeType()) { + //switch (((org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Node1) updatedNode1) + // .getNodeType()) { case DEGREE: Assert.assertEquals(1, updatedNode1.getDegreeAttributes().getAvailableWavelengths().size()); Assert.assertEquals(WAVE_LENGTH, diff --git a/renderer/src/test/java/org/opendaylight/transportpce/renderer/NetworkModelWaveLengthServiceUseTest.java b/renderer/src/test/java/org/opendaylight/transportpce/renderer/NetworkModelWaveLengthServiceUseTest.java index 81cba7eb3..4d4cb3a28 100644 --- a/renderer/src/test/java/org/opendaylight/transportpce/renderer/NetworkModelWaveLengthServiceUseTest.java +++ b/renderer/src/test/java/org/opendaylight/transportpce/renderer/NetworkModelWaveLengthServiceUseTest.java @@ -52,8 +52,10 @@ public class NetworkModelWaveLengthServiceUseTest extends AbstractTest { private DeviceTransactionManager deviceTransactionManager; private TerminationPoint1 terminationPoint1; + private org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.TerminationPoint1 terminatPoint2; private PathDescription pathDescription; private Node1 node1; + private org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Node1 node2; @Before public void setMountPoint() { @@ -63,10 +65,14 @@ public class NetworkModelWaveLengthServiceUseTest extends AbstractTest { } public NetworkModelWaveLengthServiceUseTest(PathDescription pathDescription, TerminationPoint1 terminationPoint1, - Node1 node1) { + Node1 node1, + org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.TerminationPoint1 terminationPoint2, + org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Node1 node2) { this.pathDescription = pathDescription; this.terminationPoint1 = terminationPoint1; + this.terminatPoint2 = terminationPoint2; this.node1 = node1; + this.node2 = node2; } @Parameterized.Parameters @@ -76,40 +82,48 @@ public class NetworkModelWaveLengthServiceUseTest extends AbstractTest { PathDescription pathDescription = ServiceDeleteDataUtils.createTransactionPathDescription(StringConstants.TTP_TOKEN); - TerminationPoint1Builder terminationPoint1Builder = new TerminationPoint1Builder(); - terminationPoint1Builder - .setCtpAttributes((new CtpAttributesBuilder()).setUsedWavelengths(new ArrayList<>()).build()); - terminationPoint1Builder - .setCpAttributes((new CpAttributesBuilder()).setUsedWavelengths(new ArrayList<>()).build()); - terminationPoint1Builder - .setTxTtpAttributes((new TxTtpAttributesBuilder()).setUsedWavelengths(new ArrayList<>()).build()); - terminationPoint1Builder - .setRxTtpAttributes((new RxTtpAttributesBuilder()).setUsedWavelengths(new ArrayList<>()).build()); - terminationPoint1Builder.setPpAttributes((new PpAttributesBuilder()).setUsedWavelength(new ArrayList<>()) - .build()); - terminationPoint1Builder.setXpdrClientAttributes((new XpdrClientAttributesBuilder()).build()); - terminationPoint1Builder.setXpdrNetworkAttributes((new XpdrNetworkAttributesBuilder()).build()); - terminationPoint1Builder.setXpdrPortAttributes((new XpdrPortAttributesBuilder()).build()); - - Node1Builder node1Builder = new Node1Builder(); - node1Builder.setDegreeAttributes((new DegreeAttributesBuilder()) - .setAvailableWavelengths(Collections.singletonList(new AvailableWavelengthsBuilder().setIndex(20L).build())) - .build()); - node1Builder.setSrgAttributes((new SrgAttributesBuilder()).setAvailableWavelengths(Collections.singletonList( - new org.opendaylight.yang.gen.v1.http.org.openroadm.srg.rev181130.srg.node.attributes - .AvailableWavelengthsBuilder().setIndex(20L).build())).build()); + TerminationPoint1Builder terminationPoint1Builder = new TerminationPoint1Builder() + .setCtpAttributes((new CtpAttributesBuilder()).setUsedWavelengths(new ArrayList<>()).build()) + .setCpAttributes((new CpAttributesBuilder()).setUsedWavelengths(new ArrayList<>()).build()) + .setTxTtpAttributes((new TxTtpAttributesBuilder()).setUsedWavelengths(new ArrayList<>()).build()) + .setRxTtpAttributes((new RxTtpAttributesBuilder()).setUsedWavelengths(new ArrayList<>()).build()) + .setPpAttributes((new PpAttributesBuilder()).setUsedWavelength(new ArrayList<>()).build()) + .setXpdrClientAttributes((new XpdrClientAttributesBuilder()).build()) + .setXpdrNetworkAttributes((new XpdrNetworkAttributesBuilder()).build()) + .setXpdrPortAttributes((new XpdrPortAttributesBuilder()).build()); + + Node1Builder node1Builder = new Node1Builder() + .setDegreeAttributes((new DegreeAttributesBuilder()) + .setAvailableWavelengths( + Collections.singletonList(new AvailableWavelengthsBuilder().setIndex(20L).build())) + .build()) + .setSrgAttributes((new SrgAttributesBuilder()) + .setAvailableWavelengths( + Collections.singletonList( + new org.opendaylight.yang.gen.v1.http.org.openroadm.srg.rev181130.srg.node.attributes + .AvailableWavelengthsBuilder().setIndex(20L).build())) + .build()); + + org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.TerminationPoint1Builder + terminationPoint2Builder = + new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.TerminationPoint1Builder(); + + org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Node1Builder node2Builder = + new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Node1Builder(); for (OpenroadmNodeType nodeType : Arrays .asList(OpenroadmNodeType.XPONDER, OpenroadmNodeType.DEGREE, OpenroadmNodeType.SRG)) { - node1Builder.setNodeType(nodeType); - terminationPoint1Builder.setTpType(OpenroadmTpType.DEGREETXTTP); - parameters.add(new Object[] { pathDescription, terminationPoint1Builder.build(), node1Builder.build() }); + node2Builder.setNodeType(nodeType); + terminationPoint2Builder.setTpType(OpenroadmTpType.DEGREETXTTP); + parameters.add(new Object[] { pathDescription, terminationPoint1Builder.build(), node1Builder.build(), + terminationPoint2Builder.build(), node2Builder.build() }); } for (OpenroadmTpType tpType : OpenroadmTpType.values()) { - node1Builder.setNodeType(OpenroadmNodeType.DEGREE); - terminationPoint1Builder.setTpType(tpType); - parameters.add(new Object[] { pathDescription, terminationPoint1Builder.build(), node1Builder.build() }); + node2Builder.setNodeType(OpenroadmNodeType.DEGREE); + terminationPoint2Builder.setTpType(tpType); + parameters.add(new Object[] { pathDescription, terminationPoint1Builder.build(), node1Builder.build(), + terminationPoint2Builder.build(), node2Builder.build() }); } return parameters; @@ -117,19 +131,31 @@ public class NetworkModelWaveLengthServiceUseTest extends AbstractTest { @Test public void freeWavelengthsTest() throws ExecutionException, InterruptedException { - WaveLengthServiceUtils - .putTerminationPoint1ToDatastore("node1" + StringConstants.TTP_TOKEN, StringConstants.TTP_TOKEN, - this.terminationPoint1, this.deviceTransactionManager); + WaveLengthServiceUtils.putTerminationPoint1ToDatastore("node1" + StringConstants.TTP_TOKEN, + StringConstants.TTP_TOKEN, this.terminationPoint1, this.deviceTransactionManager); + WaveLengthServiceUtils.putTerminationPoint2ToDatastore("node1" + StringConstants.TTP_TOKEN, + StringConstants.TTP_TOKEN, this.terminatPoint2, this.deviceTransactionManager); WaveLengthServiceUtils.putNode1ToDatastore("node1" + StringConstants.TTP_TOKEN, this.node1, this.deviceTransactionManager); + WaveLengthServiceUtils.putNode2ToDatastore("node1" + StringConstants.TTP_TOKEN, this.node2, + this.deviceTransactionManager); this.networkModelWavelengthService.useWavelengths(this.pathDescription); Node1 updatedNode1 = WaveLengthServiceUtils.getNode1FromDatastore("node1" + StringConstants.TTP_TOKEN, this.deviceTransactionManager); + org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Node1 updatedNode2 = + WaveLengthServiceUtils.getNode2FromDatastore("node1" + StringConstants.TTP_TOKEN, + this.deviceTransactionManager); TerminationPoint1 updatedTerminationPoint1 = WaveLengthServiceUtils .getTerminationPoint1FromDatastore("node1" + StringConstants.TTP_TOKEN, StringConstants.TTP_TOKEN, this.deviceTransactionManager); + org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130 + .TerminationPoint1 updatedTerminationPoint2 = WaveLengthServiceUtils + .getTerminationPoint2FromDatastore("node1" + StringConstants.TTP_TOKEN, StringConstants.TTP_TOKEN, + this.deviceTransactionManager); - switch (updatedTerminationPoint1.getTpType()) { + switch (updatedTerminationPoint2.getTpType()) { + //switch (((org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.TerminationPoint1) + // updatedTerminationPoint1).getTpType()) { case DEGREETXRXCTP: case DEGREETXCTP: case DEGREERXCTP: @@ -228,7 +254,9 @@ public class NetworkModelWaveLengthServiceUseTest extends AbstractTest { Assert.assertNull(updatedTerminationPoint1.getXpdrPortAttributes().getWavelength()); break; } - switch (updatedNode1.getNodeType()) { + switch (updatedNode2.getNodeType()) { + //switch (((org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Node1) updatedNode1) + // .getNodeType()) { case DEGREE: Assert.assertNull(updatedNode1.getDegreeAttributes()); Assert.assertFalse(updatedNode1.getSrgAttributes().getAvailableWavelengths().isEmpty()); diff --git a/renderer/src/test/java/org/opendaylight/transportpce/renderer/utils/WaveLengthServiceUtils.java b/renderer/src/test/java/org/opendaylight/transportpce/renderer/utils/WaveLengthServiceUtils.java index fbeefe7c1..1750d4e0d 100644 --- a/renderer/src/test/java/org/opendaylight/transportpce/renderer/utils/WaveLengthServiceUtils.java +++ b/renderer/src/test/java/org/opendaylight/transportpce/renderer/utils/WaveLengthServiceUtils.java @@ -31,8 +31,8 @@ public final class WaveLengthServiceUtils { } - private static InstanceIdentifierBuilder createTerminationPoint1IIDBuilder(String nodeId, - String tpId) { + private static InstanceIdentifierBuilder createTerminationPoint1IIDBuilder( + String nodeId, String tpId) { return InstanceIdentifier .builder(Networks.class).child(Network.class, new NetworkKey(new NetworkId(NetworkUtils.OVERLAY_NETWORK_ID))) @@ -47,22 +47,60 @@ public final class WaveLengthServiceUtils { .augmentation(TerminationPoint1.class); } + private static InstanceIdentifierBuilder createTerminationPoint2IIDBuilder( + String nodeId, String tpId) { + return InstanceIdentifier + .builder(Networks.class).child(Network.class, + new NetworkKey(new NetworkId(NetworkUtils.OVERLAY_NETWORK_ID))) + .child( + org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.networks.network + .Node.class, new NodeKey(new NodeId(nodeId))) + .augmentation( + org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.Node1.class) + .child( + org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks + .network.node.TerminationPoint.class, new TerminationPointKey(new TpId(tpId))) + .augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130 + .TerminationPoint1.class); + } + public static void putTerminationPoint1ToDatastore(String nodeId, String tpId, TerminationPoint1 terminationPoint1, - DeviceTransactionManager deviceTransactionManager) - throws ExecutionException, InterruptedException { + DeviceTransactionManager deviceTransactionManager) + throws ExecutionException, InterruptedException { TransactionUtils .writeTransaction(deviceTransactionManager, nodeId, LogicalDatastoreType.CONFIGURATION, createTerminationPoint1IIDBuilder(nodeId, tpId).build(), terminationPoint1); } + public static void putTerminationPoint2ToDatastore(String nodeId, String tpId, + org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.TerminationPoint1 + terminationPoint1, DeviceTransactionManager deviceTransactionManager) + throws ExecutionException, InterruptedException { + TransactionUtils + .writeTransaction(deviceTransactionManager, nodeId, LogicalDatastoreType.CONFIGURATION, + createTerminationPoint2IIDBuilder(nodeId, tpId).build(), terminationPoint1); + } + public static TerminationPoint1 getTerminationPoint1FromDatastore(String nodeId, String tpId, - DeviceTransactionManager deviceTransactionManager) - throws ExecutionException, InterruptedException { + DeviceTransactionManager deviceTransactionManager) + throws ExecutionException, InterruptedException { InstanceIdentifier tpIID = createTerminationPoint1IIDBuilder(nodeId, tpId).build(); return (TerminationPoint1) TransactionUtils .readTransaction(deviceTransactionManager, nodeId, LogicalDatastoreType.CONFIGURATION, tpIID); } + public static org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130 + .TerminationPoint1 getTerminationPoint2FromDatastore(String nodeId, String tpId, + DeviceTransactionManager deviceTransactionManager) + throws ExecutionException, InterruptedException { + InstanceIdentifier + tpIID = createTerminationPoint2IIDBuilder(nodeId, tpId).build(); + return (org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.TerminationPoint1) + TransactionUtils + .readTransaction(deviceTransactionManager, nodeId, LogicalDatastoreType.CONFIGURATION, tpIID); + } + private static InstanceIdentifier createNode1IID(String nodeId) { return InstanceIdentifier .builder(Networks.class) @@ -74,6 +112,18 @@ public final class WaveLengthServiceUtils { .build(); } + private static InstanceIdentifier createNode2IID(String nodeId) { + return InstanceIdentifier + .builder(Networks.class) + .child(Network.class, new NetworkKey(new NetworkId(NetworkUtils.OVERLAY_NETWORK_ID))) + .child( + org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.networks.network + .Node.class, new NodeKey(new NodeId(nodeId))) + .augmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Node1.class) + .build(); + } + public static void putNode1ToDatastore(String nodeId, Node1 node1, DeviceTransactionManager deviceTransactionManager) throws ExecutionException, InterruptedException { @@ -83,10 +133,30 @@ public final class WaveLengthServiceUtils { LogicalDatastoreType.CONFIGURATION, nodeIID, node1); } + public static void putNode2ToDatastore(String nodeId, + org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Node1 node1, + DeviceTransactionManager deviceTransactionManager) + throws ExecutionException, InterruptedException { + InstanceIdentifier nodeIID = + createNode2IID(nodeId); + TransactionUtils + .writeTransaction(deviceTransactionManager, nodeId, + LogicalDatastoreType.CONFIGURATION, nodeIID, node1); + } + public static Node1 getNode1FromDatastore(String nodeId, DeviceTransactionManager deviceTransactionManager) - throws ExecutionException, InterruptedException { + throws ExecutionException, InterruptedException { InstanceIdentifier nodeIID = createNode1IID(nodeId); return (Node1) TransactionUtils .readTransaction(deviceTransactionManager, nodeId, LogicalDatastoreType.CONFIGURATION, nodeIID); } + + public static org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130 + .Node1 getNode2FromDatastore(String nodeId, DeviceTransactionManager deviceTransactionManager) + throws ExecutionException, InterruptedException { + InstanceIdentifier nodeIID = createNode2IID(nodeId); + return (org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Node1) TransactionUtils + .readTransaction(deviceTransactionManager, nodeId, LogicalDatastoreType.CONFIGURATION, nodeIID); + } } diff --git a/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/ConvertORTopoObjectToTapiTopoObject.java b/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/ConvertORTopoObjectToTapiTopoObject.java index 3174b2a42..39421923d 100644 --- a/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/ConvertORTopoObjectToTapiTopoObject.java +++ b/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/ConvertORTopoObjectToTapiTopoObject.java @@ -16,13 +16,13 @@ import java.util.Map; import java.util.UUID; import java.util.stream.Collectors; +import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.TerminationPoint1; import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.types.rev181130.xpdr.odu.switching.pools.OduSwitchingPools; import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.types.rev181130.xpdr.odu.switching.pools.odu.switching.pools.NonBlockingList; import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev181130.OpenroadmTpType; import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev181130.xpdr.tp.supported.interfaces.SupportedInterfaceCapability; import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev181130.Link1; import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev181130.Node1; -import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev181130.TerminationPoint1; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.networks.network.Node; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.TpId; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev180226.networks.network.node.TerminationPoint; diff --git a/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/TapiTopologyImpl.java b/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/TapiTopologyImpl.java index 32953a2bc..6bd0c28b5 100644 --- a/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/TapiTopologyImpl.java +++ b/tapi/src/main/java/org/opendaylight/transportpce/tapi/topology/TapiTopologyImpl.java @@ -31,8 +31,8 @@ import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmappi import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.NodesKey; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.Mapping; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.MappingKey; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev181130.Link1; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev181130.TerminationPoint1; +import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Link1; +import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.TerminationPoint1; import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev181130.OpenroadmLinkType; import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev181130.OpenroadmNodeType; import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev181130.OpenroadmTpType; @@ -138,7 +138,7 @@ public class TapiTopologyImpl implements TapiTopologyService { .equals(OpenroadmLinkType.XPONDERINPUT)).collect(Collectors.toList()); List xpdrNodeList = nodeList.stream().filter(nt -> nt.augmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev181130.Node1.class).getNodeType() + org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Node1.class).getNodeType() .equals(OpenroadmNodeType.XPONDER)).collect(Collectors.toList()); Map> clientPortMap = new HashMap<>(); for (Node node : xpdrNodeList) { @@ -194,9 +194,9 @@ public class TapiTopologyImpl implements TapiTopologyService { } List nodeList = otnTopo.getNode(); List otnNodeList = nodeList.stream().filter(nt -> nt.augmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev181130.Node1.class) + org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Node1.class) .getNodeType().equals(OpenroadmNodeType.SWITCH) || nt.augmentation( - org.opendaylight.yang.gen.v1.http.org.openroadm.otn.network.topology.rev181130.Node1.class) + org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Node1.class) .getNodeType().equals(OpenroadmNodeType.MUXPDR)).collect(Collectors.toList()); List tapiNodeList = new ArrayList<>(); diff --git a/tests/sample_configs/NW-for-test-5-4.xml b/tests/sample_configs/NW-for-test-5-4.xml index 62185064f..67d90913e 100644 --- a/tests/sample_configs/NW-for-test-5-4.xml +++ b/tests/sample_configs/NW-for-test-5-4.xml @@ -1,11 +1,11 @@ openroadm-topology OpenROADM-1-1-DEG1 - DEGREE - DEG1-CTP-TX DEGREE-TX-CTP - DEG1-CTP-RX DEGREE-RX-CTP - DEG1-TTP-RX DEGREE-RX-TTP - DEG1-TTP-TX DEGREE-TX-TTP + DEGREE + DEG1-CTP-TX DEGREE-TX-CTP + DEG1-CTP-RX DEGREE-RX-CTP + DEG1-TTP-RX DEGREE-RX-TTP + DEG1-TTP-TX DEGREE-TX-TTP 1 2 @@ -20,11 +20,11 @@ Transport-underlayOpenROADM-1-1 OpenROADM-1-1-DEG2 - DEGREE - DEG2-CTP-TX DEGREE-TX-CTP - DEG2-CTP-RX DEGREE-RX-CTP - DEG2-TTP-RX DEGREE-RX-TTP - DEG2-TTP-TX DEGREE-TX-TTP + DEGREE + DEG2-CTP-TX DEGREE-TX-CTP + DEG2-CTP-RX DEGREE-RX-CTP + DEG2-TTP-RX DEGREE-RX-TTP + DEG2-TTP-TX DEGREE-TX-TTP 1 2 @@ -39,11 +39,11 @@ Transport-underlayOpenROADM-1-1 OpenROADM-1-1-DEG3 - DEGREE - DEG3-CTP-TX DEGREE-TX-CTP - DEG3-CTP-RX DEGREE-RX-CTP - DEG3-TTP-RX DEGREE-RX-TTP - DEG3-TTP-TX DEGREE-TX-TTP + DEGREE + DEG3-CTP-TX DEGREE-TX-CTP + DEG3-CTP-RX DEGREE-RX-CTP + DEG3-TTP-RX DEGREE-RX-TTP + DEG3-TTP-TX DEGREE-TX-TTP 1 2 @@ -57,7 +57,7 @@ 10 Transport-underlayOpenROADM-1-1 - OpenROADM-1-1-SRG1 SRG + OpenROADM-1-1-SRG1 SRG Transport-underlayOpenROADM-1-1 1 @@ -84,38 +84,38 @@ XPONDER-1-1 Transport-underlayXPONDER-1-1 - XPONDER - XPDR-NW1-RX XPONDER-NETWORK + XPONDER + XPDR-NW1-RX XPONDER-NETWORK Client-1 - XPDR-NW1-TX XPONDER-NETWORK + XPDR-NW1-TX XPONDER-NETWORK Client-1 - XPDR-NW2-RX XPONDER-NETWORK + XPDR-NW2-RX XPONDER-NETWORK Client-2 - XPDR-NW2-TX XPONDER-NETWORK + XPDR-NW2-TX XPONDER-NETWORK Client-2 - XPDR-NW3-RX XPONDER-NETWORK + XPDR-NW3-RX XPONDER-NETWORK Client-3 - XPDR-NW3-TX XPONDER-NETWORK + XPDR-NW3-TX XPONDER-NETWORK Client-3 - XPDR-NW4-RX XPONDER-NETWORK + XPDR-NW4-RX XPONDER-NETWORK Client-4 - XPDR-NW4-TX XPONDER-NETWORK + XPDR-NW4-TX XPONDER-NETWORK Client-4 OpenROADM-1-2-DEG1 - DEGREE - DEG1-CTP-TX DEGREE-TX-CTP - DEG1-CTP-RX DEGREE-RX-CTP - DEG1-TTP-RX DEGREE-RX-TTP - DEG1-TTP-TX DEGREE-TX-TTP + DEGREE + DEG1-CTP-TX DEGREE-TX-CTP + DEG1-CTP-RX DEGREE-RX-CTP + DEG1-TTP-RX DEGREE-RX-TTP + DEG1-TTP-TX DEGREE-TX-TTP 1 2 @@ -130,11 +130,11 @@ Transport-underlayOpenROADM-1-2 OpenROADM-1-2-DEG2 - DEGREE - DEG2-CTP-TX DEGREE-TX-CTP - DEG2-CTP-RX DEGREE-RX-CTP - DEG2-TTP-RX DEGREE-RX-TTP - DEG2-TTP-TX DEGREE-TX-TTP + DEGREE + DEG2-CTP-TX DEGREE-TX-CTP + DEG2-CTP-RX DEGREE-RX-CTP + DEG2-TTP-RX DEGREE-RX-TTP + DEG2-TTP-TX DEGREE-TX-TTP 1 2 @@ -149,11 +149,11 @@ Transport-underlayOpenROADM-1-2 OpenROADM-1-2-DEG3 - DEGREE - DEG3-CTP-TX DEGREE-TX-CTP - DEG3-CTP-RX DEGREE-RX-CTP - DEG3-TTP-RX DEGREE-RX-TTP - DEG3-TTP-TX DEGREE-TX-TTP + DEGREE + DEG3-CTP-TX DEGREE-TX-CTP + DEG3-CTP-RX DEGREE-RX-CTP + DEG3-TTP-RX DEGREE-RX-TTP + DEG3-TTP-TX DEGREE-TX-TTP 1 2 @@ -167,7 +167,7 @@ 10 Transport-underlayOpenROADM-1-2 - OpenROADM-1-2-SRG1 SRG + OpenROADM-1-2-SRG1 SRG Transport-underlayOpenROADM-1-2 1 @@ -194,38 +194,38 @@ XPONDER-1-2 Transport-underlayXPONDER-1-2 - XPONDER - XPDR-NW1-RX XPONDER-NETWORK + XPONDER + XPDR-NW1-RX XPONDER-NETWORK Client-1 - XPDR-NW1-TX XPONDER-NETWORK + XPDR-NW1-TX XPONDER-NETWORK Client-1 - XPDR-NW2-RX XPONDER-NETWORK + XPDR-NW2-RX XPONDER-NETWORK Client-2 - XPDR-NW2-TX XPONDER-NETWORK + XPDR-NW2-TX XPONDER-NETWORK Client-2 - XPDR-NW3-RX XPONDER-NETWORK + XPDR-NW3-RX XPONDER-NETWORK Client-3 - XPDR-NW3-TX XPONDER-NETWORK + XPDR-NW3-TX XPONDER-NETWORK Client-3 - XPDR-NW4-RX XPONDER-NETWORK + XPDR-NW4-RX XPONDER-NETWORK Client-4 - XPDR-NW4-TX XPONDER-NETWORK + XPDR-NW4-TX XPONDER-NETWORK Client-4 OpenROADM-1-3-DEG1 - DEGREE - DEG1-CTP-TX DEGREE-TX-CTP - DEG1-CTP-RX DEGREE-RX-CTP - DEG1-TTP-RX DEGREE-RX-TTP - DEG1-TTP-TX DEGREE-TX-TTP + DEGREE + DEG1-CTP-TX DEGREE-TX-CTP + DEG1-CTP-RX DEGREE-RX-CTP + DEG1-TTP-RX DEGREE-RX-TTP + DEG1-TTP-TX DEGREE-TX-TTP 1 2 @@ -240,11 +240,11 @@ Transport-underlayOpenROADM-1-3 OpenROADM-1-3-DEG2 - DEGREE - DEG2-CTP-TX DEGREE-TX-CTP - DEG2-CTP-RX DEGREE-RX-CTP - DEG2-TTP-RX DEGREE-RX-TTP - DEG2-TTP-TX DEGREE-TX-TTP + DEGREE + DEG2-CTP-TX DEGREE-TX-CTP + DEG2-CTP-RX DEGREE-RX-CTP + DEG2-TTP-RX DEGREE-RX-TTP + DEG2-TTP-TX DEGREE-TX-TTP 1 2 @@ -259,11 +259,11 @@ Transport-underlayOpenROADM-1-3 OpenROADM-1-3-DEG3 - DEGREE - DEG3-CTP-TX DEGREE-TX-CTP - DEG3-CTP-RX DEGREE-RX-CTP - DEG3-TTP-RX DEGREE-RX-TTP - DEG3-TTP-TX DEGREE-TX-TTP + DEGREE + DEG3-CTP-TX DEGREE-TX-CTP + DEG3-CTP-RX DEGREE-RX-CTP + DEG3-TTP-RX DEGREE-RX-TTP + DEG3-TTP-TX DEGREE-TX-TTP 1 2 @@ -277,7 +277,7 @@ 10 Transport-underlayOpenROADM-1-3 - OpenROADM-1-3-SRG1 SRG + OpenROADM-1-3-SRG1 SRG Transport-underlayOpenROADM-1-3 1 @@ -304,38 +304,38 @@ XPONDER-1-3 Transport-underlayXPONDER-1-3 - XPONDER - XPDR-NW1-RX XPONDER-NETWORK + XPONDER + XPDR-NW1-RX XPONDER-NETWORK Client-1 - XPDR-NW1-TX XPONDER-NETWORK + XPDR-NW1-TX XPONDER-NETWORK Client-1 - XPDR-NW2-RX XPONDER-NETWORK + XPDR-NW2-RX XPONDER-NETWORK Client-2 - XPDR-NW2-TX XPONDER-NETWORK + XPDR-NW2-TX XPONDER-NETWORK Client-2 - XPDR-NW3-RX XPONDER-NETWORK + XPDR-NW3-RX XPONDER-NETWORK Client-3 - XPDR-NW3-TX XPONDER-NETWORK + XPDR-NW3-TX XPONDER-NETWORK Client-3 - XPDR-NW4-RX XPONDER-NETWORK + XPDR-NW4-RX XPONDER-NETWORK Client-4 - XPDR-NW4-TX XPONDER-NETWORK + XPDR-NW4-TX XPONDER-NETWORK Client-4 OpenROADM-1-4-DEG1 - DEGREE - DEG1-CTP-TX DEGREE-TX-CTP - DEG1-CTP-RX DEGREE-RX-CTP - DEG1-TTP-RX DEGREE-RX-TTP - DEG1-TTP-TX DEGREE-TX-TTP + DEGREE + DEG1-CTP-TX DEGREE-TX-CTP + DEG1-CTP-RX DEGREE-RX-CTP + DEG1-TTP-RX DEGREE-RX-TTP + DEG1-TTP-TX DEGREE-TX-TTP 1 2 @@ -350,11 +350,11 @@ Transport-underlayOpenROADM-1-4 OpenROADM-1-4-DEG2 - DEGREE - DEG2-CTP-TX DEGREE-TX-CTP - DEG2-CTP-RX DEGREE-RX-CTP - DEG2-TTP-RX DEGREE-RX-TTP - DEG2-TTP-TX DEGREE-TX-TTP + DEGREE + DEG2-CTP-TX DEGREE-TX-CTP + DEG2-CTP-RX DEGREE-RX-CTP + DEG2-TTP-RX DEGREE-RX-TTP + DEG2-TTP-TX DEGREE-TX-TTP 1 2 @@ -369,11 +369,11 @@ Transport-underlayOpenROADM-1-4 OpenROADM-1-4-DEG3 - DEGREE - DEG3-CTP-TX DEGREE-TX-CTP - DEG3-CTP-RX DEGREE-RX-CTP - DEG3-TTP-RX DEGREE-RX-TTP - DEG3-TTP-TX DEGREE-TX-TTP + DEGREE + DEG3-CTP-TX DEGREE-TX-CTP + DEG3-CTP-RX DEGREE-RX-CTP + DEG3-TTP-RX DEGREE-RX-TTP + DEG3-TTP-TX DEGREE-TX-TTP 1 2 @@ -387,7 +387,7 @@ 10 Transport-underlayOpenROADM-1-4 - OpenROADM-1-4-SRG1 SRG + OpenROADM-1-4-SRG1 SRG Transport-underlayOpenROADM-1-4 1 @@ -414,38 +414,38 @@ XPONDER-1-4 Transport-underlayXPONDER-1-4 - XPONDER - XPDR-NW1-RX XPONDER-NETWORK + XPONDER + XPDR-NW1-RX XPONDER-NETWORK Client-1 - XPDR-NW1-TX XPONDER-NETWORK + XPDR-NW1-TX XPONDER-NETWORK Client-1 - XPDR-NW2-RX XPONDER-NETWORK + XPDR-NW2-RX XPONDER-NETWORK Client-2 - XPDR-NW2-TX XPONDER-NETWORK + XPDR-NW2-TX XPONDER-NETWORK Client-2 - XPDR-NW3-RX XPONDER-NETWORK + XPDR-NW3-RX XPONDER-NETWORK Client-3 - XPDR-NW3-TX XPONDER-NETWORK + XPDR-NW3-TX XPONDER-NETWORK Client-3 - XPDR-NW4-RX XPONDER-NETWORK + XPDR-NW4-RX XPONDER-NETWORK Client-4 - XPDR-NW4-TX XPONDER-NETWORK + XPDR-NW4-TX XPONDER-NETWORK Client-4 OpenROADM-2-1-DEG1 - DEGREE - DEG1-CTP-TX DEGREE-TX-CTP - DEG1-CTP-RX DEGREE-RX-CTP - DEG1-TTP-RX DEGREE-RX-TTP - DEG1-TTP-TX DEGREE-TX-TTP + DEGREE + DEG1-CTP-TX DEGREE-TX-CTP + DEG1-CTP-RX DEGREE-RX-CTP + DEG1-TTP-RX DEGREE-RX-TTP + DEG1-TTP-TX DEGREE-TX-TTP 2 3 @@ -454,11 +454,11 @@ Transport-underlayOpenROADM-2-1 OpenROADM-2-1-DEG2 - DEGREE - DEG2-CTP-TX DEGREE-TX-CTP - DEG2-CTP-RX DEGREE-RX-CTP - DEG2-TTP-RX DEGREE-RX-TTP - DEG2-TTP-TX DEGREE-TX-TTP + DEGREE + DEG2-CTP-TX DEGREE-TX-CTP + DEG2-CTP-RX DEGREE-RX-CTP + DEG2-TTP-RX DEGREE-RX-TTP + DEG2-TTP-TX DEGREE-TX-TTP 2 3 @@ -467,11 +467,11 @@ Transport-underlayOpenROADM-2-1 OpenROADM-2-1-DEG3 - DEGREE - DEG3-CTP-TX DEGREE-TX-CTP - DEG3-CTP-RX DEGREE-RX-CTP - DEG3-TTP-RX DEGREE-RX-TTP - DEG3-TTP-TX DEGREE-TX-TTP + DEGREE + DEG3-CTP-TX DEGREE-TX-CTP + DEG3-CTP-RX DEGREE-RX-CTP + DEG3-TTP-RX DEGREE-RX-TTP + DEG3-TTP-TX DEGREE-TX-TTP 2 3 @@ -479,7 +479,7 @@ 5 Transport-underlayOpenROADM-2-1 - OpenROADM-2-1-SRG1 SRG + OpenROADM-2-1-SRG1 SRG Transport-underlayOpenROADM-2-1 2 @@ -500,38 +500,38 @@ XPONDER-2-1 Transport-underlayXPONDER-2-1 - XPONDER - XPDR-NW1-RX XPONDER-NETWORK + XPONDER + XPDR-NW1-RX XPONDER-NETWORK Client-1 - XPDR-NW1-TX XPONDER-NETWORK + XPDR-NW1-TX XPONDER-NETWORK Client-1 - XPDR-NW2-RX XPONDER-NETWORK + XPDR-NW2-RX XPONDER-NETWORK Client-2 - XPDR-NW2-TX XPONDER-NETWORK + XPDR-NW2-TX XPONDER-NETWORK Client-2 - XPDR-NW3-RX XPONDER-NETWORK + XPDR-NW3-RX XPONDER-NETWORK Client-3 - XPDR-NW3-TX XPONDER-NETWORK + XPDR-NW3-TX XPONDER-NETWORK Client-3 - XPDR-NW4-RX XPONDER-NETWORK + XPDR-NW4-RX XPONDER-NETWORK Client-4 - XPDR-NW4-TX XPONDER-NETWORK + XPDR-NW4-TX XPONDER-NETWORK Client-4 OpenROADM-2-2-DEG1 - DEGREE - DEG1-CTP-TX DEGREE-TX-CTP - DEG1-CTP-RX DEGREE-RX-CTP - DEG1-TTP-RX DEGREE-RX-TTP - DEG1-TTP-TX DEGREE-TX-TTP + DEGREE + DEG1-CTP-TX DEGREE-TX-CTP + DEG1-CTP-RX DEGREE-RX-CTP + DEG1-TTP-RX DEGREE-RX-TTP + DEG1-TTP-TX DEGREE-TX-TTP 2 3 @@ -540,11 +540,11 @@ Transport-underlayOpenROADM-2-2 OpenROADM-2-2-DEG2 - DEGREE - DEG2-CTP-TX DEGREE-TX-CTP - DEG2-CTP-RX DEGREE-RX-CTP - DEG2-TTP-RX DEGREE-RX-TTP - DEG2-TTP-TX DEGREE-TX-TTP + DEGREE + DEG2-CTP-TX DEGREE-TX-CTP + DEG2-CTP-RX DEGREE-RX-CTP + DEG2-TTP-RX DEGREE-RX-TTP + DEG2-TTP-TX DEGREE-TX-TTP 2 3 @@ -553,11 +553,11 @@ Transport-underlayOpenROADM-2-2 OpenROADM-2-2-DEG3 - DEGREE - DEG3-CTP-TX DEGREE-TX-CTP - DEG3-CTP-RX DEGREE-RX-CTP - DEG3-TTP-RX DEGREE-RX-TTP - DEG3-TTP-TX DEGREE-TX-TTP + DEGREE + DEG3-CTP-TX DEGREE-TX-CTP + DEG3-CTP-RX DEGREE-RX-CTP + DEG3-TTP-RX DEGREE-RX-TTP + DEG3-TTP-TX DEGREE-TX-TTP 2 3 @@ -565,7 +565,7 @@ 5 Transport-underlayOpenROADM-2-2 - OpenROADM-2-2-SRG1 SRG + OpenROADM-2-2-SRG1 SRG Transport-underlayOpenROADM-2-2 2 @@ -586,38 +586,38 @@ XPONDER-2-2 Transport-underlayXPONDER-2-2 - XPONDER - XPDR-NW1-RX XPONDER-NETWORK + XPONDER + XPDR-NW1-RX XPONDER-NETWORK Client-1 - XPDR-NW1-TX XPONDER-NETWORK + XPDR-NW1-TX XPONDER-NETWORK Client-1 - XPDR-NW2-RX XPONDER-NETWORK + XPDR-NW2-RX XPONDER-NETWORK Client-2 - XPDR-NW2-TX XPONDER-NETWORK + XPDR-NW2-TX XPONDER-NETWORK Client-2 - XPDR-NW3-RX XPONDER-NETWORK + XPDR-NW3-RX XPONDER-NETWORK Client-3 - XPDR-NW3-TX XPONDER-NETWORK + XPDR-NW3-TX XPONDER-NETWORK Client-3 - XPDR-NW4-RX XPONDER-NETWORK + XPDR-NW4-RX XPONDER-NETWORK Client-4 - XPDR-NW4-TX XPONDER-NETWORK + XPDR-NW4-TX XPONDER-NETWORK Client-4 OpenROADM-2-3-DEG1 - DEGREE - DEG1-CTP-TX DEGREE-TX-CTP - DEG1-CTP-RX DEGREE-RX-CTP - DEG1-TTP-RX DEGREE-RX-TTP - DEG1-TTP-TX DEGREE-TX-TTP + DEGREE + DEG1-CTP-TX DEGREE-TX-CTP + DEG1-CTP-RX DEGREE-RX-CTP + DEG1-TTP-RX DEGREE-RX-TTP + DEG1-TTP-TX DEGREE-TX-TTP 2 3 @@ -626,11 +626,11 @@ Transport-underlayOpenROADM-2-3 OpenROADM-2-3-DEG2 - DEGREE - DEG2-CTP-TX DEGREE-TX-CTP - DEG2-CTP-RX DEGREE-RX-CTP - DEG2-TTP-RX DEGREE-RX-TTP - DEG2-TTP-TX DEGREE-TX-TTP + DEGREE + DEG2-CTP-TX DEGREE-TX-CTP + DEG2-CTP-RX DEGREE-RX-CTP + DEG2-TTP-RX DEGREE-RX-TTP + DEG2-TTP-TX DEGREE-TX-TTP 2 3 @@ -639,11 +639,11 @@ Transport-underlayOpenROADM-2-3 OpenROADM-2-3-DEG3 - DEGREE - DEG3-CTP-TX DEGREE-TX-CTP - DEG3-CTP-RX DEGREE-RX-CTP - DEG3-TTP-RX DEGREE-RX-TTP - DEG3-TTP-TX DEGREE-TX-TTP + DEGREE + DEG3-CTP-TX DEGREE-TX-CTP + DEG3-CTP-RX DEGREE-RX-CTP + DEG3-TTP-RX DEGREE-RX-TTP + DEG3-TTP-TX DEGREE-TX-TTP 2 3 @@ -651,7 +651,7 @@ 5 Transport-underlayOpenROADM-2-3 - OpenROADM-2-3-SRG1 SRG + OpenROADM-2-3-SRG1 SRG Transport-underlayOpenROADM-2-3 2 @@ -672,38 +672,38 @@ XPONDER-2-3 Transport-underlayXPONDER-2-3 - XPONDER - XPDR-NW1-RX XPONDER-NETWORK + XPONDER + XPDR-NW1-RX XPONDER-NETWORK Client-1 - XPDR-NW1-TX XPONDER-NETWORK + XPDR-NW1-TX XPONDER-NETWORK Client-1 - XPDR-NW2-RX XPONDER-NETWORK + XPDR-NW2-RX XPONDER-NETWORK Client-2 - XPDR-NW2-TX XPONDER-NETWORK + XPDR-NW2-TX XPONDER-NETWORK Client-2 - XPDR-NW3-RX XPONDER-NETWORK + XPDR-NW3-RX XPONDER-NETWORK Client-3 - XPDR-NW3-TX XPONDER-NETWORK + XPDR-NW3-TX XPONDER-NETWORK Client-3 - XPDR-NW4-RX XPONDER-NETWORK + XPDR-NW4-RX XPONDER-NETWORK Client-4 - XPDR-NW4-TX XPONDER-NETWORK + XPDR-NW4-TX XPONDER-NETWORK Client-4 OpenROADM-2-4-DEG1 - DEGREE - DEG1-CTP-TX DEGREE-TX-CTP - DEG1-CTP-RX DEGREE-RX-CTP - DEG1-TTP-RX DEGREE-RX-TTP - DEG1-TTP-TX DEGREE-TX-TTP + DEGREE + DEG1-CTP-TX DEGREE-TX-CTP + DEG1-CTP-RX DEGREE-RX-CTP + DEG1-TTP-RX DEGREE-RX-TTP + DEG1-TTP-TX DEGREE-TX-TTP 2 3 @@ -712,11 +712,11 @@ Transport-underlayOpenROADM-2-4 OpenROADM-2-4-DEG2 - DEGREE - DEG2-CTP-TX DEGREE-TX-CTP - DEG2-CTP-RX DEGREE-RX-CTP - DEG2-TTP-RX DEGREE-RX-TTP - DEG2-TTP-TX DEGREE-TX-TTP + DEGREE + DEG2-CTP-TX DEGREE-TX-CTP + DEG2-CTP-RX DEGREE-RX-CTP + DEG2-TTP-RX DEGREE-RX-TTP + DEG2-TTP-TX DEGREE-TX-TTP 2 3 @@ -725,11 +725,11 @@ Transport-underlayOpenROADM-2-4 OpenROADM-2-4-DEG3 - DEGREE - DEG3-CTP-TX DEGREE-TX-CTP - DEG3-CTP-RX DEGREE-RX-CTP - DEG3-TTP-RX DEGREE-RX-TTP - DEG3-TTP-TX DEGREE-TX-TTP + DEGREE + DEG3-CTP-TX DEGREE-TX-CTP + DEG3-CTP-RX DEGREE-RX-CTP + DEG3-TTP-RX DEGREE-RX-TTP + DEG3-TTP-TX DEGREE-TX-TTP 2 3 @@ -737,7 +737,7 @@ 5 Transport-underlayOpenROADM-2-4 - OpenROADM-2-4-SRG1 SRG + OpenROADM-2-4-SRG1 SRG Transport-underlayOpenROADM-2-4 2 @@ -758,38 +758,38 @@ XPONDER-2-4 Transport-underlayXPONDER-2-4 - XPONDER - XPDR-NW1-RX XPONDER-NETWORK + XPONDER + XPDR-NW1-RX XPONDER-NETWORK Client-1 - XPDR-NW1-TX XPONDER-NETWORK + XPDR-NW1-TX XPONDER-NETWORK Client-1 - XPDR-NW2-RX XPONDER-NETWORK + XPDR-NW2-RX XPONDER-NETWORK Client-2 - XPDR-NW2-TX XPONDER-NETWORK + XPDR-NW2-TX XPONDER-NETWORK Client-2 - XPDR-NW3-RX XPONDER-NETWORK + XPDR-NW3-RX XPONDER-NETWORK Client-3 - XPDR-NW3-TX XPONDER-NETWORK + XPDR-NW3-TX XPONDER-NETWORK Client-3 - XPDR-NW4-RX XPONDER-NETWORK + XPDR-NW4-RX XPONDER-NETWORK Client-4 - XPDR-NW4-TX XPONDER-NETWORK + XPDR-NW4-TX XPONDER-NETWORK Client-4 OpenROADM-3-1-DEG1 - DEGREE - DEG1-CTP-TX DEGREE-TX-CTP - DEG1-CTP-RX DEGREE-RX-CTP - DEG1-TTP-RX DEGREE-RX-TTP - DEG1-TTP-TX DEGREE-TX-TTP + DEGREE + DEG1-CTP-TX DEGREE-TX-CTP + DEG1-CTP-RX DEGREE-RX-CTP + DEG1-TTP-RX DEGREE-RX-TTP + DEG1-TTP-TX DEGREE-TX-TTP 5 6 @@ -802,11 +802,11 @@ Transport-underlayOpenROADM-3-1 OpenROADM-3-1-DEG2 - DEGREE - DEG2-CTP-TX DEGREE-TX-CTP - DEG2-CTP-RX DEGREE-RX-CTP - DEG2-TTP-RX DEGREE-RX-TTP - DEG2-TTP-TX DEGREE-TX-TTP + DEGREE + DEG2-CTP-TX DEGREE-TX-CTP + DEG2-CTP-RX DEGREE-RX-CTP + DEG2-TTP-RX DEGREE-RX-TTP + DEG2-TTP-TX DEGREE-TX-TTP 5 6 @@ -819,11 +819,11 @@ Transport-underlayOpenROADM-3-1 OpenROADM-3-1-DEG3 - DEGREE - DEG3-CTP-TX DEGREE-TX-CTP - DEG3-CTP-RX DEGREE-RX-CTP - DEG3-TTP-RX DEGREE-RX-TTP - DEG3-TTP-TX DEGREE-TX-TTP + DEGREE + DEG3-CTP-TX DEGREE-TX-CTP + DEG3-CTP-RX DEGREE-RX-CTP + DEG3-TTP-RX DEGREE-RX-TTP + DEG3-TTP-TX DEGREE-TX-TTP 5 6 @@ -835,7 +835,7 @@ 12 Transport-underlayOpenROADM-3-1 - OpenROADM-3-1-SRG1 SRG + OpenROADM-3-1-SRG1 SRG Transport-underlayOpenROADM-3-1 5 @@ -860,38 +860,38 @@ XPONDER-3-1 Transport-underlayXPONDER-3-1 - XPONDER - XPDR-NW1-RX XPONDER-NETWORK + XPONDER + XPDR-NW1-RX XPONDER-NETWORK Client-1 - XPDR-NW1-TX XPONDER-NETWORK + XPDR-NW1-TX XPONDER-NETWORK Client-1 - XPDR-NW2-RX XPONDER-NETWORK + XPDR-NW2-RX XPONDER-NETWORK Client-2 - XPDR-NW2-TX XPONDER-NETWORK + XPDR-NW2-TX XPONDER-NETWORK Client-2 - XPDR-NW3-RX XPONDER-NETWORK + XPDR-NW3-RX XPONDER-NETWORK Client-3 - XPDR-NW3-TX XPONDER-NETWORK + XPDR-NW3-TX XPONDER-NETWORK Client-3 - XPDR-NW4-RX XPONDER-NETWORK + XPDR-NW4-RX XPONDER-NETWORK Client-4 - XPDR-NW4-TX XPONDER-NETWORK + XPDR-NW4-TX XPONDER-NETWORK Client-4 OpenROADM-3-2-DEG1 - DEGREE - DEG1-CTP-TX DEGREE-TX-CTP - DEG1-CTP-RX DEGREE-RX-CTP - DEG1-TTP-RX DEGREE-RX-TTP - DEG1-TTP-TX DEGREE-TX-TTP + DEGREE + DEG1-CTP-TX DEGREE-TX-CTP + DEG1-CTP-RX DEGREE-RX-CTP + DEG1-TTP-RX DEGREE-RX-TTP + DEG1-TTP-TX DEGREE-TX-TTP 5 6 @@ -904,11 +904,11 @@ Transport-underlayOpenROADM-3-2 OpenROADM-3-2-DEG2 - DEGREE - DEG2-CTP-TX DEGREE-TX-CTP - DEG2-CTP-RX DEGREE-RX-CTP - DEG2-TTP-RX DEGREE-RX-TTP - DEG2-TTP-TX DEGREE-TX-TTP + DEGREE + DEG2-CTP-TX DEGREE-TX-CTP + DEG2-CTP-RX DEGREE-RX-CTP + DEG2-TTP-RX DEGREE-RX-TTP + DEG2-TTP-TX DEGREE-TX-TTP 5 6 @@ -921,11 +921,11 @@ Transport-underlayOpenROADM-3-2 OpenROADM-3-2-DEG3 - DEGREE - DEG3-CTP-TX DEGREE-TX-CTP - DEG3-CTP-RX DEGREE-RX-CTP - DEG3-TTP-RX DEGREE-RX-TTP - DEG3-TTP-TX DEGREE-TX-TTP + DEGREE + DEG3-CTP-TX DEGREE-TX-CTP + DEG3-CTP-RX DEGREE-RX-CTP + DEG3-TTP-RX DEGREE-RX-TTP + DEG3-TTP-TX DEGREE-TX-TTP 5 6 @@ -937,7 +937,7 @@ 12 Transport-underlayOpenROADM-3-2 - OpenROADM-3-2-SRG1 SRG + OpenROADM-3-2-SRG1 SRG Transport-underlayOpenROADM-3-2 5 @@ -962,38 +962,38 @@ XPONDER-3-2 Transport-underlayXPONDER-3-2 - XPONDER - XPDR-NW1-RX XPONDER-NETWORK + XPONDER + XPDR-NW1-RX XPONDER-NETWORK Client-1 - XPDR-NW1-TX XPONDER-NETWORK + XPDR-NW1-TX XPONDER-NETWORK Client-1 - XPDR-NW2-RX XPONDER-NETWORK + XPDR-NW2-RX XPONDER-NETWORK Client-2 - XPDR-NW2-TX XPONDER-NETWORK + XPDR-NW2-TX XPONDER-NETWORK Client-2 - XPDR-NW3-RX XPONDER-NETWORK + XPDR-NW3-RX XPONDER-NETWORK Client-3 - XPDR-NW3-TX XPONDER-NETWORK + XPDR-NW3-TX XPONDER-NETWORK Client-3 - XPDR-NW4-RX XPONDER-NETWORK + XPDR-NW4-RX XPONDER-NETWORK Client-4 - XPDR-NW4-TX XPONDER-NETWORK + XPDR-NW4-TX XPONDER-NETWORK Client-4 OpenROADM-3-3-DEG1 - DEGREE - DEG1-CTP-TX DEGREE-TX-CTP - DEG1-CTP-RX DEGREE-RX-CTP - DEG1-TTP-RX DEGREE-RX-TTP - DEG1-TTP-TX DEGREE-TX-TTP + DEGREE + DEG1-CTP-TX DEGREE-TX-CTP + DEG1-CTP-RX DEGREE-RX-CTP + DEG1-TTP-RX DEGREE-RX-TTP + DEG1-TTP-TX DEGREE-TX-TTP 5 6 @@ -1006,11 +1006,11 @@ Transport-underlayOpenROADM-3-3 OpenROADM-3-3-DEG2 - DEGREE - DEG2-CTP-TX DEGREE-TX-CTP - DEG2-CTP-RX DEGREE-RX-CTP - DEG2-TTP-RX DEGREE-RX-TTP - DEG2-TTP-TX DEGREE-TX-TTP + DEGREE + DEG2-CTP-TX DEGREE-TX-CTP + DEG2-CTP-RX DEGREE-RX-CTP + DEG2-TTP-RX DEGREE-RX-TTP + DEG2-TTP-TX DEGREE-TX-TTP 5 6 @@ -1023,11 +1023,11 @@ Transport-underlayOpenROADM-3-3 OpenROADM-3-3-DEG3 - DEGREE - DEG3-CTP-TX DEGREE-TX-CTP - DEG3-CTP-RX DEGREE-RX-CTP - DEG3-TTP-RX DEGREE-RX-TTP - DEG3-TTP-TX DEGREE-TX-TTP + DEGREE + DEG3-CTP-TX DEGREE-TX-CTP + DEG3-CTP-RX DEGREE-RX-CTP + DEG3-TTP-RX DEGREE-RX-TTP + DEG3-TTP-TX DEGREE-TX-TTP 5 6 @@ -1039,7 +1039,7 @@ 12 Transport-underlayOpenROADM-3-3 - OpenROADM-3-3-SRG1 SRG + OpenROADM-3-3-SRG1 SRG Transport-underlayOpenROADM-3-3 5 @@ -1064,38 +1064,38 @@ XPONDER-3-3 Transport-underlayXPONDER-3-3 - XPONDER - XPDR-NW1-RX XPONDER-NETWORK + XPONDER + XPDR-NW1-RX XPONDER-NETWORK Client-1 - XPDR-NW1-TX XPONDER-NETWORK + XPDR-NW1-TX XPONDER-NETWORK Client-1 - XPDR-NW2-RX XPONDER-NETWORK + XPDR-NW2-RX XPONDER-NETWORK Client-2 - XPDR-NW2-TX XPONDER-NETWORK + XPDR-NW2-TX XPONDER-NETWORK Client-2 - XPDR-NW3-RX XPONDER-NETWORK + XPDR-NW3-RX XPONDER-NETWORK Client-3 - XPDR-NW3-TX XPONDER-NETWORK + XPDR-NW3-TX XPONDER-NETWORK Client-3 - XPDR-NW4-RX XPONDER-NETWORK + XPDR-NW4-RX XPONDER-NETWORK Client-4 - XPDR-NW4-TX XPONDER-NETWORK + XPDR-NW4-TX XPONDER-NETWORK Client-4 OpenROADM-3-4-DEG1 - DEGREE - DEG1-CTP-TX DEGREE-TX-CTP - DEG1-CTP-RX DEGREE-RX-CTP - DEG1-TTP-RX DEGREE-RX-TTP - DEG1-TTP-TX DEGREE-TX-TTP + DEGREE + DEG1-CTP-TX DEGREE-TX-CTP + DEG1-CTP-RX DEGREE-RX-CTP + DEG1-TTP-RX DEGREE-RX-TTP + DEG1-TTP-TX DEGREE-TX-TTP 5 6 @@ -1108,11 +1108,11 @@ Transport-underlayOpenROADM-3-4 OpenROADM-3-4-DEG2 - DEGREE - DEG2-CTP-TX DEGREE-TX-CTP - DEG2-CTP-RX DEGREE-RX-CTP - DEG2-TTP-RX DEGREE-RX-TTP - DEG2-TTP-TX DEGREE-TX-TTP + DEGREE + DEG2-CTP-TX DEGREE-TX-CTP + DEG2-CTP-RX DEGREE-RX-CTP + DEG2-TTP-RX DEGREE-RX-TTP + DEG2-TTP-TX DEGREE-TX-TTP 5 6 @@ -1125,11 +1125,11 @@ Transport-underlayOpenROADM-3-4 OpenROADM-3-4-DEG3 - DEGREE - DEG3-CTP-TX DEGREE-TX-CTP - DEG3-CTP-RX DEGREE-RX-CTP - DEG3-TTP-RX DEGREE-RX-TTP - DEG3-TTP-TX DEGREE-TX-TTP + DEGREE + DEG3-CTP-TX DEGREE-TX-CTP + DEG3-CTP-RX DEGREE-RX-CTP + DEG3-TTP-RX DEGREE-RX-TTP + DEG3-TTP-TX DEGREE-TX-TTP 5 6 @@ -1141,7 +1141,7 @@ 12 Transport-underlayOpenROADM-3-4 - OpenROADM-3-4-SRG1 SRG + OpenROADM-3-4-SRG1 SRG Transport-underlayOpenROADM-3-4 5 @@ -1166,38 +1166,38 @@ XPONDER-3-4 Transport-underlayXPONDER-3-4 - XPONDER - XPDR-NW1-RX XPONDER-NETWORK + XPONDER + XPDR-NW1-RX XPONDER-NETWORK Client-1 - XPDR-NW1-TX XPONDER-NETWORK + XPDR-NW1-TX XPONDER-NETWORK Client-1 - XPDR-NW2-RX XPONDER-NETWORK + XPDR-NW2-RX XPONDER-NETWORK Client-2 - XPDR-NW2-TX XPONDER-NETWORK + XPDR-NW2-TX XPONDER-NETWORK Client-2 - XPDR-NW3-RX XPONDER-NETWORK + XPDR-NW3-RX XPONDER-NETWORK Client-3 - XPDR-NW3-TX XPONDER-NETWORK + XPDR-NW3-TX XPONDER-NETWORK Client-3 - XPDR-NW4-RX XPONDER-NETWORK + XPDR-NW4-RX XPONDER-NETWORK Client-4 - XPDR-NW4-TX XPONDER-NETWORK + XPDR-NW4-TX XPONDER-NETWORK Client-4 OpenROADM-4-1-DEG1 - DEGREE - DEG1-CTP-TX DEGREE-TX-CTP - DEG1-CTP-RX DEGREE-RX-CTP - DEG1-TTP-RX DEGREE-RX-TTP - DEG1-TTP-TX DEGREE-TX-TTP + DEGREE + DEG1-CTP-TX DEGREE-TX-CTP + DEG1-CTP-RX DEGREE-RX-CTP + DEG1-TTP-RX DEGREE-RX-TTP + DEG1-TTP-TX DEGREE-TX-TTP 7 8 @@ -1209,11 +1209,11 @@ Transport-underlayOpenROADM-4-1 OpenROADM-4-1-DEG2 - DEGREE - DEG2-CTP-TX DEGREE-TX-CTP - DEG2-CTP-RX DEGREE-RX-CTP - DEG2-TTP-RX DEGREE-RX-TTP - DEG2-TTP-TX DEGREE-TX-TTP + DEGREE + DEG2-CTP-TX DEGREE-TX-CTP + DEG2-CTP-RX DEGREE-RX-CTP + DEG2-TTP-RX DEGREE-RX-TTP + DEG2-TTP-TX DEGREE-TX-TTP 7 8 @@ -1225,11 +1225,11 @@ Transport-underlayOpenROADM-4-1 OpenROADM-4-1-DEG3 - DEGREE - DEG3-CTP-TX DEGREE-TX-CTP - DEG3-CTP-RX DEGREE-RX-CTP - DEG3-TTP-RX DEGREE-RX-TTP - DEG3-TTP-TX DEGREE-TX-TTP + DEGREE + DEG3-CTP-TX DEGREE-TX-CTP + DEG3-CTP-RX DEGREE-RX-CTP + DEG3-TTP-RX DEGREE-RX-TTP + DEG3-TTP-TX DEGREE-TX-TTP 7 8 @@ -1240,7 +1240,7 @@ 13 Transport-underlayOpenROADM-4-1 - OpenROADM-4-1-SRG1 SRG + OpenROADM-4-1-SRG1 SRG Transport-underlayOpenROADM-4-1 7 @@ -1264,38 +1264,38 @@ XPONDER-4-1 Transport-underlayXPONDER-4-1 - XPONDER - XPDR-NW1-RX XPONDER-NETWORK + XPONDER + XPDR-NW1-RX XPONDER-NETWORK Client-1 - XPDR-NW1-TX XPONDER-NETWORK + XPDR-NW1-TX XPONDER-NETWORK Client-1 - XPDR-NW2-RX XPONDER-NETWORK + XPDR-NW2-RX XPONDER-NETWORK Client-2 - XPDR-NW2-TX XPONDER-NETWORK + XPDR-NW2-TX XPONDER-NETWORK Client-2 - XPDR-NW3-RX XPONDER-NETWORK + XPDR-NW3-RX XPONDER-NETWORK Client-3 - XPDR-NW3-TX XPONDER-NETWORK + XPDR-NW3-TX XPONDER-NETWORK Client-3 - XPDR-NW4-RX XPONDER-NETWORK + XPDR-NW4-RX XPONDER-NETWORK Client-4 - XPDR-NW4-TX XPONDER-NETWORK + XPDR-NW4-TX XPONDER-NETWORK Client-4 OpenROADM-4-2-DEG1 - DEGREE - DEG1-CTP-TX DEGREE-TX-CTP - DEG1-CTP-RX DEGREE-RX-CTP - DEG1-TTP-RX DEGREE-RX-TTP - DEG1-TTP-TX DEGREE-TX-TTP + DEGREE + DEG1-CTP-TX DEGREE-TX-CTP + DEG1-CTP-RX DEGREE-RX-CTP + DEG1-TTP-RX DEGREE-RX-TTP + DEG1-TTP-TX DEGREE-TX-TTP 7 8 @@ -1307,11 +1307,11 @@ Transport-underlayOpenROADM-4-2 OpenROADM-4-2-DEG2 - DEGREE - DEG2-CTP-TX DEGREE-TX-CTP - DEG2-CTP-RX DEGREE-RX-CTP - DEG2-TTP-RX DEGREE-RX-TTP - DEG2-TTP-TX DEGREE-TX-TTP + DEGREE + DEG2-CTP-TX DEGREE-TX-CTP + DEG2-CTP-RX DEGREE-RX-CTP + DEG2-TTP-RX DEGREE-RX-TTP + DEG2-TTP-TX DEGREE-TX-TTP 7 8 @@ -1323,11 +1323,11 @@ Transport-underlayOpenROADM-4-2 OpenROADM-4-2-DEG3 - DEGREE - DEG3-CTP-TX DEGREE-TX-CTP - DEG3-CTP-RX DEGREE-RX-CTP - DEG3-TTP-RX DEGREE-RX-TTP - DEG3-TTP-TX DEGREE-TX-TTP + DEGREE + DEG3-CTP-TX DEGREE-TX-CTP + DEG3-CTP-RX DEGREE-RX-CTP + DEG3-TTP-RX DEGREE-RX-TTP + DEG3-TTP-TX DEGREE-TX-TTP 7 8 @@ -1338,7 +1338,7 @@ 13 Transport-underlayOpenROADM-4-2 - OpenROADM-4-2-SRG1 SRG + OpenROADM-4-2-SRG1 SRG Transport-underlayOpenROADM-4-2 7 @@ -1362,38 +1362,38 @@ XPONDER-4-2 Transport-underlayXPONDER-4-2 - XPONDER - XPDR-NW1-RX XPONDER-NETWORK + XPONDER + XPDR-NW1-RX XPONDER-NETWORK Client-1 - XPDR-NW1-TX XPONDER-NETWORK + XPDR-NW1-TX XPONDER-NETWORK Client-1 - XPDR-NW2-RX XPONDER-NETWORK + XPDR-NW2-RX XPONDER-NETWORK Client-2 - XPDR-NW2-TX XPONDER-NETWORK + XPDR-NW2-TX XPONDER-NETWORK Client-2 - XPDR-NW3-RX XPONDER-NETWORK + XPDR-NW3-RX XPONDER-NETWORK Client-3 - XPDR-NW3-TX XPONDER-NETWORK + XPDR-NW3-TX XPONDER-NETWORK Client-3 - XPDR-NW4-RX XPONDER-NETWORK + XPDR-NW4-RX XPONDER-NETWORK Client-4 - XPDR-NW4-TX XPONDER-NETWORK + XPDR-NW4-TX XPONDER-NETWORK Client-4 OpenROADM-4-3-DEG1 - DEGREE - DEG1-CTP-TX DEGREE-TX-CTP - DEG1-CTP-RX DEGREE-RX-CTP - DEG1-TTP-RX DEGREE-RX-TTP - DEG1-TTP-TX DEGREE-TX-TTP + DEGREE + DEG1-CTP-TX DEGREE-TX-CTP + DEG1-CTP-RX DEGREE-RX-CTP + DEG1-TTP-RX DEGREE-RX-TTP + DEG1-TTP-TX DEGREE-TX-TTP 7 8 @@ -1405,11 +1405,11 @@ Transport-underlayOpenROADM-4-3 OpenROADM-4-3-DEG2 - DEGREE - DEG2-CTP-TX DEGREE-TX-CTP - DEG2-CTP-RX DEGREE-RX-CTP - DEG2-TTP-RX DEGREE-RX-TTP - DEG2-TTP-TX DEGREE-TX-TTP + DEGREE + DEG2-CTP-TX DEGREE-TX-CTP + DEG2-CTP-RX DEGREE-RX-CTP + DEG2-TTP-RX DEGREE-RX-TTP + DEG2-TTP-TX DEGREE-TX-TTP 7 8 @@ -1421,11 +1421,11 @@ Transport-underlayOpenROADM-4-3 OpenROADM-4-3-DEG3 - DEGREE - DEG3-CTP-TX DEGREE-TX-CTP - DEG3-CTP-RX DEGREE-RX-CTP - DEG3-TTP-RX DEGREE-RX-TTP - DEG3-TTP-TX DEGREE-TX-TTP + DEGREE + DEG3-CTP-TX DEGREE-TX-CTP + DEG3-CTP-RX DEGREE-RX-CTP + DEG3-TTP-RX DEGREE-RX-TTP + DEG3-TTP-TX DEGREE-TX-TTP 7 8 @@ -1436,7 +1436,7 @@ 13 Transport-underlayOpenROADM-4-3 - OpenROADM-4-3-SRG1 SRG + OpenROADM-4-3-SRG1 SRG Transport-underlayOpenROADM-4-3 7 @@ -1460,38 +1460,38 @@ XPONDER-4-3 Transport-underlayXPONDER-4-3 - XPONDER - XPDR-NW1-RX XPONDER-NETWORK + XPONDER + XPDR-NW1-RX XPONDER-NETWORK Client-1 - XPDR-NW1-TX XPONDER-NETWORK + XPDR-NW1-TX XPONDER-NETWORK Client-1 - XPDR-NW2-RX XPONDER-NETWORK + XPDR-NW2-RX XPONDER-NETWORK Client-2 - XPDR-NW2-TX XPONDER-NETWORK + XPDR-NW2-TX XPONDER-NETWORK Client-2 - XPDR-NW3-RX XPONDER-NETWORK + XPDR-NW3-RX XPONDER-NETWORK Client-3 - XPDR-NW3-TX XPONDER-NETWORK + XPDR-NW3-TX XPONDER-NETWORK Client-3 - XPDR-NW4-RX XPONDER-NETWORK + XPDR-NW4-RX XPONDER-NETWORK Client-4 - XPDR-NW4-TX XPONDER-NETWORK + XPDR-NW4-TX XPONDER-NETWORK Client-4 OpenROADM-4-4-DEG1 - DEGREE - DEG1-CTP-TX DEGREE-TX-CTP - DEG1-CTP-RX DEGREE-RX-CTP - DEG1-TTP-RX DEGREE-RX-TTP - DEG1-TTP-TX DEGREE-TX-TTP + DEGREE + DEG1-CTP-TX DEGREE-TX-CTP + DEG1-CTP-RX DEGREE-RX-CTP + DEG1-TTP-RX DEGREE-RX-TTP + DEG1-TTP-TX DEGREE-TX-TTP 7 8 @@ -1503,11 +1503,11 @@ Transport-underlayOpenROADM-4-4 OpenROADM-4-4-DEG2 - DEGREE - DEG2-CTP-TX DEGREE-TX-CTP - DEG2-CTP-RX DEGREE-RX-CTP - DEG2-TTP-RX DEGREE-RX-TTP - DEG2-TTP-TX DEGREE-TX-TTP + DEGREE + DEG2-CTP-TX DEGREE-TX-CTP + DEG2-CTP-RX DEGREE-RX-CTP + DEG2-TTP-RX DEGREE-RX-TTP + DEG2-TTP-TX DEGREE-TX-TTP 7 8 @@ -1519,11 +1519,11 @@ Transport-underlayOpenROADM-4-4 OpenROADM-4-4-DEG3 - DEGREE - DEG3-CTP-TX DEGREE-TX-CTP - DEG3-CTP-RX DEGREE-RX-CTP - DEG3-TTP-RX DEGREE-RX-TTP - DEG3-TTP-TX DEGREE-TX-TTP + DEGREE + DEG3-CTP-TX DEGREE-TX-CTP + DEG3-CTP-RX DEGREE-RX-CTP + DEG3-TTP-RX DEGREE-RX-TTP + DEG3-TTP-TX DEGREE-TX-TTP 7 8 @@ -1534,7 +1534,7 @@ 13 Transport-underlayOpenROADM-4-4 - OpenROADM-4-4-SRG1 SRG + OpenROADM-4-4-SRG1 SRG Transport-underlayOpenROADM-4-4 7 @@ -1558,38 +1558,38 @@ XPONDER-4-4 Transport-underlayXPONDER-4-4 - XPONDER - XPDR-NW1-RX XPONDER-NETWORK + XPONDER + XPDR-NW1-RX XPONDER-NETWORK Client-1 - XPDR-NW1-TX XPONDER-NETWORK + XPDR-NW1-TX XPONDER-NETWORK Client-1 - XPDR-NW2-RX XPONDER-NETWORK + XPDR-NW2-RX XPONDER-NETWORK Client-2 - XPDR-NW2-TX XPONDER-NETWORK + XPDR-NW2-TX XPONDER-NETWORK Client-2 - XPDR-NW3-RX XPONDER-NETWORK + XPDR-NW3-RX XPONDER-NETWORK Client-3 - XPDR-NW3-TX XPONDER-NETWORK + XPDR-NW3-TX XPONDER-NETWORK Client-3 - XPDR-NW4-RX XPONDER-NETWORK + XPDR-NW4-RX XPONDER-NETWORK Client-4 - XPDR-NW4-TX XPONDER-NETWORK + XPDR-NW4-TX XPONDER-NETWORK Client-4 OpenROADM-5-1-DEG1 - DEGREE - DEG1-CTP-TX DEGREE-TX-CTP - DEG1-CTP-RX DEGREE-RX-CTP - DEG1-TTP-RX DEGREE-RX-TTP - DEG1-TTP-TX DEGREE-TX-TTP + DEGREE + DEG1-CTP-TX DEGREE-TX-CTP + DEG1-CTP-RX DEGREE-RX-CTP + DEG1-TTP-RX DEGREE-RX-TTP + DEG1-TTP-TX DEGREE-TX-TTP 9 10 @@ -1600,11 +1600,11 @@ Transport-underlayOpenROADM-5-1 OpenROADM-5-1-DEG2 - DEGREE - DEG2-CTP-TX DEGREE-TX-CTP - DEG2-CTP-RX DEGREE-RX-CTP - DEG2-TTP-RX DEGREE-RX-TTP - DEG2-TTP-TX DEGREE-TX-TTP + DEGREE + DEG2-CTP-TX DEGREE-TX-CTP + DEG2-CTP-RX DEGREE-RX-CTP + DEG2-TTP-RX DEGREE-RX-TTP + DEG2-TTP-TX DEGREE-TX-TTP 9 10 @@ -1615,11 +1615,11 @@ Transport-underlayOpenROADM-5-1 OpenROADM-5-1-DEG3 - DEGREE - DEG3-CTP-TX DEGREE-TX-CTP - DEG3-CTP-RX DEGREE-RX-CTP - DEG3-TTP-RX DEGREE-RX-TTP - DEG3-TTP-TX DEGREE-TX-TTP + DEGREE + DEG3-CTP-TX DEGREE-TX-CTP + DEG3-CTP-RX DEGREE-RX-CTP + DEG3-TTP-RX DEGREE-RX-TTP + DEG3-TTP-TX DEGREE-TX-TTP 9 10 @@ -1629,7 +1629,7 @@ 14 Transport-underlayOpenROADM-5-1 - OpenROADM-5-1-SRG1 SRG + OpenROADM-5-1-SRG1 SRG Transport-underlayOpenROADM-5-1 9 @@ -1652,38 +1652,38 @@ XPONDER-5-1 Transport-underlayXPONDER-5-1 - XPONDER - XPDR-NW1-RX XPONDER-NETWORK + XPONDER + XPDR-NW1-RX XPONDER-NETWORK Client-1 - XPDR-NW1-TX XPONDER-NETWORK + XPDR-NW1-TX XPONDER-NETWORK Client-1 - XPDR-NW2-RX XPONDER-NETWORK + XPDR-NW2-RX XPONDER-NETWORK Client-2 - XPDR-NW2-TX XPONDER-NETWORK + XPDR-NW2-TX XPONDER-NETWORK Client-2 - XPDR-NW3-RX XPONDER-NETWORK + XPDR-NW3-RX XPONDER-NETWORK Client-3 - XPDR-NW3-TX XPONDER-NETWORK + XPDR-NW3-TX XPONDER-NETWORK Client-3 - XPDR-NW4-RX XPONDER-NETWORK + XPDR-NW4-RX XPONDER-NETWORK Client-4 - XPDR-NW4-TX XPONDER-NETWORK + XPDR-NW4-TX XPONDER-NETWORK Client-4 OpenROADM-5-2-DEG1 - DEGREE - DEG1-CTP-TX DEGREE-TX-CTP - DEG1-CTP-RX DEGREE-RX-CTP - DEG1-TTP-RX DEGREE-RX-TTP - DEG1-TTP-TX DEGREE-TX-TTP + DEGREE + DEG1-CTP-TX DEGREE-TX-CTP + DEG1-CTP-RX DEGREE-RX-CTP + DEG1-TTP-RX DEGREE-RX-TTP + DEG1-TTP-TX DEGREE-TX-TTP 9 10 @@ -1694,11 +1694,11 @@ Transport-underlayOpenROADM-5-2 OpenROADM-5-2-DEG2 - DEGREE - DEG2-CTP-TX DEGREE-TX-CTP - DEG2-CTP-RX DEGREE-RX-CTP - DEG2-TTP-RX DEGREE-RX-TTP - DEG2-TTP-TX DEGREE-TX-TTP + DEGREE + DEG2-CTP-TX DEGREE-TX-CTP + DEG2-CTP-RX DEGREE-RX-CTP + DEG2-TTP-RX DEGREE-RX-TTP + DEG2-TTP-TX DEGREE-TX-TTP 9 10 @@ -1709,11 +1709,11 @@ Transport-underlayOpenROADM-5-2 OpenROADM-5-2-DEG3 - DEGREE - DEG3-CTP-TX DEGREE-TX-CTP - DEG3-CTP-RX DEGREE-RX-CTP - DEG3-TTP-RX DEGREE-RX-TTP - DEG3-TTP-TX DEGREE-TX-TTP + DEGREE + DEG3-CTP-TX DEGREE-TX-CTP + DEG3-CTP-RX DEGREE-RX-CTP + DEG3-TTP-RX DEGREE-RX-TTP + DEG3-TTP-TX DEGREE-TX-TTP 9 10 @@ -1723,7 +1723,7 @@ 14 Transport-underlayOpenROADM-5-2 - OpenROADM-5-2-SRG1 SRG + OpenROADM-5-2-SRG1 SRG Transport-underlayOpenROADM-5-2 9 @@ -1746,38 +1746,38 @@ XPONDER-5-2 Transport-underlayXPONDER-5-2 - XPONDER - XPDR-NW1-RX XPONDER-NETWORK + XPONDER + XPDR-NW1-RX XPONDER-NETWORK Client-1 - XPDR-NW1-TX XPONDER-NETWORK + XPDR-NW1-TX XPONDER-NETWORK Client-1 - XPDR-NW2-RX XPONDER-NETWORK + XPDR-NW2-RX XPONDER-NETWORK Client-2 - XPDR-NW2-TX XPONDER-NETWORK + XPDR-NW2-TX XPONDER-NETWORK Client-2 - XPDR-NW3-RX XPONDER-NETWORK + XPDR-NW3-RX XPONDER-NETWORK Client-3 - XPDR-NW3-TX XPONDER-NETWORK + XPDR-NW3-TX XPONDER-NETWORK Client-3 - XPDR-NW4-RX XPONDER-NETWORK + XPDR-NW4-RX XPONDER-NETWORK Client-4 - XPDR-NW4-TX XPONDER-NETWORK + XPDR-NW4-TX XPONDER-NETWORK Client-4 OpenROADM-5-3-DEG1 - DEGREE - DEG1-CTP-TX DEGREE-TX-CTP - DEG1-CTP-RX DEGREE-RX-CTP - DEG1-TTP-RX DEGREE-RX-TTP - DEG1-TTP-TX DEGREE-TX-TTP + DEGREE + DEG1-CTP-TX DEGREE-TX-CTP + DEG1-CTP-RX DEGREE-RX-CTP + DEG1-TTP-RX DEGREE-RX-TTP + DEG1-TTP-TX DEGREE-TX-TTP 9 10 @@ -1788,11 +1788,11 @@ Transport-underlayOpenROADM-5-3 OpenROADM-5-3-DEG2 - DEGREE - DEG2-CTP-TX DEGREE-TX-CTP - DEG2-CTP-RX DEGREE-RX-CTP - DEG2-TTP-RX DEGREE-RX-TTP - DEG2-TTP-TX DEGREE-TX-TTP + DEGREE + DEG2-CTP-TX DEGREE-TX-CTP + DEG2-CTP-RX DEGREE-RX-CTP + DEG2-TTP-RX DEGREE-RX-TTP + DEG2-TTP-TX DEGREE-TX-TTP 9 10 @@ -1803,11 +1803,11 @@ Transport-underlayOpenROADM-5-3 OpenROADM-5-3-DEG3 - DEGREE - DEG3-CTP-TX DEGREE-TX-CTP - DEG3-CTP-RX DEGREE-RX-CTP - DEG3-TTP-RX DEGREE-RX-TTP - DEG3-TTP-TX DEGREE-TX-TTP + DEGREE + DEG3-CTP-TX DEGREE-TX-CTP + DEG3-CTP-RX DEGREE-RX-CTP + DEG3-TTP-RX DEGREE-RX-TTP + DEG3-TTP-TX DEGREE-TX-TTP 9 10 @@ -1817,7 +1817,7 @@ 14 Transport-underlayOpenROADM-5-3 - OpenROADM-5-3-SRG1 SRG + OpenROADM-5-3-SRG1 SRG Transport-underlayOpenROADM-5-3 9 @@ -1840,38 +1840,38 @@ XPONDER-5-3 Transport-underlayXPONDER-5-3 - XPONDER - XPDR-NW1-RX XPONDER-NETWORK + XPONDER + XPDR-NW1-RX XPONDER-NETWORK Client-1 - XPDR-NW1-TX XPONDER-NETWORK + XPDR-NW1-TX XPONDER-NETWORK Client-1 - XPDR-NW2-RX XPONDER-NETWORK + XPDR-NW2-RX XPONDER-NETWORK Client-2 - XPDR-NW2-TX XPONDER-NETWORK + XPDR-NW2-TX XPONDER-NETWORK Client-2 - XPDR-NW3-RX XPONDER-NETWORK + XPDR-NW3-RX XPONDER-NETWORK Client-3 - XPDR-NW3-TX XPONDER-NETWORK + XPDR-NW3-TX XPONDER-NETWORK Client-3 - XPDR-NW4-RX XPONDER-NETWORK + XPDR-NW4-RX XPONDER-NETWORK Client-4 - XPDR-NW4-TX XPONDER-NETWORK + XPDR-NW4-TX XPONDER-NETWORK Client-4 OpenROADM-5-4-DEG1 - DEGREE - DEG1-CTP-TX DEGREE-TX-CTP - DEG1-CTP-RX DEGREE-RX-CTP - DEG1-TTP-RX DEGREE-RX-TTP - DEG1-TTP-TX DEGREE-TX-TTP + DEGREE + DEG1-CTP-TX DEGREE-TX-CTP + DEG1-CTP-RX DEGREE-RX-CTP + DEG1-TTP-RX DEGREE-RX-TTP + DEG1-TTP-TX DEGREE-TX-TTP 9 10 @@ -1882,11 +1882,11 @@ Transport-underlayOpenROADM-5-4 OpenROADM-5-4-DEG2 - DEGREE - DEG2-CTP-TX DEGREE-TX-CTP - DEG2-CTP-RX DEGREE-RX-CTP - DEG2-TTP-RX DEGREE-RX-TTP - DEG2-TTP-TX DEGREE-TX-TTP + DEGREE + DEG2-CTP-TX DEGREE-TX-CTP + DEG2-CTP-RX DEGREE-RX-CTP + DEG2-TTP-RX DEGREE-RX-TTP + DEG2-TTP-TX DEGREE-TX-TTP 9 10 @@ -1897,11 +1897,11 @@ Transport-underlayOpenROADM-5-4 OpenROADM-5-4-DEG3 - DEGREE - DEG3-CTP-TX DEGREE-TX-CTP - DEG3-CTP-RX DEGREE-RX-CTP - DEG3-TTP-RX DEGREE-RX-TTP - DEG3-TTP-TX DEGREE-TX-TTP + DEGREE + DEG3-CTP-TX DEGREE-TX-CTP + DEG3-CTP-RX DEGREE-RX-CTP + DEG3-TTP-RX DEGREE-RX-TTP + DEG3-TTP-TX DEGREE-TX-TTP 9 10 @@ -1911,7 +1911,7 @@ 14 Transport-underlayOpenROADM-5-4 - OpenROADM-5-4-SRG1 SRG + OpenROADM-5-4-SRG1 SRG Transport-underlayOpenROADM-5-4 9 @@ -1934,357 +1934,357 @@ XPONDER-5-4 Transport-underlayXPONDER-5-4 - XPONDER - XPDR-NW1-RX XPONDER-NETWORK + XPONDER + XPDR-NW1-RX XPONDER-NETWORK Client-1 - XPDR-NW1-TX XPONDER-NETWORK + XPDR-NW1-TX XPONDER-NETWORK Client-1 - XPDR-NW2-RX XPONDER-NETWORK + XPDR-NW2-RX XPONDER-NETWORK Client-2 - XPDR-NW2-TX XPONDER-NETWORK + XPDR-NW2-TX XPONDER-NETWORK Client-2 - XPDR-NW3-RX XPONDER-NETWORK + XPDR-NW3-RX XPONDER-NETWORK Client-3 - XPDR-NW3-TX XPONDER-NETWORK + XPDR-NW3-TX XPONDER-NETWORK Client-3 - XPDR-NW4-RX XPONDER-NETWORK + XPDR-NW4-RX XPONDER-NETWORK Client-4 - XPDR-NW4-TX XPONDER-NETWORK + XPDR-NW4-TX XPONDER-NETWORK Client-4 OpenROADM-1-1-DEG1-DEG1-CTP-TXtoOpenROADM-1-1-DEG2-DEG2-CTP-RX OpenROADM-1-1-DEG1DEG1-CTP-TX OpenROADM-1-1-DEG2DEG2-CTP-RX OpenROADM-1-1-DEG2-DEG2-CTP-TXtoOpenROADM-1-1-DEG1-DEG1-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-1-1-DEG1-DEG1-CTP-TXtoOpenROADM-1-1-DEG3-DEG3-CTP-RX OpenROADM-1-1-DEG1DEG1-CTP-TX OpenROADM-1-1-DEG3DEG3-CTP-RX OpenROADM-1-1-DEG3-DEG3-CTP-TXtoOpenROADM-1-1-DEG1-DEG1-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-1-1-SRG1-SRG1-CP-TXtoOpenROADM-1-1-DEG1-DEG1-CTP-RX OpenROADM-1-1-SRG1SRG1-CP-TX OpenROADM-1-1-DEG1DEG1-CTP-RX OpenROADM-1-1-DEG1-DEG1-CTP-TXtoOpenROADM-1-1-SRG1-SRG1-CP-RX - ADD-LINK + ADD-LINK OpenROADM-1-1-DEG1-DEG1-CTP-TXtoOpenROADM-1-1-SRG1-SRG1-CP-RX OpenROADM-1-1-DEG1DEG1-CTP-TX OpenROADM-1-1-SRG1SRG1-CP-RX OpenROADM-1-1-SRG1-SRG1-CP-TXtoOpenROADM-1-1-DEG1-DEG1-CTP-RX - DROP-LINK + DROP-LINK OpenROADM-1-1-DEG2-DEG2-CTP-TXtoOpenROADM-1-1-DEG1-DEG1-CTP-RX OpenROADM-1-1-DEG2DEG2-CTP-TX OpenROADM-1-1-DEG1DEG1-CTP-RX OpenROADM-1-1-DEG1-DEG1-CTP-TXtoOpenROADM-1-1-DEG2-DEG2-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-1-1-DEG2-DEG2-CTP-TXtoOpenROADM-1-1-DEG3-DEG3-CTP-RX OpenROADM-1-1-DEG2DEG2-CTP-TX OpenROADM-1-1-DEG3DEG3-CTP-RX OpenROADM-1-1-DEG3-DEG3-CTP-TXtoOpenROADM-1-1-DEG2-DEG2-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-1-1-SRG1-SRG1-CP-TXtoOpenROADM-1-1-DEG2-DEG2-CTP-RX OpenROADM-1-1-SRG1SRG1-CP-TX OpenROADM-1-1-DEG2DEG2-CTP-RX OpenROADM-1-1-DEG2-DEG2-CTP-TXtoOpenROADM-1-1-SRG1-SRG1-CP-RX - ADD-LINK + ADD-LINK OpenROADM-1-1-DEG2-DEG2-CTP-TXtoOpenROADM-1-1-SRG1-SRG1-CP-RX OpenROADM-1-1-DEG2DEG2-CTP-TX OpenROADM-1-1-SRG1SRG1-CP-RX OpenROADM-1-1-SRG1-SRG1-CP-TXtoOpenROADM-1-1-DEG2-DEG2-CTP-RX - DROP-LINK + DROP-LINK OpenROADM-1-1-DEG3-DEG3-CTP-TXtoOpenROADM-1-1-DEG1-DEG1-CTP-RX OpenROADM-1-1-DEG3DEG3-CTP-TX OpenROADM-1-1-DEG1DEG1-CTP-RX OpenROADM-1-1-DEG1-DEG1-CTP-TXtoOpenROADM-1-1-DEG3-DEG3-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-1-1-DEG3-DEG3-CTP-TXtoOpenROADM-1-1-DEG2-DEG2-CTP-RX OpenROADM-1-1-DEG3DEG3-CTP-TX OpenROADM-1-1-DEG2DEG2-CTP-RX OpenROADM-1-1-DEG2-DEG2-CTP-TXtoOpenROADM-1-1-DEG3-DEG3-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-1-1-SRG1-SRG1-CP-TXtoOpenROADM-1-1-DEG3-DEG3-CTP-RX OpenROADM-1-1-SRG1SRG1-CP-TX OpenROADM-1-1-DEG3DEG3-CTP-RX OpenROADM-1-1-DEG3-DEG3-CTP-TXtoOpenROADM-1-1-SRG1-SRG1-CP-RX - ADD-LINK + ADD-LINK OpenROADM-1-1-DEG3-DEG3-CTP-TXtoOpenROADM-1-1-SRG1-SRG1-CP-RX OpenROADM-1-1-DEG3DEG3-CTP-TX OpenROADM-1-1-SRG1SRG1-CP-RX OpenROADM-1-1-SRG1-SRG1-CP-TXtoOpenROADM-1-1-DEG3-DEG3-CTP-RX - DROP-LINK + DROP-LINK XPONDER-1-1XPDR-NW1-TX-toOpenROADM-1-1-SRG1-SRG1-PP1-RX XPONDER-1-1XPDR-NW1-TX OpenROADM-1-1-SRG1SRG1-PP1-RX OpenROADM-1-1-SRG1-SRG1-PP1-TX-to-XPONDER-1-1XPDR-NW1-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-1-1-SRG1-SRG1-PP1-TX-to-XPONDER-1-1XPDR-NW1-RX OpenROADM-1-1-SRG1SRG1-PP1-TX XPONDER-1-1XPDR-NW1-RX XPONDER-1-1XPDR-NW1-TX-toOpenROADM-1-1-SRG1-SRG1-PP1-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-1-1XPDR-NW2-TX-toOpenROADM-1-1-SRG1-SRG1-PP2-RX XPONDER-1-1XPDR-NW2-TX OpenROADM-1-1-SRG1SRG1-PP2-RX OpenROADM-1-1-SRG1-SRG1-PP2-TX-to-XPONDER-1-1XPDR-NW2-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-1-1-SRG1-SRG1-PP2-TX-to-XPONDER-1-1XPDR-NW2-RX OpenROADM-1-1-SRG1SRG1-PP2-TX XPONDER-1-1XPDR-NW2-RX XPONDER-1-1XPDR-NW2-TX-toOpenROADM-1-1-SRG1-SRG1-PP2-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-1-1XPDR-NW3-TX-toOpenROADM-1-1-SRG1-SRG1-PP3-RX XPONDER-1-1XPDR-NW3-TX OpenROADM-1-1-SRG1SRG1-PP3-RX OpenROADM-1-1-SRG1-SRG1-PP3-TX-to-XPONDER-1-1XPDR-NW3-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-1-1-SRG1-SRG1-PP3-TX-to-XPONDER-1-1XPDR-NW3-RX OpenROADM-1-1-SRG1SRG1-PP3-TX XPONDER-1-1XPDR-NW3-RX XPONDER-1-1XPDR-NW3-TX-toOpenROADM-1-1-SRG1-SRG1-PP3-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-1-1XPDR-NW4-TX-toOpenROADM-1-1-SRG1-SRG1-PP4-RX XPONDER-1-1XPDR-NW4-TX OpenROADM-1-1-SRG1SRG1-PP4-RX OpenROADM-1-1-SRG1-SRG1-PP4-TX-to-XPONDER-1-1XPDR-NW4-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-1-1-SRG1-SRG1-PP4-TX-to-XPONDER-1-1XPDR-NW4-RX OpenROADM-1-1-SRG1SRG1-PP4-TX XPONDER-1-1XPDR-NW4-RX XPONDER-1-1XPDR-NW4-TX-toOpenROADM-1-1-SRG1-SRG1-PP4-RX - XPONDER-INPUT + XPONDER-INPUT OpenROADM-1-2-DEG1-DEG1-CTP-TXtoOpenROADM-1-2-DEG2-DEG2-CTP-RX OpenROADM-1-2-DEG1DEG1-CTP-TX OpenROADM-1-2-DEG2DEG2-CTP-RX OpenROADM-1-2-DEG2-DEG2-CTP-TXtoOpenROADM-1-2-DEG1-DEG1-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-1-2-DEG1-DEG1-CTP-TXtoOpenROADM-1-2-DEG3-DEG3-CTP-RX OpenROADM-1-2-DEG1DEG1-CTP-TX OpenROADM-1-2-DEG3DEG3-CTP-RX OpenROADM-1-2-DEG3-DEG3-CTP-TXtoOpenROADM-1-2-DEG1-DEG1-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-1-2-SRG1-SRG1-CP-TXtoOpenROADM-1-2-DEG1-DEG1-CTP-RX OpenROADM-1-2-SRG1SRG1-CP-TX OpenROADM-1-2-DEG1DEG1-CTP-RX OpenROADM-1-2-DEG1-DEG1-CTP-TXtoOpenROADM-1-2-SRG1-SRG1-CP-RX - ADD-LINK + ADD-LINK OpenROADM-1-2-DEG1-DEG1-CTP-TXtoOpenROADM-1-2-SRG1-SRG1-CP-RX OpenROADM-1-2-DEG1DEG1-CTP-TX OpenROADM-1-2-SRG1SRG1-CP-RX OpenROADM-1-2-SRG1-SRG1-CP-TXtoOpenROADM-1-2-DEG1-DEG1-CTP-RX - DROP-LINK + DROP-LINK OpenROADM-1-2-DEG2-DEG2-CTP-TXtoOpenROADM-1-2-DEG1-DEG1-CTP-RX OpenROADM-1-2-DEG2DEG2-CTP-TX OpenROADM-1-2-DEG1DEG1-CTP-RX OpenROADM-1-2-DEG1-DEG1-CTP-TXtoOpenROADM-1-2-DEG2-DEG2-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-1-2-DEG2-DEG2-CTP-TXtoOpenROADM-1-2-DEG3-DEG3-CTP-RX OpenROADM-1-2-DEG2DEG2-CTP-TX OpenROADM-1-2-DEG3DEG3-CTP-RX OpenROADM-1-2-DEG3-DEG3-CTP-TXtoOpenROADM-1-2-DEG2-DEG2-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-1-2-SRG1-SRG1-CP-TXtoOpenROADM-1-2-DEG2-DEG2-CTP-RX OpenROADM-1-2-SRG1SRG1-CP-TX OpenROADM-1-2-DEG2DEG2-CTP-RX OpenROADM-1-2-DEG2-DEG2-CTP-TXtoOpenROADM-1-2-SRG1-SRG1-CP-RX - ADD-LINK + ADD-LINK OpenROADM-1-2-DEG2-DEG2-CTP-TXtoOpenROADM-1-2-SRG1-SRG1-CP-RX OpenROADM-1-2-DEG2DEG2-CTP-TX OpenROADM-1-2-SRG1SRG1-CP-RX OpenROADM-1-2-SRG1-SRG1-CP-TXtoOpenROADM-1-2-DEG2-DEG2-CTP-RX - DROP-LINK + DROP-LINK OpenROADM-1-2-DEG3-DEG3-CTP-TXtoOpenROADM-1-2-DEG1-DEG1-CTP-RX OpenROADM-1-2-DEG3DEG3-CTP-TX OpenROADM-1-2-DEG1DEG1-CTP-RX OpenROADM-1-2-DEG1-DEG1-CTP-TXtoOpenROADM-1-2-DEG3-DEG3-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-1-2-DEG3-DEG3-CTP-TXtoOpenROADM-1-2-DEG2-DEG2-CTP-RX OpenROADM-1-2-DEG3DEG3-CTP-TX OpenROADM-1-2-DEG2DEG2-CTP-RX OpenROADM-1-2-DEG2-DEG2-CTP-TXtoOpenROADM-1-2-DEG3-DEG3-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-1-2-SRG1-SRG1-CP-TXtoOpenROADM-1-2-DEG3-DEG3-CTP-RX OpenROADM-1-2-SRG1SRG1-CP-TX OpenROADM-1-2-DEG3DEG3-CTP-RX OpenROADM-1-2-DEG3-DEG3-CTP-TXtoOpenROADM-1-2-SRG1-SRG1-CP-RX - ADD-LINK + ADD-LINK OpenROADM-1-2-DEG3-DEG3-CTP-TXtoOpenROADM-1-2-SRG1-SRG1-CP-RX OpenROADM-1-2-DEG3DEG3-CTP-TX OpenROADM-1-2-SRG1SRG1-CP-RX OpenROADM-1-2-SRG1-SRG1-CP-TXtoOpenROADM-1-2-DEG3-DEG3-CTP-RX - DROP-LINK + DROP-LINK XPONDER-1-2XPDR-NW1-TX-toOpenROADM-1-2-SRG1-SRG1-PP1-RX XPONDER-1-2XPDR-NW1-TX OpenROADM-1-2-SRG1SRG1-PP1-RX OpenROADM-1-2-SRG1-SRG1-PP1-TX-to-XPONDER-1-2XPDR-NW1-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-1-2-SRG1-SRG1-PP1-TX-to-XPONDER-1-2XPDR-NW1-RX OpenROADM-1-2-SRG1SRG1-PP1-TX XPONDER-1-2XPDR-NW1-RX XPONDER-1-2XPDR-NW1-TX-toOpenROADM-1-2-SRG1-SRG1-PP1-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-1-2XPDR-NW2-TX-toOpenROADM-1-2-SRG1-SRG1-PP2-RX XPONDER-1-2XPDR-NW2-TX OpenROADM-1-2-SRG1SRG1-PP2-RX OpenROADM-1-2-SRG1-SRG1-PP2-TX-to-XPONDER-1-2XPDR-NW2-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-1-2-SRG1-SRG1-PP2-TX-to-XPONDER-1-2XPDR-NW2-RX OpenROADM-1-2-SRG1SRG1-PP2-TX XPONDER-1-2XPDR-NW2-RX XPONDER-1-2XPDR-NW2-TX-toOpenROADM-1-2-SRG1-SRG1-PP2-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-1-2XPDR-NW3-TX-toOpenROADM-1-2-SRG1-SRG1-PP3-RX XPONDER-1-2XPDR-NW3-TX OpenROADM-1-2-SRG1SRG1-PP3-RX OpenROADM-1-2-SRG1-SRG1-PP3-TX-to-XPONDER-1-2XPDR-NW3-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-1-2-SRG1-SRG1-PP3-TX-to-XPONDER-1-2XPDR-NW3-RX OpenROADM-1-2-SRG1SRG1-PP3-TX XPONDER-1-2XPDR-NW3-RX XPONDER-1-2XPDR-NW3-TX-toOpenROADM-1-2-SRG1-SRG1-PP3-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-1-2XPDR-NW4-TX-toOpenROADM-1-2-SRG1-SRG1-PP4-RX XPONDER-1-2XPDR-NW4-TX OpenROADM-1-2-SRG1SRG1-PP4-RX OpenROADM-1-2-SRG1-SRG1-PP4-TX-to-XPONDER-1-2XPDR-NW4-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-1-2-SRG1-SRG1-PP4-TX-to-XPONDER-1-2XPDR-NW4-RX OpenROADM-1-2-SRG1SRG1-PP4-TX XPONDER-1-2XPDR-NW4-RX XPONDER-1-2XPDR-NW4-TX-toOpenROADM-1-2-SRG1-SRG1-PP4-RX - XPONDER-INPUT + XPONDER-INPUT OpenROADM-1-3-DEG1-DEG1-CTP-TXtoOpenROADM-1-3-DEG2-DEG2-CTP-RX OpenROADM-1-3-DEG1DEG1-CTP-TX OpenROADM-1-3-DEG2DEG2-CTP-RX OpenROADM-1-3-DEG2-DEG2-CTP-TXtoOpenROADM-1-3-DEG1-DEG1-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-1-3-DEG1-DEG1-CTP-TXtoOpenROADM-1-3-DEG3-DEG3-CTP-RX OpenROADM-1-3-DEG1DEG1-CTP-TX OpenROADM-1-3-DEG3DEG3-CTP-RX OpenROADM-1-3-DEG3-DEG3-CTP-TXtoOpenROADM-1-3-DEG1-DEG1-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-1-3-SRG1-SRG1-CP-TXtoOpenROADM-1-3-DEG1-DEG1-CTP-RX OpenROADM-1-3-SRG1SRG1-CP-TX OpenROADM-1-3-DEG1DEG1-CTP-RX OpenROADM-1-3-DEG1-DEG1-CTP-TXtoOpenROADM-1-3-SRG1-SRG1-CP-RX - ADD-LINK + ADD-LINK OpenROADM-1-3-DEG1-DEG1-CTP-TXtoOpenROADM-1-3-SRG1-SRG1-CP-RX OpenROADM-1-3-DEG1DEG1-CTP-TX OpenROADM-1-3-SRG1SRG1-CP-RX OpenROADM-1-3-SRG1-SRG1-CP-TXtoOpenROADM-1-3-DEG1-DEG1-CTP-RX - DROP-LINK + DROP-LINK OpenROADM-1-3-DEG2-DEG2-CTP-TXtoOpenROADM-1-3-DEG1-DEG1-CTP-RX OpenROADM-1-3-DEG2DEG2-CTP-TX OpenROADM-1-3-DEG1DEG1-CTP-RX OpenROADM-1-3-DEG1-DEG1-CTP-TXtoOpenROADM-1-3-DEG2-DEG2-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-1-3-DEG2-DEG2-CTP-TXtoOpenROADM-1-3-DEG3-DEG3-CTP-RX OpenROADM-1-3-DEG2DEG2-CTP-TX OpenROADM-1-3-DEG3DEG3-CTP-RX OpenROADM-1-3-DEG3-DEG3-CTP-TXtoOpenROADM-1-3-DEG2-DEG2-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-1-3-SRG1-SRG1-CP-TXtoOpenROADM-1-3-DEG2-DEG2-CTP-RX OpenROADM-1-3-SRG1SRG1-CP-TX OpenROADM-1-3-DEG2DEG2-CTP-RX OpenROADM-1-3-DEG2-DEG2-CTP-TXtoOpenROADM-1-3-SRG1-SRG1-CP-RX - ADD-LINK + ADD-LINK OpenROADM-1-3-DEG2-DEG2-CTP-TXtoOpenROADM-1-3-SRG1-SRG1-CP-RX OpenROADM-1-3-DEG2DEG2-CTP-TX OpenROADM-1-3-SRG1SRG1-CP-RX OpenROADM-1-3-SRG1-SRG1-CP-TXtoOpenROADM-1-3-DEG2-DEG2-CTP-RX - DROP-LINK + DROP-LINK OpenROADM-1-3-DEG3-DEG3-CTP-TXtoOpenROADM-1-3-DEG1-DEG1-CTP-RX OpenROADM-1-3-DEG3DEG3-CTP-TX OpenROADM-1-3-DEG1DEG1-CTP-RX OpenROADM-1-3-DEG1-DEG1-CTP-TXtoOpenROADM-1-3-DEG3-DEG3-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-1-3-DEG3-DEG3-CTP-TXtoOpenROADM-1-3-DEG2-DEG2-CTP-RX OpenROADM-1-3-DEG3DEG3-CTP-TX OpenROADM-1-3-DEG2DEG2-CTP-RX OpenROADM-1-3-DEG2-DEG2-CTP-TXtoOpenROADM-1-3-DEG3-DEG3-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-1-3-SRG1-SRG1-CP-TXtoOpenROADM-1-3-DEG3-DEG3-CTP-RX OpenROADM-1-3-SRG1SRG1-CP-TX OpenROADM-1-3-DEG3DEG3-CTP-RX OpenROADM-1-3-DEG3-DEG3-CTP-TXtoOpenROADM-1-3-SRG1-SRG1-CP-RX - ADD-LINK + ADD-LINK OpenROADM-1-3-DEG3-DEG3-CTP-TXtoOpenROADM-1-3-SRG1-SRG1-CP-RX OpenROADM-1-3-DEG3DEG3-CTP-TX OpenROADM-1-3-SRG1SRG1-CP-RX OpenROADM-1-3-SRG1-SRG1-CP-TXtoOpenROADM-1-3-DEG3-DEG3-CTP-RX - DROP-LINK + DROP-LINK XPONDER-1-3XPDR-NW1-TX-toOpenROADM-1-3-SRG1-SRG1-PP1-RX XPONDER-1-3XPDR-NW1-TX OpenROADM-1-3-SRG1SRG1-PP1-RX OpenROADM-1-3-SRG1-SRG1-PP1-TX-to-XPONDER-1-3XPDR-NW1-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-1-3-SRG1-SRG1-PP1-TX-to-XPONDER-1-3XPDR-NW1-RX OpenROADM-1-3-SRG1SRG1-PP1-TX XPONDER-1-3XPDR-NW1-RX XPONDER-1-3XPDR-NW1-TX-toOpenROADM-1-3-SRG1-SRG1-PP1-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-1-3XPDR-NW2-TX-toOpenROADM-1-3-SRG1-SRG1-PP2-RX XPONDER-1-3XPDR-NW2-TX OpenROADM-1-3-SRG1SRG1-PP2-RX OpenROADM-1-3-SRG1-SRG1-PP2-TX-to-XPONDER-1-3XPDR-NW2-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-1-3-SRG1-SRG1-PP2-TX-to-XPONDER-1-3XPDR-NW2-RX OpenROADM-1-3-SRG1SRG1-PP2-TX XPONDER-1-3XPDR-NW2-RX XPONDER-1-3XPDR-NW2-TX-toOpenROADM-1-3-SRG1-SRG1-PP2-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-1-3XPDR-NW3-TX-toOpenROADM-1-3-SRG1-SRG1-PP3-RX XPONDER-1-3XPDR-NW3-TX OpenROADM-1-3-SRG1SRG1-PP3-RX OpenROADM-1-3-SRG1-SRG1-PP3-TX-to-XPONDER-1-3XPDR-NW3-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-1-3-SRG1-SRG1-PP3-TX-to-XPONDER-1-3XPDR-NW3-RX OpenROADM-1-3-SRG1SRG1-PP3-TX XPONDER-1-3XPDR-NW3-RX XPONDER-1-3XPDR-NW3-TX-toOpenROADM-1-3-SRG1-SRG1-PP3-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-1-3XPDR-NW4-TX-toOpenROADM-1-3-SRG1-SRG1-PP4-RX XPONDER-1-3XPDR-NW4-TX OpenROADM-1-3-SRG1SRG1-PP4-RX OpenROADM-1-3-SRG1-SRG1-PP4-TX-to-XPONDER-1-3XPDR-NW4-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-1-3-SRG1-SRG1-PP4-TX-to-XPONDER-1-3XPDR-NW4-RX OpenROADM-1-3-SRG1SRG1-PP4-TX XPONDER-1-3XPDR-NW4-RX XPONDER-1-3XPDR-NW4-TX-toOpenROADM-1-3-SRG1-SRG1-PP4-RX - XPONDER-INPUT + XPONDER-INPUT OpenROADM-1-4-DEG1-DEG1-CTP-TXtoOpenROADM-1-4-DEG2-DEG2-CTP-RX OpenROADM-1-4-DEG1DEG1-CTP-TX OpenROADM-1-4-DEG2DEG2-CTP-RX OpenROADM-1-4-DEG2-DEG2-CTP-TXtoOpenROADM-1-4-DEG1-DEG1-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-1-4-DEG1-DEG1-CTP-TXtoOpenROADM-1-4-DEG3-DEG3-CTP-RX OpenROADM-1-4-DEG1DEG1-CTP-TX OpenROADM-1-4-DEG3DEG3-CTP-RX OpenROADM-1-4-DEG3-DEG3-CTP-TXtoOpenROADM-1-4-DEG1-DEG1-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-1-4-SRG1-SRG1-CP-TXtoOpenROADM-1-4-DEG1-DEG1-CTP-RX OpenROADM-1-4-SRG1SRG1-CP-TX OpenROADM-1-4-DEG1DEG1-CTP-RX OpenROADM-1-4-DEG1-DEG1-CTP-TXtoOpenROADM-1-4-SRG1-SRG1-CP-RX - ADD-LINK + ADD-LINK OpenROADM-1-4-DEG1-DEG1-CTP-TXtoOpenROADM-1-4-SRG1-SRG1-CP-RX OpenROADM-1-4-DEG1DEG1-CTP-TX OpenROADM-1-4-SRG1SRG1-CP-RX OpenROADM-1-4-SRG1-SRG1-CP-TXtoOpenROADM-1-4-DEG1-DEG1-CTP-RX - DROP-LINK + DROP-LINK OpenROADM-1-4-DEG2-DEG2-CTP-TXtoOpenROADM-1-4-DEG1-DEG1-CTP-RX OpenROADM-1-4-DEG2DEG2-CTP-TX OpenROADM-1-4-DEG1DEG1-CTP-RX OpenROADM-1-4-DEG1-DEG1-CTP-TXtoOpenROADM-1-4-DEG2-DEG2-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-1-4-DEG2-DEG2-CTP-TXtoOpenROADM-1-4-DEG3-DEG3-CTP-RX OpenROADM-1-4-DEG2DEG2-CTP-TX OpenROADM-1-4-DEG3DEG3-CTP-RX OpenROADM-1-4-DEG3-DEG3-CTP-TXtoOpenROADM-1-4-DEG2-DEG2-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-1-4-SRG1-SRG1-CP-TXtoOpenROADM-1-4-DEG2-DEG2-CTP-RX OpenROADM-1-4-SRG1SRG1-CP-TX OpenROADM-1-4-DEG2DEG2-CTP-RX OpenROADM-1-4-DEG2-DEG2-CTP-TXtoOpenROADM-1-4-SRG1-SRG1-CP-RX - ADD-LINK + ADD-LINK OpenROADM-1-4-DEG2-DEG2-CTP-TXtoOpenROADM-1-4-SRG1-SRG1-CP-RX OpenROADM-1-4-DEG2DEG2-CTP-TX OpenROADM-1-4-SRG1SRG1-CP-RX OpenROADM-1-4-SRG1-SRG1-CP-TXtoOpenROADM-1-4-DEG2-DEG2-CTP-RX - DROP-LINK + DROP-LINK OpenROADM-1-4-DEG3-DEG3-CTP-TXtoOpenROADM-1-4-DEG1-DEG1-CTP-RX OpenROADM-1-4-DEG3DEG3-CTP-TX OpenROADM-1-4-DEG1DEG1-CTP-RX OpenROADM-1-4-DEG1-DEG1-CTP-TXtoOpenROADM-1-4-DEG3-DEG3-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-1-4-DEG3-DEG3-CTP-TXtoOpenROADM-1-4-DEG2-DEG2-CTP-RX OpenROADM-1-4-DEG3DEG3-CTP-TX OpenROADM-1-4-DEG2DEG2-CTP-RX OpenROADM-1-4-DEG2-DEG2-CTP-TXtoOpenROADM-1-4-DEG3-DEG3-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-1-4-SRG1-SRG1-CP-TXtoOpenROADM-1-4-DEG3-DEG3-CTP-RX OpenROADM-1-4-SRG1SRG1-CP-TX OpenROADM-1-4-DEG3DEG3-CTP-RX OpenROADM-1-4-DEG3-DEG3-CTP-TXtoOpenROADM-1-4-SRG1-SRG1-CP-RX - ADD-LINK + ADD-LINK OpenROADM-1-4-DEG3-DEG3-CTP-TXtoOpenROADM-1-4-SRG1-SRG1-CP-RX OpenROADM-1-4-DEG3DEG3-CTP-TX OpenROADM-1-4-SRG1SRG1-CP-RX OpenROADM-1-4-SRG1-SRG1-CP-TXtoOpenROADM-1-4-DEG3-DEG3-CTP-RX - DROP-LINK + DROP-LINK XPONDER-1-4XPDR-NW1-TX-toOpenROADM-1-4-SRG1-SRG1-PP1-RX XPONDER-1-4XPDR-NW1-TX OpenROADM-1-4-SRG1SRG1-PP1-RX OpenROADM-1-4-SRG1-SRG1-PP1-TX-to-XPONDER-1-4XPDR-NW1-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-1-4-SRG1-SRG1-PP1-TX-to-XPONDER-1-4XPDR-NW1-RX OpenROADM-1-4-SRG1SRG1-PP1-TX XPONDER-1-4XPDR-NW1-RX XPONDER-1-4XPDR-NW1-TX-toOpenROADM-1-4-SRG1-SRG1-PP1-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-1-4XPDR-NW2-TX-toOpenROADM-1-4-SRG1-SRG1-PP2-RX XPONDER-1-4XPDR-NW2-TX OpenROADM-1-4-SRG1SRG1-PP2-RX OpenROADM-1-4-SRG1-SRG1-PP2-TX-to-XPONDER-1-4XPDR-NW2-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-1-4-SRG1-SRG1-PP2-TX-to-XPONDER-1-4XPDR-NW2-RX OpenROADM-1-4-SRG1SRG1-PP2-TX XPONDER-1-4XPDR-NW2-RX XPONDER-1-4XPDR-NW2-TX-toOpenROADM-1-4-SRG1-SRG1-PP2-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-1-4XPDR-NW3-TX-toOpenROADM-1-4-SRG1-SRG1-PP3-RX XPONDER-1-4XPDR-NW3-TX OpenROADM-1-4-SRG1SRG1-PP3-RX OpenROADM-1-4-SRG1-SRG1-PP3-TX-to-XPONDER-1-4XPDR-NW3-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-1-4-SRG1-SRG1-PP3-TX-to-XPONDER-1-4XPDR-NW3-RX OpenROADM-1-4-SRG1SRG1-PP3-TX XPONDER-1-4XPDR-NW3-RX XPONDER-1-4XPDR-NW3-TX-toOpenROADM-1-4-SRG1-SRG1-PP3-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-1-4XPDR-NW4-TX-toOpenROADM-1-4-SRG1-SRG1-PP4-RX XPONDER-1-4XPDR-NW4-TX OpenROADM-1-4-SRG1SRG1-PP4-RX OpenROADM-1-4-SRG1-SRG1-PP4-TX-to-XPONDER-1-4XPDR-NW4-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-1-4-SRG1-SRG1-PP4-TX-to-XPONDER-1-4XPDR-NW4-RX OpenROADM-1-4-SRG1SRG1-PP4-TX XPONDER-1-4XPDR-NW4-RX XPONDER-1-4XPDR-NW4-TX-toOpenROADM-1-4-SRG1-SRG1-PP4-RX - XPONDER-INPUT + XPONDER-INPUT OpenROADM-1-1-DEG1-to-OpenROADM-1-2-DEG1 OpenROADM-1-2-DEG1-to-OpenROADM-1-1-DEG1 1 - ROADM-TO-ROADM + ROADM-TO-ROADM OpenROADM-1-1-DEG1DEG1-TTP-TX OpenROADM-1-2-DEG1DEG1-TTP-RX @@ -2309,7 +2309,7 @@ OpenROADM-1-2-DEG1-to-OpenROADM-1-1-DEG1 OpenROADM-1-1-DEG1-to-OpenROADM-1-2-DEG1 1 - ROADM-TO-ROADM + ROADM-TO-ROADM OpenROADM-1-2-DEG1DEG1-TTP-TX OpenROADM-1-1-DEG1DEG1-TTP-RX @@ -2334,7 +2334,7 @@ OpenROADM-1-2-DEG2-to-OpenROADM-1-3-DEG2 OpenROADM-1-3-DEG2-to-OpenROADM-1-2-DEG2 1 - ROADM-TO-ROADM + ROADM-TO-ROADM OpenROADM-1-2-DEG2DEG2-TTP-TX OpenROADM-1-3-DEG2DEG2-TTP-RX @@ -2359,7 +2359,7 @@ OpenROADM-1-3-DEG2-to-OpenROADM-1-2-DEG2 OpenROADM-1-2-DEG2-to-OpenROADM-1-3-DEG2 1 - ROADM-TO-ROADM + ROADM-TO-ROADM OpenROADM-1-3-DEG2DEG2-TTP-TX OpenROADM-1-2-DEG2DEG2-TTP-RX @@ -2384,7 +2384,7 @@ OpenROADM-1-3-DEG1-to-OpenROADM-1-4-DEG1 OpenROADM-1-4-DEG1-to-OpenROADM-1-3-DEG1 1 - ROADM-TO-ROADM + ROADM-TO-ROADM OpenROADM-1-3-DEG1DEG1-TTP-TX OpenROADM-1-4-DEG1DEG1-TTP-RX @@ -2409,7 +2409,7 @@ OpenROADM-1-4-DEG1-to-OpenROADM-1-3-DEG1 OpenROADM-1-3-DEG1-to-OpenROADM-1-4-DEG1 1 - ROADM-TO-ROADM + ROADM-TO-ROADM OpenROADM-1-4-DEG1DEG1-TTP-TX OpenROADM-1-3-DEG1DEG1-TTP-RX @@ -2434,7 +2434,7 @@ OpenROADM-1-4-DEG2-to-OpenROADM-1-1-DEG2 OpenROADM-1-1-DEG2-to-OpenROADM-1-4-DEG2 1 - ROADM-TO-ROADM + ROADM-TO-ROADM OpenROADM-1-4-DEG2DEG2-TTP-TX OpenROADM-1-1-DEG2DEG2-TTP-RX @@ -2459,7 +2459,7 @@ OpenROADM-1-1-DEG2-to-OpenROADM-1-4-DEG2 OpenROADM-1-4-DEG2-to-OpenROADM-1-1-DEG2 1 - ROADM-TO-ROADM + ROADM-TO-ROADM OpenROADM-1-1-DEG2DEG2-TTP-TX OpenROADM-1-4-DEG2DEG2-TTP-RX @@ -2483,328 +2483,328 @@ OpenROADM-2-1-DEG1-DEG1-CTP-TXtoOpenROADM-2-1-DEG2-DEG2-CTP-RX OpenROADM-2-1-DEG1DEG1-CTP-TX OpenROADM-2-1-DEG2DEG2-CTP-RX OpenROADM-2-1-DEG2-DEG2-CTP-TXtoOpenROADM-2-1-DEG1-DEG1-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-2-1-DEG1-DEG1-CTP-TXtoOpenROADM-2-1-DEG3-DEG3-CTP-RX OpenROADM-2-1-DEG1DEG1-CTP-TX OpenROADM-2-1-DEG3DEG3-CTP-RX OpenROADM-2-1-DEG3-DEG3-CTP-TXtoOpenROADM-2-1-DEG1-DEG1-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-2-1-SRG1-SRG1-CP-TXtoOpenROADM-2-1-DEG1-DEG1-CTP-RX OpenROADM-2-1-SRG1SRG1-CP-TX OpenROADM-2-1-DEG1DEG1-CTP-RX OpenROADM-2-1-DEG1-DEG1-CTP-TXtoOpenROADM-2-1-SRG1-SRG1-CP-RX - ADD-LINK + ADD-LINK OpenROADM-2-1-DEG1-DEG1-CTP-TXtoOpenROADM-2-1-SRG1-SRG1-CP-RX OpenROADM-2-1-DEG1DEG1-CTP-TX OpenROADM-2-1-SRG1SRG1-CP-RX OpenROADM-2-1-SRG1-SRG1-CP-TXtoOpenROADM-2-1-DEG1-DEG1-CTP-RX - DROP-LINK + DROP-LINK OpenROADM-2-1-DEG2-DEG2-CTP-TXtoOpenROADM-2-1-DEG1-DEG1-CTP-RX OpenROADM-2-1-DEG2DEG2-CTP-TX OpenROADM-2-1-DEG1DEG1-CTP-RX OpenROADM-2-1-DEG1-DEG1-CTP-TXtoOpenROADM-2-1-DEG2-DEG2-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-2-1-DEG2-DEG2-CTP-TXtoOpenROADM-2-1-DEG3-DEG3-CTP-RX OpenROADM-2-1-DEG2DEG2-CTP-TX OpenROADM-2-1-DEG3DEG3-CTP-RX OpenROADM-2-1-DEG3-DEG3-CTP-TXtoOpenROADM-2-1-DEG2-DEG2-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-2-1-SRG1-SRG1-CP-TXtoOpenROADM-2-1-DEG2-DEG2-CTP-RX OpenROADM-2-1-SRG1SRG1-CP-TX OpenROADM-2-1-DEG2DEG2-CTP-RX OpenROADM-2-1-DEG2-DEG2-CTP-TXtoOpenROADM-2-1-SRG1-SRG1-CP-RX - ADD-LINK + ADD-LINK OpenROADM-2-1-DEG2-DEG2-CTP-TXtoOpenROADM-2-1-SRG1-SRG1-CP-RX OpenROADM-2-1-DEG2DEG2-CTP-TX OpenROADM-2-1-SRG1SRG1-CP-RX OpenROADM-2-1-SRG1-SRG1-CP-TXtoOpenROADM-2-1-DEG2-DEG2-CTP-RX - DROP-LINK + DROP-LINK OpenROADM-2-1-DEG3-DEG3-CTP-TXtoOpenROADM-2-1-DEG1-DEG1-CTP-RX OpenROADM-2-1-DEG3DEG3-CTP-TX OpenROADM-2-1-DEG1DEG1-CTP-RX OpenROADM-2-1-DEG1-DEG1-CTP-TXtoOpenROADM-2-1-DEG3-DEG3-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-2-1-DEG3-DEG3-CTP-TXtoOpenROADM-2-1-DEG2-DEG2-CTP-RX OpenROADM-2-1-DEG3DEG3-CTP-TX OpenROADM-2-1-DEG2DEG2-CTP-RX OpenROADM-2-1-DEG2-DEG2-CTP-TXtoOpenROADM-2-1-DEG3-DEG3-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-2-1-SRG1-SRG1-CP-TXtoOpenROADM-2-1-DEG3-DEG3-CTP-RX OpenROADM-2-1-SRG1SRG1-CP-TX OpenROADM-2-1-DEG3DEG3-CTP-RX OpenROADM-2-1-DEG3-DEG3-CTP-TXtoOpenROADM-2-1-SRG1-SRG1-CP-RX - ADD-LINK + ADD-LINK OpenROADM-2-1-DEG3-DEG3-CTP-TXtoOpenROADM-2-1-SRG1-SRG1-CP-RX OpenROADM-2-1-DEG3DEG3-CTP-TX OpenROADM-2-1-SRG1SRG1-CP-RX OpenROADM-2-1-SRG1-SRG1-CP-TXtoOpenROADM-2-1-DEG3-DEG3-CTP-RX - DROP-LINK + DROP-LINK XPONDER-2-1XPDR-NW1-TX-toOpenROADM-2-1-SRG1-SRG1-PP1-RX XPONDER-2-1XPDR-NW1-TX OpenROADM-2-1-SRG1SRG1-PP1-RX OpenROADM-2-1-SRG1-SRG1-PP1-TX-to-XPONDER-2-1XPDR-NW1-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-2-1-SRG1-SRG1-PP1-TX-to-XPONDER-2-1XPDR-NW1-RX OpenROADM-2-1-SRG1SRG1-PP1-TX XPONDER-2-1XPDR-NW1-RX XPONDER-2-1XPDR-NW1-TX-toOpenROADM-2-1-SRG1-SRG1-PP1-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-2-1XPDR-NW2-TX-toOpenROADM-2-1-SRG1-SRG1-PP2-RX XPONDER-2-1XPDR-NW2-TX OpenROADM-2-1-SRG1SRG1-PP2-RX OpenROADM-2-1-SRG1-SRG1-PP2-TX-to-XPONDER-2-1XPDR-NW2-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-2-1-SRG1-SRG1-PP2-TX-to-XPONDER-2-1XPDR-NW2-RX OpenROADM-2-1-SRG1SRG1-PP2-TX XPONDER-2-1XPDR-NW2-RX XPONDER-2-1XPDR-NW2-TX-toOpenROADM-2-1-SRG1-SRG1-PP2-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-2-1XPDR-NW3-TX-toOpenROADM-2-1-SRG1-SRG1-PP3-RX XPONDER-2-1XPDR-NW3-TX OpenROADM-2-1-SRG1SRG1-PP3-RX OpenROADM-2-1-SRG1-SRG1-PP3-TX-to-XPONDER-2-1XPDR-NW3-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-2-1-SRG1-SRG1-PP3-TX-to-XPONDER-2-1XPDR-NW3-RX OpenROADM-2-1-SRG1SRG1-PP3-TX XPONDER-2-1XPDR-NW3-RX XPONDER-2-1XPDR-NW3-TX-toOpenROADM-2-1-SRG1-SRG1-PP3-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-2-1XPDR-NW4-TX-toOpenROADM-2-1-SRG1-SRG1-PP4-RX XPONDER-2-1XPDR-NW4-TX OpenROADM-2-1-SRG1SRG1-PP4-RX OpenROADM-2-1-SRG1-SRG1-PP4-TX-to-XPONDER-2-1XPDR-NW4-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-2-1-SRG1-SRG1-PP4-TX-to-XPONDER-2-1XPDR-NW4-RX OpenROADM-2-1-SRG1SRG1-PP4-TX XPONDER-2-1XPDR-NW4-RX XPONDER-2-1XPDR-NW4-TX-toOpenROADM-2-1-SRG1-SRG1-PP4-RX - XPONDER-INPUT + XPONDER-INPUT OpenROADM-2-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-2-DEG2-DEG2-CTP-RX OpenROADM-2-2-DEG1DEG1-CTP-TX OpenROADM-2-2-DEG2DEG2-CTP-RX OpenROADM-2-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-2-DEG1-DEG1-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-2-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-2-DEG3-DEG3-CTP-RX OpenROADM-2-2-DEG1DEG1-CTP-TX OpenROADM-2-2-DEG3DEG3-CTP-RX OpenROADM-2-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-2-DEG1-DEG1-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-2-2-SRG1-SRG1-CP-TXtoOpenROADM-2-2-DEG1-DEG1-CTP-RX OpenROADM-2-2-SRG1SRG1-CP-TX OpenROADM-2-2-DEG1DEG1-CTP-RX OpenROADM-2-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-2-SRG1-SRG1-CP-RX - ADD-LINK + ADD-LINK OpenROADM-2-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-2-SRG1-SRG1-CP-RX OpenROADM-2-2-DEG1DEG1-CTP-TX OpenROADM-2-2-SRG1SRG1-CP-RX OpenROADM-2-2-SRG1-SRG1-CP-TXtoOpenROADM-2-2-DEG1-DEG1-CTP-RX - DROP-LINK + DROP-LINK OpenROADM-2-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-2-DEG1-DEG1-CTP-RX OpenROADM-2-2-DEG2DEG2-CTP-TX OpenROADM-2-2-DEG1DEG1-CTP-RX OpenROADM-2-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-2-DEG2-DEG2-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-2-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-2-DEG3-DEG3-CTP-RX OpenROADM-2-2-DEG2DEG2-CTP-TX OpenROADM-2-2-DEG3DEG3-CTP-RX OpenROADM-2-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-2-DEG2-DEG2-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-2-2-SRG1-SRG1-CP-TXtoOpenROADM-2-2-DEG2-DEG2-CTP-RX OpenROADM-2-2-SRG1SRG1-CP-TX OpenROADM-2-2-DEG2DEG2-CTP-RX OpenROADM-2-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-2-SRG1-SRG1-CP-RX - ADD-LINK + ADD-LINK OpenROADM-2-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-2-SRG1-SRG1-CP-RX OpenROADM-2-2-DEG2DEG2-CTP-TX OpenROADM-2-2-SRG1SRG1-CP-RX OpenROADM-2-2-SRG1-SRG1-CP-TXtoOpenROADM-2-2-DEG2-DEG2-CTP-RX - DROP-LINK + DROP-LINK OpenROADM-2-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-2-DEG1-DEG1-CTP-RX OpenROADM-2-2-DEG3DEG3-CTP-TX OpenROADM-2-2-DEG1DEG1-CTP-RX OpenROADM-2-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-2-DEG3-DEG3-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-2-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-2-DEG2-DEG2-CTP-RX OpenROADM-2-2-DEG3DEG3-CTP-TX OpenROADM-2-2-DEG2DEG2-CTP-RX OpenROADM-2-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-2-DEG3-DEG3-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-2-2-SRG1-SRG1-CP-TXtoOpenROADM-2-2-DEG3-DEG3-CTP-RX OpenROADM-2-2-SRG1SRG1-CP-TX OpenROADM-2-2-DEG3DEG3-CTP-RX OpenROADM-2-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-2-SRG1-SRG1-CP-RX - ADD-LINK + ADD-LINK OpenROADM-2-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-2-SRG1-SRG1-CP-RX OpenROADM-2-2-DEG3DEG3-CTP-TX OpenROADM-2-2-SRG1SRG1-CP-RX OpenROADM-2-2-SRG1-SRG1-CP-TXtoOpenROADM-2-2-DEG3-DEG3-CTP-RX - DROP-LINK + DROP-LINK XPONDER-2-2XPDR-NW1-TX-toOpenROADM-2-2-SRG1-SRG1-PP1-RX XPONDER-2-2XPDR-NW1-TX OpenROADM-2-2-SRG1SRG1-PP1-RX OpenROADM-2-2-SRG1-SRG1-PP1-TX-to-XPONDER-2-2XPDR-NW1-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-2-2-SRG1-SRG1-PP1-TX-to-XPONDER-2-2XPDR-NW1-RX OpenROADM-2-2-SRG1SRG1-PP1-TX XPONDER-2-2XPDR-NW1-RX XPONDER-2-2XPDR-NW1-TX-toOpenROADM-2-2-SRG1-SRG1-PP1-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-2-2XPDR-NW2-TX-toOpenROADM-2-2-SRG1-SRG1-PP2-RX XPONDER-2-2XPDR-NW2-TX OpenROADM-2-2-SRG1SRG1-PP2-RX OpenROADM-2-2-SRG1-SRG1-PP2-TX-to-XPONDER-2-2XPDR-NW2-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-2-2-SRG1-SRG1-PP2-TX-to-XPONDER-2-2XPDR-NW2-RX OpenROADM-2-2-SRG1SRG1-PP2-TX XPONDER-2-2XPDR-NW2-RX XPONDER-2-2XPDR-NW2-TX-toOpenROADM-2-2-SRG1-SRG1-PP2-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-2-2XPDR-NW3-TX-toOpenROADM-2-2-SRG1-SRG1-PP3-RX XPONDER-2-2XPDR-NW3-TX OpenROADM-2-2-SRG1SRG1-PP3-RX OpenROADM-2-2-SRG1-SRG1-PP3-TX-to-XPONDER-2-2XPDR-NW3-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-2-2-SRG1-SRG1-PP3-TX-to-XPONDER-2-2XPDR-NW3-RX OpenROADM-2-2-SRG1SRG1-PP3-TX XPONDER-2-2XPDR-NW3-RX XPONDER-2-2XPDR-NW3-TX-toOpenROADM-2-2-SRG1-SRG1-PP3-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-2-2XPDR-NW4-TX-toOpenROADM-2-2-SRG1-SRG1-PP4-RX XPONDER-2-2XPDR-NW4-TX OpenROADM-2-2-SRG1SRG1-PP4-RX OpenROADM-2-2-SRG1-SRG1-PP4-TX-to-XPONDER-2-2XPDR-NW4-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-2-2-SRG1-SRG1-PP4-TX-to-XPONDER-2-2XPDR-NW4-RX OpenROADM-2-2-SRG1SRG1-PP4-TX XPONDER-2-2XPDR-NW4-RX XPONDER-2-2XPDR-NW4-TX-toOpenROADM-2-2-SRG1-SRG1-PP4-RX - XPONDER-INPUT + XPONDER-INPUT OpenROADM-2-3-DEG1-DEG1-CTP-TXtoOpenROADM-2-3-DEG2-DEG2-CTP-RX OpenROADM-2-3-DEG1DEG1-CTP-TX OpenROADM-2-3-DEG2DEG2-CTP-RX OpenROADM-2-3-DEG2-DEG2-CTP-TXtoOpenROADM-2-3-DEG1-DEG1-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-2-3-DEG1-DEG1-CTP-TXtoOpenROADM-2-3-DEG3-DEG3-CTP-RX OpenROADM-2-3-DEG1DEG1-CTP-TX OpenROADM-2-3-DEG3DEG3-CTP-RX OpenROADM-2-3-DEG3-DEG3-CTP-TXtoOpenROADM-2-3-DEG1-DEG1-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-2-3-SRG1-SRG1-CP-TXtoOpenROADM-2-3-DEG1-DEG1-CTP-RX OpenROADM-2-3-SRG1SRG1-CP-TX OpenROADM-2-3-DEG1DEG1-CTP-RX OpenROADM-2-3-DEG1-DEG1-CTP-TXtoOpenROADM-2-3-SRG1-SRG1-CP-RX - ADD-LINK + ADD-LINK OpenROADM-2-3-DEG1-DEG1-CTP-TXtoOpenROADM-2-3-SRG1-SRG1-CP-RX OpenROADM-2-3-DEG1DEG1-CTP-TX OpenROADM-2-3-SRG1SRG1-CP-RX OpenROADM-2-3-SRG1-SRG1-CP-TXtoOpenROADM-2-3-DEG1-DEG1-CTP-RX - DROP-LINK + DROP-LINK OpenROADM-2-3-DEG2-DEG2-CTP-TXtoOpenROADM-2-3-DEG1-DEG1-CTP-RX OpenROADM-2-3-DEG2DEG2-CTP-TX OpenROADM-2-3-DEG1DEG1-CTP-RX OpenROADM-2-3-DEG1-DEG1-CTP-TXtoOpenROADM-2-3-DEG2-DEG2-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-2-3-DEG2-DEG2-CTP-TXtoOpenROADM-2-3-DEG3-DEG3-CTP-RX OpenROADM-2-3-DEG2DEG2-CTP-TX OpenROADM-2-3-DEG3DEG3-CTP-RX OpenROADM-2-3-DEG3-DEG3-CTP-TXtoOpenROADM-2-3-DEG2-DEG2-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-2-3-SRG1-SRG1-CP-TXtoOpenROADM-2-3-DEG2-DEG2-CTP-RX OpenROADM-2-3-SRG1SRG1-CP-TX OpenROADM-2-3-DEG2DEG2-CTP-RX OpenROADM-2-3-DEG2-DEG2-CTP-TXtoOpenROADM-2-3-SRG1-SRG1-CP-RX - ADD-LINK + ADD-LINK OpenROADM-2-3-DEG2-DEG2-CTP-TXtoOpenROADM-2-3-SRG1-SRG1-CP-RX OpenROADM-2-3-DEG2DEG2-CTP-TX OpenROADM-2-3-SRG1SRG1-CP-RX OpenROADM-2-3-SRG1-SRG1-CP-TXtoOpenROADM-2-3-DEG2-DEG2-CTP-RX - DROP-LINK + DROP-LINK OpenROADM-2-3-DEG3-DEG3-CTP-TXtoOpenROADM-2-3-DEG1-DEG1-CTP-RX OpenROADM-2-3-DEG3DEG3-CTP-TX OpenROADM-2-3-DEG1DEG1-CTP-RX OpenROADM-2-3-DEG1-DEG1-CTP-TXtoOpenROADM-2-3-DEG3-DEG3-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-2-3-DEG3-DEG3-CTP-TXtoOpenROADM-2-3-DEG2-DEG2-CTP-RX OpenROADM-2-3-DEG3DEG3-CTP-TX OpenROADM-2-3-DEG2DEG2-CTP-RX OpenROADM-2-3-DEG2-DEG2-CTP-TXtoOpenROADM-2-3-DEG3-DEG3-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-2-3-SRG1-SRG1-CP-TXtoOpenROADM-2-3-DEG3-DEG3-CTP-RX OpenROADM-2-3-SRG1SRG1-CP-TX OpenROADM-2-3-DEG3DEG3-CTP-RX OpenROADM-2-3-DEG3-DEG3-CTP-TXtoOpenROADM-2-3-SRG1-SRG1-CP-RX - ADD-LINK + ADD-LINK OpenROADM-2-3-DEG3-DEG3-CTP-TXtoOpenROADM-2-3-SRG1-SRG1-CP-RX OpenROADM-2-3-DEG3DEG3-CTP-TX OpenROADM-2-3-SRG1SRG1-CP-RX OpenROADM-2-3-SRG1-SRG1-CP-TXtoOpenROADM-2-3-DEG3-DEG3-CTP-RX - DROP-LINK + DROP-LINK XPONDER-2-3XPDR-NW1-TX-toOpenROADM-2-3-SRG1-SRG1-PP1-RX XPONDER-2-3XPDR-NW1-TX OpenROADM-2-3-SRG1SRG1-PP1-RX OpenROADM-2-3-SRG1-SRG1-PP1-TX-to-XPONDER-2-3XPDR-NW1-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-2-3-SRG1-SRG1-PP1-TX-to-XPONDER-2-3XPDR-NW1-RX OpenROADM-2-3-SRG1SRG1-PP1-TX XPONDER-2-3XPDR-NW1-RX XPONDER-2-3XPDR-NW1-TX-toOpenROADM-2-3-SRG1-SRG1-PP1-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-2-3XPDR-NW2-TX-toOpenROADM-2-3-SRG1-SRG1-PP2-RX XPONDER-2-3XPDR-NW2-TX OpenROADM-2-3-SRG1SRG1-PP2-RX OpenROADM-2-3-SRG1-SRG1-PP2-TX-to-XPONDER-2-3XPDR-NW2-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-2-3-SRG1-SRG1-PP2-TX-to-XPONDER-2-3XPDR-NW2-RX OpenROADM-2-3-SRG1SRG1-PP2-TX XPONDER-2-3XPDR-NW2-RX XPONDER-2-3XPDR-NW2-TX-toOpenROADM-2-3-SRG1-SRG1-PP2-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-2-3XPDR-NW3-TX-toOpenROADM-2-3-SRG1-SRG1-PP3-RX XPONDER-2-3XPDR-NW3-TX OpenROADM-2-3-SRG1SRG1-PP3-RX OpenROADM-2-3-SRG1-SRG1-PP3-TX-to-XPONDER-2-3XPDR-NW3-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-2-3-SRG1-SRG1-PP3-TX-to-XPONDER-2-3XPDR-NW3-RX OpenROADM-2-3-SRG1SRG1-PP3-TX XPONDER-2-3XPDR-NW3-RX XPONDER-2-3XPDR-NW3-TX-toOpenROADM-2-3-SRG1-SRG1-PP3-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-2-3XPDR-NW4-TX-toOpenROADM-2-3-SRG1-SRG1-PP4-RX XPONDER-2-3XPDR-NW4-TX OpenROADM-2-3-SRG1SRG1-PP4-RX OpenROADM-2-3-SRG1-SRG1-PP4-TX-to-XPONDER-2-3XPDR-NW4-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-2-3-SRG1-SRG1-PP4-TX-to-XPONDER-2-3XPDR-NW4-RX OpenROADM-2-3-SRG1SRG1-PP4-TX XPONDER-2-3XPDR-NW4-RX XPONDER-2-3XPDR-NW4-TX-toOpenROADM-2-3-SRG1-SRG1-PP4-RX - XPONDER-INPUT + XPONDER-INPUT OpenROADM-2-4-DEG1-DEG1-CTP-TXtoOpenROADM-2-4-DEG2-DEG2-CTP-RX OpenROADM-2-4-DEG1DEG1-CTP-TX OpenROADM-2-4-DEG2DEG2-CTP-RX OpenROADM-2-4-DEG2-DEG2-CTP-TXtoOpenROADM-2-4-DEG1-DEG1-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-2-4-DEG1-DEG1-CTP-TXtoOpenROADM-2-4-DEG3-DEG3-CTP-RX OpenROADM-2-4-DEG1DEG1-CTP-TX OpenROADM-2-4-DEG3DEG3-CTP-RX OpenROADM-2-4-DEG3-DEG3-CTP-TXtoOpenROADM-2-4-DEG1-DEG1-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-2-4-SRG1-SRG1-CP-TXtoOpenROADM-2-4-DEG1-DEG1-CTP-RX OpenROADM-2-4-SRG1SRG1-CP-TX OpenROADM-2-4-DEG1DEG1-CTP-RX OpenROADM-2-4-DEG1-DEG1-CTP-TXtoOpenROADM-2-4-SRG1-SRG1-CP-RX - ADD-LINK + ADD-LINK OpenROADM-2-4-DEG1-DEG1-CTP-TXtoOpenROADM-2-4-SRG1-SRG1-CP-RX OpenROADM-2-4-DEG1DEG1-CTP-TX OpenROADM-2-4-SRG1SRG1-CP-RX OpenROADM-2-4-SRG1-SRG1-CP-TXtoOpenROADM-2-4-DEG1-DEG1-CTP-RX - DROP-LINK + DROP-LINK OpenROADM-2-4-DEG2-DEG2-CTP-TXtoOpenROADM-2-4-DEG1-DEG1-CTP-RX OpenROADM-2-4-DEG2DEG2-CTP-TX OpenROADM-2-4-DEG1DEG1-CTP-RX OpenROADM-2-4-DEG1-DEG1-CTP-TXtoOpenROADM-2-4-DEG2-DEG2-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-2-4-DEG2-DEG2-CTP-TXtoOpenROADM-2-4-DEG3-DEG3-CTP-RX OpenROADM-2-4-DEG2DEG2-CTP-TX OpenROADM-2-4-DEG3DEG3-CTP-RX OpenROADM-2-4-DEG3-DEG3-CTP-TXtoOpenROADM-2-4-DEG2-DEG2-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-2-4-SRG1-SRG1-CP-TXtoOpenROADM-2-4-DEG2-DEG2-CTP-RX OpenROADM-2-4-SRG1SRG1-CP-TX OpenROADM-2-4-DEG2DEG2-CTP-RX OpenROADM-2-4-DEG2-DEG2-CTP-TXtoOpenROADM-2-4-SRG1-SRG1-CP-RX - ADD-LINK + ADD-LINK OpenROADM-2-4-DEG2-DEG2-CTP-TXtoOpenROADM-2-4-SRG1-SRG1-CP-RX OpenROADM-2-4-DEG2DEG2-CTP-TX OpenROADM-2-4-SRG1SRG1-CP-RX OpenROADM-2-4-SRG1-SRG1-CP-TXtoOpenROADM-2-4-DEG2-DEG2-CTP-RX - DROP-LINK + DROP-LINK OpenROADM-2-4-DEG3-DEG3-CTP-TXtoOpenROADM-2-4-DEG1-DEG1-CTP-RX OpenROADM-2-4-DEG3DEG3-CTP-TX OpenROADM-2-4-DEG1DEG1-CTP-RX OpenROADM-2-4-DEG1-DEG1-CTP-TXtoOpenROADM-2-4-DEG3-DEG3-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-2-4-DEG3-DEG3-CTP-TXtoOpenROADM-2-4-DEG2-DEG2-CTP-RX OpenROADM-2-4-DEG3DEG3-CTP-TX OpenROADM-2-4-DEG2DEG2-CTP-RX OpenROADM-2-4-DEG2-DEG2-CTP-TXtoOpenROADM-2-4-DEG3-DEG3-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-2-4-SRG1-SRG1-CP-TXtoOpenROADM-2-4-DEG3-DEG3-CTP-RX OpenROADM-2-4-SRG1SRG1-CP-TX OpenROADM-2-4-DEG3DEG3-CTP-RX OpenROADM-2-4-DEG3-DEG3-CTP-TXtoOpenROADM-2-4-SRG1-SRG1-CP-RX - ADD-LINK + ADD-LINK OpenROADM-2-4-DEG3-DEG3-CTP-TXtoOpenROADM-2-4-SRG1-SRG1-CP-RX OpenROADM-2-4-DEG3DEG3-CTP-TX OpenROADM-2-4-SRG1SRG1-CP-RX OpenROADM-2-4-SRG1-SRG1-CP-TXtoOpenROADM-2-4-DEG3-DEG3-CTP-RX - DROP-LINK + DROP-LINK XPONDER-2-4XPDR-NW1-TX-toOpenROADM-2-4-SRG1-SRG1-PP1-RX XPONDER-2-4XPDR-NW1-TX OpenROADM-2-4-SRG1SRG1-PP1-RX OpenROADM-2-4-SRG1-SRG1-PP1-TX-to-XPONDER-2-4XPDR-NW1-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-2-4-SRG1-SRG1-PP1-TX-to-XPONDER-2-4XPDR-NW1-RX OpenROADM-2-4-SRG1SRG1-PP1-TX XPONDER-2-4XPDR-NW1-RX XPONDER-2-4XPDR-NW1-TX-toOpenROADM-2-4-SRG1-SRG1-PP1-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-2-4XPDR-NW2-TX-toOpenROADM-2-4-SRG1-SRG1-PP2-RX XPONDER-2-4XPDR-NW2-TX OpenROADM-2-4-SRG1SRG1-PP2-RX OpenROADM-2-4-SRG1-SRG1-PP2-TX-to-XPONDER-2-4XPDR-NW2-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-2-4-SRG1-SRG1-PP2-TX-to-XPONDER-2-4XPDR-NW2-RX OpenROADM-2-4-SRG1SRG1-PP2-TX XPONDER-2-4XPDR-NW2-RX XPONDER-2-4XPDR-NW2-TX-toOpenROADM-2-4-SRG1-SRG1-PP2-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-2-4XPDR-NW3-TX-toOpenROADM-2-4-SRG1-SRG1-PP3-RX XPONDER-2-4XPDR-NW3-TX OpenROADM-2-4-SRG1SRG1-PP3-RX OpenROADM-2-4-SRG1-SRG1-PP3-TX-to-XPONDER-2-4XPDR-NW3-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-2-4-SRG1-SRG1-PP3-TX-to-XPONDER-2-4XPDR-NW3-RX OpenROADM-2-4-SRG1SRG1-PP3-TX XPONDER-2-4XPDR-NW3-RX XPONDER-2-4XPDR-NW3-TX-toOpenROADM-2-4-SRG1-SRG1-PP3-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-2-4XPDR-NW4-TX-toOpenROADM-2-4-SRG1-SRG1-PP4-RX XPONDER-2-4XPDR-NW4-TX OpenROADM-2-4-SRG1SRG1-PP4-RX OpenROADM-2-4-SRG1-SRG1-PP4-TX-to-XPONDER-2-4XPDR-NW4-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-2-4-SRG1-SRG1-PP4-TX-to-XPONDER-2-4XPDR-NW4-RX OpenROADM-2-4-SRG1SRG1-PP4-TX XPONDER-2-4XPDR-NW4-RX XPONDER-2-4XPDR-NW4-TX-toOpenROADM-2-4-SRG1-SRG1-PP4-RX - XPONDER-INPUT + XPONDER-INPUT OpenROADM-2-1-DEG1-to-OpenROADM-2-2-DEG1 OpenROADM-2-2-DEG1-to-OpenROADM-2-1-DEG1 1 - ROADM-TO-ROADM + ROADM-TO-ROADM OpenROADM-2-1-DEG1DEG1-TTP-TX OpenROADM-2-2-DEG1DEG1-TTP-RX @@ -2829,7 +2829,7 @@ OpenROADM-2-2-DEG1-to-OpenROADM-2-1-DEG1 OpenROADM-2-1-DEG1-to-OpenROADM-2-2-DEG1 1 - ROADM-TO-ROADM + ROADM-TO-ROADM OpenROADM-2-2-DEG1DEG1-TTP-TX OpenROADM-2-1-DEG1DEG1-TTP-RX @@ -2854,7 +2854,7 @@ OpenROADM-2-2-DEG2-to-OpenROADM-2-3-DEG2 OpenROADM-2-3-DEG2-to-OpenROADM-2-2-DEG2 1 - ROADM-TO-ROADM + ROADM-TO-ROADM OpenROADM-2-2-DEG2DEG2-TTP-TX OpenROADM-2-3-DEG2DEG2-TTP-RX @@ -2879,7 +2879,7 @@ OpenROADM-2-3-DEG2-to-OpenROADM-2-2-DEG2 OpenROADM-2-2-DEG2-to-OpenROADM-2-3-DEG2 1 - ROADM-TO-ROADM + ROADM-TO-ROADM OpenROADM-2-3-DEG2DEG2-TTP-TX OpenROADM-2-2-DEG2DEG2-TTP-RX @@ -2904,7 +2904,7 @@ OpenROADM-2-3-DEG1-to-OpenROADM-2-4-DEG1 OpenROADM-2-4-DEG1-to-OpenROADM-2-3-DEG1 1 - ROADM-TO-ROADM + ROADM-TO-ROADM OpenROADM-2-3-DEG1DEG1-TTP-TX OpenROADM-2-4-DEG1DEG1-TTP-RX @@ -2929,7 +2929,7 @@ OpenROADM-2-4-DEG1-to-OpenROADM-2-3-DEG1 OpenROADM-2-3-DEG1-to-OpenROADM-2-4-DEG1 1 - ROADM-TO-ROADM + ROADM-TO-ROADM OpenROADM-2-4-DEG1DEG1-TTP-TX OpenROADM-2-3-DEG1DEG1-TTP-RX @@ -2954,7 +2954,7 @@ OpenROADM-2-4-DEG2-to-OpenROADM-2-1-DEG2 OpenROADM-2-1-DEG2-to-OpenROADM-2-4-DEG2 1 - ROADM-TO-ROADM + ROADM-TO-ROADM OpenROADM-2-4-DEG2DEG2-TTP-TX OpenROADM-2-1-DEG2DEG2-TTP-RX @@ -2979,7 +2979,7 @@ OpenROADM-2-1-DEG2-to-OpenROADM-2-4-DEG2 OpenROADM-2-4-DEG2-to-OpenROADM-2-1-DEG2 1 - ROADM-TO-ROADM + ROADM-TO-ROADM OpenROADM-2-1-DEG2DEG2-TTP-TX OpenROADM-2-4-DEG2DEG2-TTP-RX @@ -3005,330 +3005,330 @@ OpenROADM-3-1-DEG1DEG1-CTP-TX OpenROADM-3-1-DEG2DEG2-CTP-RX OpenROADM-3-1-DEG2-DEG2-CTP-TXtoOpenROADM-3-1-DEG1-DEG1-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-3-1-DEG1-DEG1-CTP-TXtoOpenROADM-3-1-DEG3-DEG3-CTP-RX OpenROADM-3-1-DEG1DEG1-CTP-TX OpenROADM-3-1-DEG3DEG3-CTP-RX OpenROADM-3-1-DEG3-DEG3-CTP-TXtoOpenROADM-3-1-DEG1-DEG1-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-3-1-SRG1-SRG1-CP-TXtoOpenROADM-3-1-DEG1-DEG1-CTP-RX OpenROADM-3-1-SRG1SRG1-CP-TX OpenROADM-3-1-DEG1DEG1-CTP-RX OpenROADM-3-1-DEG1-DEG1-CTP-TXtoOpenROADM-3-1-SRG1-SRG1-CP-RX - ADD-LINK + ADD-LINK OpenROADM-3-1-DEG1-DEG1-CTP-TXtoOpenROADM-3-1-SRG1-SRG1-CP-RX OpenROADM-3-1-DEG1DEG1-CTP-TX OpenROADM-3-1-SRG1SRG1-CP-RX OpenROADM-3-1-SRG1-SRG1-CP-TXtoOpenROADM-3-1-DEG1-DEG1-CTP-RX - DROP-LINK + DROP-LINK OpenROADM-3-1-DEG2-DEG2-CTP-TXtoOpenROADM-3-1-DEG1-DEG1-CTP-RX OpenROADM-3-1-DEG2DEG2-CTP-TX OpenROADM-3-1-DEG1DEG1-CTP-RX OpenROADM-3-1-DEG1-DEG1-CTP-TXtoOpenROADM-3-1-DEG2-DEG2-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-3-1-DEG2-DEG2-CTP-TXtoOpenROADM-3-1-DEG3-DEG3-CTP-RX OpenROADM-3-1-DEG2DEG2-CTP-TX OpenROADM-3-1-DEG3DEG3-CTP-RX OpenROADM-3-1-DEG3-DEG3-CTP-TXtoOpenROADM-3-1-DEG2-DEG2-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-3-1-SRG1-SRG1-CP-TXtoOpenROADM-3-1-DEG2-DEG2-CTP-RX OpenROADM-3-1-SRG1SRG1-CP-TX OpenROADM-3-1-DEG2DEG2-CTP-RX OpenROADM-3-1-DEG2-DEG2-CTP-TXtoOpenROADM-3-1-SRG1-SRG1-CP-RX - ADD-LINK + ADD-LINK OpenROADM-3-1-DEG2-DEG2-CTP-TXtoOpenROADM-3-1-SRG1-SRG1-CP-RX OpenROADM-3-1-DEG2DEG2-CTP-TX OpenROADM-3-1-SRG1SRG1-CP-RX OpenROADM-3-1-SRG1-SRG1-CP-TXtoOpenROADM-3-1-DEG2-DEG2-CTP-RX - DROP-LINK + DROP-LINK OpenROADM-3-1-DEG3-DEG3-CTP-TXtoOpenROADM-3-1-DEG1-DEG1-CTP-RX OpenROADM-3-1-DEG3DEG3-CTP-TX OpenROADM-3-1-DEG1DEG1-CTP-RX OpenROADM-3-1-DEG1-DEG1-CTP-TXtoOpenROADM-3-1-DEG3-DEG3-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-3-1-DEG3-DEG3-CTP-TXtoOpenROADM-3-1-DEG2-DEG2-CTP-RX OpenROADM-3-1-DEG3DEG3-CTP-TX OpenROADM-3-1-DEG2DEG2-CTP-RX OpenROADM-3-1-DEG2-DEG2-CTP-TXtoOpenROADM-3-1-DEG3-DEG3-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-3-1-SRG1-SRG1-CP-TXtoOpenROADM-3-1-DEG3-DEG3-CTP-RX OpenROADM-3-1-SRG1SRG1-CP-TX OpenROADM-3-1-DEG3DEG3-CTP-RX OpenROADM-3-1-DEG3-DEG3-CTP-TXtoOpenROADM-3-1-SRG1-SRG1-CP-RX - ADD-LINK + ADD-LINK OpenROADM-3-1-DEG3-DEG3-CTP-TXtoOpenROADM-3-1-SRG1-SRG1-CP-RX OpenROADM-3-1-DEG3DEG3-CTP-TX OpenROADM-3-1-SRG1SRG1-CP-RX OpenROADM-3-1-SRG1-SRG1-CP-TXtoOpenROADM-3-1-DEG3-DEG3-CTP-RX - DROP-LINK + DROP-LINK XPONDER-3-1XPDR-NW1-TX-toOpenROADM-3-1-SRG1-SRG1-PP1-RX XPONDER-3-1XPDR-NW1-TX OpenROADM-3-1-SRG1SRG1-PP1-RX OpenROADM-3-1-SRG1-SRG1-PP1-TX-to-XPONDER-3-1XPDR-NW1-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-3-1-SRG1-SRG1-PP1-TX-to-XPONDER-3-1XPDR-NW1-RX OpenROADM-3-1-SRG1SRG1-PP1-TX XPONDER-3-1XPDR-NW1-RX XPONDER-3-1XPDR-NW1-TX-toOpenROADM-3-1-SRG1-SRG1-PP1-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-3-1XPDR-NW2-TX-toOpenROADM-3-1-SRG1-SRG1-PP2-RX XPONDER-3-1XPDR-NW2-TX OpenROADM-3-1-SRG1SRG1-PP2-RX OpenROADM-3-1-SRG1-SRG1-PP2-TX-to-XPONDER-3-1XPDR-NW2-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-3-1-SRG1-SRG1-PP2-TX-to-XPONDER-3-1XPDR-NW2-RX OpenROADM-3-1-SRG1SRG1-PP2-TX XPONDER-3-1XPDR-NW2-RX XPONDER-3-1XPDR-NW2-TX-toOpenROADM-3-1-SRG1-SRG1-PP2-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-3-1XPDR-NW3-TX-toOpenROADM-3-1-SRG1-SRG1-PP3-RX XPONDER-3-1XPDR-NW3-TX OpenROADM-3-1-SRG1SRG1-PP3-RX OpenROADM-3-1-SRG1-SRG1-PP3-TX-to-XPONDER-3-1XPDR-NW3-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-3-1-SRG1-SRG1-PP3-TX-to-XPONDER-3-1XPDR-NW3-RX OpenROADM-3-1-SRG1SRG1-PP3-TX XPONDER-3-1XPDR-NW3-RX XPONDER-3-1XPDR-NW3-TX-toOpenROADM-3-1-SRG1-SRG1-PP3-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-3-1XPDR-NW4-TX-toOpenROADM-3-1-SRG1-SRG1-PP4-RX XPONDER-3-1XPDR-NW4-TX OpenROADM-3-1-SRG1SRG1-PP4-RX OpenROADM-3-1-SRG1-SRG1-PP4-TX-to-XPONDER-3-1XPDR-NW4-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-3-1-SRG1-SRG1-PP4-TX-to-XPONDER-3-1XPDR-NW4-RX OpenROADM-3-1-SRG1SRG1-PP4-TX XPONDER-3-1XPDR-NW4-RX XPONDER-3-1XPDR-NW4-TX-toOpenROADM-3-1-SRG1-SRG1-PP4-RX - XPONDER-INPUT + XPONDER-INPUT OpenROADM-3-2-DEG1-DEG1-CTP-TXtoOpenROADM-3-2-DEG2-DEG2-CTP-RX OpenROADM-3-2-DEG1DEG1-CTP-TX OpenROADM-3-2-DEG2DEG2-CTP-RX OpenROADM-3-2-DEG2-DEG2-CTP-TXtoOpenROADM-3-2-DEG1-DEG1-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-3-2-DEG1-DEG1-CTP-TXtoOpenROADM-3-2-DEG3-DEG3-CTP-RX OpenROADM-3-2-DEG1DEG1-CTP-TX OpenROADM-3-2-DEG3DEG3-CTP-RX OpenROADM-3-2-DEG3-DEG3-CTP-TXtoOpenROADM-3-2-DEG1-DEG1-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-3-2-SRG1-SRG1-CP-TXtoOpenROADM-3-2-DEG1-DEG1-CTP-RX OpenROADM-3-2-SRG1SRG1-CP-TX OpenROADM-3-2-DEG1DEG1-CTP-RX OpenROADM-3-2-DEG1-DEG1-CTP-TXtoOpenROADM-3-2-SRG1-SRG1-CP-RX - ADD-LINK + ADD-LINK OpenROADM-3-2-DEG1-DEG1-CTP-TXtoOpenROADM-3-2-SRG1-SRG1-CP-RX OpenROADM-3-2-DEG1DEG1-CTP-TX OpenROADM-3-2-SRG1SRG1-CP-RX OpenROADM-3-2-SRG1-SRG1-CP-TXtoOpenROADM-3-2-DEG1-DEG1-CTP-RX - DROP-LINK + DROP-LINK OpenROADM-3-2-DEG2-DEG2-CTP-TXtoOpenROADM-3-2-DEG1-DEG1-CTP-RX OpenROADM-3-2-DEG2DEG2-CTP-TX OpenROADM-3-2-DEG1DEG1-CTP-RX OpenROADM-3-2-DEG1-DEG1-CTP-TXtoOpenROADM-3-2-DEG2-DEG2-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-3-2-DEG2-DEG2-CTP-TXtoOpenROADM-3-2-DEG3-DEG3-CTP-RX OpenROADM-3-2-DEG2DEG2-CTP-TX OpenROADM-3-2-DEG3DEG3-CTP-RX OpenROADM-3-2-DEG3-DEG3-CTP-TXtoOpenROADM-3-2-DEG2-DEG2-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-3-2-SRG1-SRG1-CP-TXtoOpenROADM-3-2-DEG2-DEG2-CTP-RX OpenROADM-3-2-SRG1SRG1-CP-TX OpenROADM-3-2-DEG2DEG2-CTP-RX OpenROADM-3-2-DEG2-DEG2-CTP-TXtoOpenROADM-3-2-SRG1-SRG1-CP-RX - ADD-LINK + ADD-LINK OpenROADM-3-2-DEG2-DEG2-CTP-TXtoOpenROADM-3-2-SRG1-SRG1-CP-RX OpenROADM-3-2-DEG2DEG2-CTP-TX OpenROADM-3-2-SRG1SRG1-CP-RX OpenROADM-3-2-SRG1-SRG1-CP-TXtoOpenROADM-3-2-DEG2-DEG2-CTP-RX - DROP-LINK + DROP-LINK OpenROADM-3-2-DEG3-DEG3-CTP-TXtoOpenROADM-3-2-DEG1-DEG1-CTP-RX OpenROADM-3-2-DEG3DEG3-CTP-TX OpenROADM-3-2-DEG1DEG1-CTP-RX OpenROADM-3-2-DEG1-DEG1-CTP-TXtoOpenROADM-3-2-DEG3-DEG3-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-3-2-DEG3-DEG3-CTP-TXtoOpenROADM-3-2-DEG2-DEG2-CTP-RX OpenROADM-3-2-DEG3DEG3-CTP-TX OpenROADM-3-2-DEG2DEG2-CTP-RX OpenROADM-3-2-DEG2-DEG2-CTP-TXtoOpenROADM-3-2-DEG3-DEG3-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-3-2-SRG1-SRG1-CP-TXtoOpenROADM-3-2-DEG3-DEG3-CTP-RX OpenROADM-3-2-SRG1SRG1-CP-TX OpenROADM-3-2-DEG3DEG3-CTP-RX OpenROADM-3-2-DEG3-DEG3-CTP-TXtoOpenROADM-3-2-SRG1-SRG1-CP-RX - ADD-LINK + ADD-LINK OpenROADM-3-2-DEG3-DEG3-CTP-TXtoOpenROADM-3-2-SRG1-SRG1-CP-RX OpenROADM-3-2-DEG3DEG3-CTP-TX OpenROADM-3-2-SRG1SRG1-CP-RX OpenROADM-3-2-SRG1-SRG1-CP-TXtoOpenROADM-3-2-DEG3-DEG3-CTP-RX - DROP-LINK + DROP-LINK XPONDER-3-2XPDR-NW1-TX-toOpenROADM-3-2-SRG1-SRG1-PP1-RX XPONDER-3-2XPDR-NW1-TX OpenROADM-3-2-SRG1SRG1-PP1-RX OpenROADM-3-2-SRG1-SRG1-PP1-TX-to-XPONDER-3-2XPDR-NW1-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-3-2-SRG1-SRG1-PP1-TX-to-XPONDER-3-2XPDR-NW1-RX OpenROADM-3-2-SRG1SRG1-PP1-TX XPONDER-3-2XPDR-NW1-RX XPONDER-3-2XPDR-NW1-TX-toOpenROADM-3-2-SRG1-SRG1-PP1-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-3-2XPDR-NW2-TX-toOpenROADM-3-2-SRG1-SRG1-PP2-RX XPONDER-3-2XPDR-NW2-TX OpenROADM-3-2-SRG1SRG1-PP2-RX OpenROADM-3-2-SRG1-SRG1-PP2-TX-to-XPONDER-3-2XPDR-NW2-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-3-2-SRG1-SRG1-PP2-TX-to-XPONDER-3-2XPDR-NW2-RX OpenROADM-3-2-SRG1SRG1-PP2-TX XPONDER-3-2XPDR-NW2-RX XPONDER-3-2XPDR-NW2-TX-toOpenROADM-3-2-SRG1-SRG1-PP2-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-3-2XPDR-NW3-TX-toOpenROADM-3-2-SRG1-SRG1-PP3-RX XPONDER-3-2XPDR-NW3-TX OpenROADM-3-2-SRG1SRG1-PP3-RX OpenROADM-3-2-SRG1-SRG1-PP3-TX-to-XPONDER-3-2XPDR-NW3-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-3-2-SRG1-SRG1-PP3-TX-to-XPONDER-3-2XPDR-NW3-RX OpenROADM-3-2-SRG1SRG1-PP3-TX XPONDER-3-2XPDR-NW3-RX XPONDER-3-2XPDR-NW3-TX-toOpenROADM-3-2-SRG1-SRG1-PP3-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-3-2XPDR-NW4-TX-toOpenROADM-3-2-SRG1-SRG1-PP4-RX XPONDER-3-2XPDR-NW4-TX OpenROADM-3-2-SRG1SRG1-PP4-RX OpenROADM-3-2-SRG1-SRG1-PP4-TX-to-XPONDER-3-2XPDR-NW4-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-3-2-SRG1-SRG1-PP4-TX-to-XPONDER-3-2XPDR-NW4-RX OpenROADM-3-2-SRG1SRG1-PP4-TX XPONDER-3-2XPDR-NW4-RX XPONDER-3-2XPDR-NW4-TX-toOpenROADM-3-2-SRG1-SRG1-PP4-RX - XPONDER-INPUT + XPONDER-INPUT OpenROADM-3-3-DEG1-DEG1-CTP-TXtoOpenROADM-3-3-DEG2-DEG2-CTP-RX OpenROADM-3-3-DEG1DEG1-CTP-TX OpenROADM-3-3-DEG2DEG2-CTP-RX OpenROADM-3-3-DEG2-DEG2-CTP-TXtoOpenROADM-3-3-DEG1-DEG1-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-3-3-DEG1-DEG1-CTP-TXtoOpenROADM-3-3-DEG3-DEG3-CTP-RX OpenROADM-3-3-DEG1DEG1-CTP-TX OpenROADM-3-3-DEG3DEG3-CTP-RX OpenROADM-3-3-DEG3-DEG3-CTP-TXtoOpenROADM-3-3-DEG1-DEG1-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-3-3-SRG1-SRG1-CP-TXtoOpenROADM-3-3-DEG1-DEG1-CTP-RX OpenROADM-3-3-SRG1SRG1-CP-TX OpenROADM-3-3-DEG1DEG1-CTP-RX OpenROADM-3-3-DEG1-DEG1-CTP-TXtoOpenROADM-3-3-SRG1-SRG1-CP-RX - ADD-LINK + ADD-LINK OpenROADM-3-3-DEG1-DEG1-CTP-TXtoOpenROADM-3-3-SRG1-SRG1-CP-RX OpenROADM-3-3-DEG1DEG1-CTP-TX OpenROADM-3-3-SRG1SRG1-CP-RX OpenROADM-3-3-SRG1-SRG1-CP-TXtoOpenROADM-3-3-DEG1-DEG1-CTP-RX - DROP-LINK + DROP-LINK OpenROADM-3-3-DEG2-DEG2-CTP-TXtoOpenROADM-3-3-DEG1-DEG1-CTP-RX OpenROADM-3-3-DEG2DEG2-CTP-TX OpenROADM-3-3-DEG1DEG1-CTP-RX OpenROADM-3-3-DEG1-DEG1-CTP-TXtoOpenROADM-3-3-DEG2-DEG2-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-3-3-DEG2-DEG2-CTP-TXtoOpenROADM-3-3-DEG3-DEG3-CTP-RX OpenROADM-3-3-DEG2DEG2-CTP-TX OpenROADM-3-3-DEG3DEG3-CTP-RX OpenROADM-3-3-DEG3-DEG3-CTP-TXtoOpenROADM-3-3-DEG2-DEG2-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-3-3-SRG1-SRG1-CP-TXtoOpenROADM-3-3-DEG2-DEG2-CTP-RX OpenROADM-3-3-SRG1SRG1-CP-TX OpenROADM-3-3-DEG2DEG2-CTP-RX OpenROADM-3-3-DEG2-DEG2-CTP-TXtoOpenROADM-3-3-SRG1-SRG1-CP-RX - ADD-LINK + ADD-LINK OpenROADM-3-3-DEG2-DEG2-CTP-TXtoOpenROADM-3-3-SRG1-SRG1-CP-RX OpenROADM-3-3-DEG2DEG2-CTP-TX OpenROADM-3-3-SRG1SRG1-CP-RX OpenROADM-3-3-SRG1-SRG1-CP-TXtoOpenROADM-3-3-DEG2-DEG2-CTP-RX - DROP-LINK + DROP-LINK OpenROADM-3-3-DEG3-DEG3-CTP-TXtoOpenROADM-3-3-DEG1-DEG1-CTP-RX OpenROADM-3-3-DEG3DEG3-CTP-TX OpenROADM-3-3-DEG1DEG1-CTP-RX OpenROADM-3-3-DEG1-DEG1-CTP-TXtoOpenROADM-3-3-DEG3-DEG3-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-3-3-DEG3-DEG3-CTP-TXtoOpenROADM-3-3-DEG2-DEG2-CTP-RX OpenROADM-3-3-DEG3DEG3-CTP-TX OpenROADM-3-3-DEG2DEG2-CTP-RX OpenROADM-3-3-DEG2-DEG2-CTP-TXtoOpenROADM-3-3-DEG3-DEG3-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-3-3-SRG1-SRG1-CP-TXtoOpenROADM-3-3-DEG3-DEG3-CTP-RX OpenROADM-3-3-SRG1SRG1-CP-TX OpenROADM-3-3-DEG3DEG3-CTP-RX OpenROADM-3-3-DEG3-DEG3-CTP-TXtoOpenROADM-3-3-SRG1-SRG1-CP-RX - ADD-LINK + ADD-LINK OpenROADM-3-3-DEG3-DEG3-CTP-TXtoOpenROADM-3-3-SRG1-SRG1-CP-RX OpenROADM-3-3-DEG3DEG3-CTP-TX OpenROADM-3-3-SRG1SRG1-CP-RX OpenROADM-3-3-SRG1-SRG1-CP-TXtoOpenROADM-3-3-DEG3-DEG3-CTP-RX - DROP-LINK + DROP-LINK XPONDER-3-3XPDR-NW1-TX-toOpenROADM-3-3-SRG1-SRG1-PP1-RX XPONDER-3-3XPDR-NW1-TX OpenROADM-3-3-SRG1SRG1-PP1-RX OpenROADM-3-3-SRG1-SRG1-PP1-TX-to-XPONDER-3-3XPDR-NW1-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-3-3-SRG1-SRG1-PP1-TX-to-XPONDER-3-3XPDR-NW1-RX OpenROADM-3-3-SRG1SRG1-PP1-TX XPONDER-3-3XPDR-NW1-RX XPONDER-3-3XPDR-NW1-TX-toOpenROADM-3-3-SRG1-SRG1-PP1-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-3-3XPDR-NW2-TX-toOpenROADM-3-3-SRG1-SRG1-PP2-RX XPONDER-3-3XPDR-NW2-TX OpenROADM-3-3-SRG1SRG1-PP2-RX OpenROADM-3-3-SRG1-SRG1-PP2-TX-to-XPONDER-3-3XPDR-NW2-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-3-3-SRG1-SRG1-PP2-TX-to-XPONDER-3-3XPDR-NW2-RX OpenROADM-3-3-SRG1SRG1-PP2-TX XPONDER-3-3XPDR-NW2-RX XPONDER-3-3XPDR-NW2-TX-toOpenROADM-3-3-SRG1-SRG1-PP2-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-3-3XPDR-NW3-TX-toOpenROADM-3-3-SRG1-SRG1-PP3-RX XPONDER-3-3XPDR-NW3-TX OpenROADM-3-3-SRG1SRG1-PP3-RX OpenROADM-3-3-SRG1-SRG1-PP3-TX-to-XPONDER-3-3XPDR-NW3-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-3-3-SRG1-SRG1-PP3-TX-to-XPONDER-3-3XPDR-NW3-RX OpenROADM-3-3-SRG1SRG1-PP3-TX XPONDER-3-3XPDR-NW3-RX XPONDER-3-3XPDR-NW3-TX-toOpenROADM-3-3-SRG1-SRG1-PP3-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-3-3XPDR-NW4-TX-toOpenROADM-3-3-SRG1-SRG1-PP4-RX XPONDER-3-3XPDR-NW4-TX OpenROADM-3-3-SRG1SRG1-PP4-RX OpenROADM-3-3-SRG1-SRG1-PP4-TX-to-XPONDER-3-3XPDR-NW4-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-3-3-SRG1-SRG1-PP4-TX-to-XPONDER-3-3XPDR-NW4-RX OpenROADM-3-3-SRG1SRG1-PP4-TX XPONDER-3-3XPDR-NW4-RX XPONDER-3-3XPDR-NW4-TX-toOpenROADM-3-3-SRG1-SRG1-PP4-RX - XPONDER-INPUT + XPONDER-INPUT OpenROADM-3-4-DEG1-DEG1-CTP-TXtoOpenROADM-3-4-DEG2-DEG2-CTP-RX OpenROADM-3-4-DEG1DEG1-CTP-TX OpenROADM-3-4-DEG2DEG2-CTP-RX OpenROADM-3-4-DEG2-DEG2-CTP-TXtoOpenROADM-3-4-DEG1-DEG1-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-3-4-DEG1-DEG1-CTP-TXtoOpenROADM-3-4-DEG3-DEG3-CTP-RX OpenROADM-3-4-DEG1DEG1-CTP-TX OpenROADM-3-4-DEG3DEG3-CTP-RX OpenROADM-3-4-DEG3-DEG3-CTP-TXtoOpenROADM-3-4-DEG1-DEG1-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-3-4-SRG1-SRG1-CP-TXtoOpenROADM-3-4-DEG1-DEG1-CTP-RX OpenROADM-3-4-SRG1SRG1-CP-TX OpenROADM-3-4-DEG1DEG1-CTP-RX OpenROADM-3-4-DEG1-DEG1-CTP-TXtoOpenROADM-3-4-SRG1-SRG1-CP-RX - ADD-LINK + ADD-LINK OpenROADM-3-4-DEG1-DEG1-CTP-TXtoOpenROADM-3-4-SRG1-SRG1-CP-RX OpenROADM-3-4-DEG1DEG1-CTP-TX OpenROADM-3-4-SRG1SRG1-CP-RX OpenROADM-3-4-SRG1-SRG1-CP-TXtoOpenROADM-3-4-DEG1-DEG1-CTP-RX - DROP-LINK + DROP-LINK OpenROADM-3-4-DEG2-DEG2-CTP-TXtoOpenROADM-3-4-DEG1-DEG1-CTP-RX OpenROADM-3-4-DEG2DEG2-CTP-TX OpenROADM-3-4-DEG1DEG1-CTP-RX OpenROADM-3-4-DEG1-DEG1-CTP-TXtoOpenROADM-3-4-DEG2-DEG2-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-3-4-DEG2-DEG2-CTP-TXtoOpenROADM-3-4-DEG3-DEG3-CTP-RX OpenROADM-3-4-DEG2DEG2-CTP-TX OpenROADM-3-4-DEG3DEG3-CTP-RX OpenROADM-3-4-DEG3-DEG3-CTP-TXtoOpenROADM-3-4-DEG2-DEG2-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-3-4-SRG1-SRG1-CP-TXtoOpenROADM-3-4-DEG2-DEG2-CTP-RX OpenROADM-3-4-SRG1SRG1-CP-TX OpenROADM-3-4-DEG2DEG2-CTP-RX OpenROADM-3-4-DEG2-DEG2-CTP-TXtoOpenROADM-3-4-SRG1-SRG1-CP-RX - ADD-LINK + ADD-LINK OpenROADM-3-4-DEG2-DEG2-CTP-TXtoOpenROADM-3-4-SRG1-SRG1-CP-RX OpenROADM-3-4-DEG2DEG2-CTP-TX OpenROADM-3-4-SRG1SRG1-CP-RX OpenROADM-3-4-SRG1-SRG1-CP-TXtoOpenROADM-3-4-DEG2-DEG2-CTP-RX - DROP-LINK + DROP-LINK OpenROADM-3-4-DEG3-DEG3-CTP-TXtoOpenROADM-3-4-DEG1-DEG1-CTP-RX OpenROADM-3-4-DEG3DEG3-CTP-TX OpenROADM-3-4-DEG1DEG1-CTP-RX OpenROADM-3-4-DEG1-DEG1-CTP-TXtoOpenROADM-3-4-DEG3-DEG3-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-3-4-DEG3-DEG3-CTP-TXtoOpenROADM-3-4-DEG2-DEG2-CTP-RX OpenROADM-3-4-DEG3DEG3-CTP-TX OpenROADM-3-4-DEG2DEG2-CTP-RX OpenROADM-3-4-DEG2-DEG2-CTP-TXtoOpenROADM-3-4-DEG3-DEG3-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-3-4-SRG1-SRG1-CP-TXtoOpenROADM-3-4-DEG3-DEG3-CTP-RX OpenROADM-3-4-SRG1SRG1-CP-TX OpenROADM-3-4-DEG3DEG3-CTP-RX OpenROADM-3-4-DEG3-DEG3-CTP-TXtoOpenROADM-3-4-SRG1-SRG1-CP-RX - ADD-LINK + ADD-LINK OpenROADM-3-4-DEG3-DEG3-CTP-TXtoOpenROADM-3-4-SRG1-SRG1-CP-RX OpenROADM-3-4-DEG3DEG3-CTP-TX OpenROADM-3-4-SRG1SRG1-CP-RX OpenROADM-3-4-SRG1-SRG1-CP-TXtoOpenROADM-3-4-DEG3-DEG3-CTP-RX - DROP-LINK + DROP-LINK XPONDER-3-4XPDR-NW1-TX-toOpenROADM-3-4-SRG1-SRG1-PP1-RX XPONDER-3-4XPDR-NW1-TX OpenROADM-3-4-SRG1SRG1-PP1-RX OpenROADM-3-4-SRG1-SRG1-PP1-TX-to-XPONDER-3-4XPDR-NW1-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-3-4-SRG1-SRG1-PP1-TX-to-XPONDER-3-4XPDR-NW1-RX OpenROADM-3-4-SRG1SRG1-PP1-TX XPONDER-3-4XPDR-NW1-RX XPONDER-3-4XPDR-NW1-TX-toOpenROADM-3-4-SRG1-SRG1-PP1-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-3-4XPDR-NW2-TX-toOpenROADM-3-4-SRG1-SRG1-PP2-RX XPONDER-3-4XPDR-NW2-TX OpenROADM-3-4-SRG1SRG1-PP2-RX OpenROADM-3-4-SRG1-SRG1-PP2-TX-to-XPONDER-3-4XPDR-NW2-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-3-4-SRG1-SRG1-PP2-TX-to-XPONDER-3-4XPDR-NW2-RX OpenROADM-3-4-SRG1SRG1-PP2-TX XPONDER-3-4XPDR-NW2-RX XPONDER-3-4XPDR-NW2-TX-toOpenROADM-3-4-SRG1-SRG1-PP2-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-3-4XPDR-NW3-TX-toOpenROADM-3-4-SRG1-SRG1-PP3-RX XPONDER-3-4XPDR-NW3-TX OpenROADM-3-4-SRG1SRG1-PP3-RX OpenROADM-3-4-SRG1-SRG1-PP3-TX-to-XPONDER-3-4XPDR-NW3-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-3-4-SRG1-SRG1-PP3-TX-to-XPONDER-3-4XPDR-NW3-RX OpenROADM-3-4-SRG1SRG1-PP3-TX XPONDER-3-4XPDR-NW3-RX XPONDER-3-4XPDR-NW3-TX-toOpenROADM-3-4-SRG1-SRG1-PP3-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-3-4XPDR-NW4-TX-toOpenROADM-3-4-SRG1-SRG1-PP4-RX XPONDER-3-4XPDR-NW4-TX OpenROADM-3-4-SRG1SRG1-PP4-RX OpenROADM-3-4-SRG1-SRG1-PP4-TX-to-XPONDER-3-4XPDR-NW4-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-3-4-SRG1-SRG1-PP4-TX-to-XPONDER-3-4XPDR-NW4-RX OpenROADM-3-4-SRG1SRG1-PP4-TX XPONDER-3-4XPDR-NW4-RX XPONDER-3-4XPDR-NW4-TX-toOpenROADM-3-4-SRG1-SRG1-PP4-RX - XPONDER-INPUT + XPONDER-INPUT OpenROADM-3-1-DEG1-to-OpenROADM-3-2-DEG1 OpenROADM-3-2-DEG1-to-OpenROADM-3-1-DEG1 1 - ROADM-TO-ROADM + ROADM-TO-ROADM OpenROADM-3-1-DEG1DEG1-TTP-TX OpenROADM-3-2-DEG1DEG1-TTP-RX @@ -3353,7 +3353,7 @@ OpenROADM-3-2-DEG1-to-OpenROADM-3-1-DEG1 OpenROADM-3-1-DEG1-to-OpenROADM-3-2-DEG1 1 - ROADM-TO-ROADM + ROADM-TO-ROADM OpenROADM-3-2-DEG1DEG1-TTP-TX OpenROADM-3-1-DEG1DEG1-TTP-RX @@ -3378,7 +3378,7 @@ OpenROADM-3-2-DEG2-to-OpenROADM-3-3-DEG2 OpenROADM-3-3-DEG2-to-OpenROADM-3-2-DEG2 1 - ROADM-TO-ROADM + ROADM-TO-ROADM OpenROADM-3-2-DEG2DEG2-TTP-TX OpenROADM-3-3-DEG2DEG2-TTP-RX @@ -3403,7 +3403,7 @@ OpenROADM-3-3-DEG2-to-OpenROADM-3-2-DEG2 OpenROADM-3-2-DEG2-to-OpenROADM-3-3-DEG2 1 - ROADM-TO-ROADM + ROADM-TO-ROADM OpenROADM-3-3-DEG2DEG2-TTP-TX OpenROADM-3-2-DEG2DEG2-TTP-RX @@ -3428,7 +3428,7 @@ OpenROADM-3-3-DEG1-to-OpenROADM-3-4-DEG1 OpenROADM-3-4-DEG1-to-OpenROADM-3-3-DEG1 1 - ROADM-TO-ROADM + ROADM-TO-ROADM OpenROADM-3-3-DEG1DEG1-TTP-TX OpenROADM-3-4-DEG1DEG1-TTP-RX @@ -3453,7 +3453,7 @@ OpenROADM-3-4-DEG1-to-OpenROADM-3-3-DEG1 OpenROADM-3-3-DEG1-to-OpenROADM-3-4-DEG1 1 - ROADM-TO-ROADM + ROADM-TO-ROADM OpenROADM-3-4-DEG1DEG1-TTP-TX OpenROADM-3-3-DEG1DEG1-TTP-RX @@ -3478,7 +3478,7 @@ OpenROADM-3-4-DEG2-to-OpenROADM-3-1-DEG2 OpenROADM-3-1-DEG2-to-OpenROADM-3-4-DEG2 1 - ROADM-TO-ROADM + ROADM-TO-ROADM OpenROADM-3-4-DEG2DEG2-TTP-TX OpenROADM-3-1-DEG2DEG2-TTP-RX @@ -3503,7 +3503,7 @@ OpenROADM-3-1-DEG2-to-OpenROADM-3-4-DEG2 OpenROADM-3-4-DEG2-to-OpenROADM-3-1-DEG2 1 - ROADM-TO-ROADM + ROADM-TO-ROADM OpenROADM-3-1-DEG2DEG2-TTP-TX OpenROADM-3-4-DEG2DEG2-TTP-RX @@ -3527,328 +3527,328 @@ OpenROADM-4-1-DEG1-DEG1-CTP-TXtoOpenROADM-4-1-DEG2-DEG2-CTP-RX OpenROADM-4-1-DEG1DEG1-CTP-TX OpenROADM-4-1-DEG2DEG2-CTP-RX OpenROADM-4-1-DEG2-DEG2-CTP-TXtoOpenROADM-4-1-DEG1-DEG1-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-4-1-DEG1-DEG1-CTP-TXtoOpenROADM-4-1-DEG3-DEG3-CTP-RX OpenROADM-4-1-DEG1DEG1-CTP-TX OpenROADM-4-1-DEG3DEG3-CTP-RX OpenROADM-4-1-DEG3-DEG3-CTP-TXtoOpenROADM-4-1-DEG1-DEG1-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-4-1-SRG1-SRG1-CP-TXtoOpenROADM-4-1-DEG1-DEG1-CTP-RX OpenROADM-4-1-SRG1SRG1-CP-TX OpenROADM-4-1-DEG1DEG1-CTP-RX OpenROADM-4-1-DEG1-DEG1-CTP-TXtoOpenROADM-4-1-SRG1-SRG1-CP-RX - ADD-LINK + ADD-LINK OpenROADM-4-1-DEG1-DEG1-CTP-TXtoOpenROADM-4-1-SRG1-SRG1-CP-RX OpenROADM-4-1-DEG1DEG1-CTP-TX OpenROADM-4-1-SRG1SRG1-CP-RX OpenROADM-4-1-SRG1-SRG1-CP-TXtoOpenROADM-4-1-DEG1-DEG1-CTP-RX - DROP-LINK + DROP-LINK OpenROADM-4-1-DEG2-DEG2-CTP-TXtoOpenROADM-4-1-DEG1-DEG1-CTP-RX OpenROADM-4-1-DEG2DEG2-CTP-TX OpenROADM-4-1-DEG1DEG1-CTP-RX OpenROADM-4-1-DEG1-DEG1-CTP-TXtoOpenROADM-4-1-DEG2-DEG2-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-4-1-DEG2-DEG2-CTP-TXtoOpenROADM-4-1-DEG3-DEG3-CTP-RX OpenROADM-4-1-DEG2DEG2-CTP-TX OpenROADM-4-1-DEG3DEG3-CTP-RX OpenROADM-4-1-DEG3-DEG3-CTP-TXtoOpenROADM-4-1-DEG2-DEG2-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-4-1-SRG1-SRG1-CP-TXtoOpenROADM-4-1-DEG2-DEG2-CTP-RX OpenROADM-4-1-SRG1SRG1-CP-TX OpenROADM-4-1-DEG2DEG2-CTP-RX OpenROADM-4-1-DEG2-DEG2-CTP-TXtoOpenROADM-4-1-SRG1-SRG1-CP-RX - ADD-LINK + ADD-LINK OpenROADM-4-1-DEG2-DEG2-CTP-TXtoOpenROADM-4-1-SRG1-SRG1-CP-RX OpenROADM-4-1-DEG2DEG2-CTP-TX OpenROADM-4-1-SRG1SRG1-CP-RX OpenROADM-4-1-SRG1-SRG1-CP-TXtoOpenROADM-4-1-DEG2-DEG2-CTP-RX - DROP-LINK + DROP-LINK OpenROADM-4-1-DEG3-DEG3-CTP-TXtoOpenROADM-4-1-DEG1-DEG1-CTP-RX OpenROADM-4-1-DEG3DEG3-CTP-TX OpenROADM-4-1-DEG1DEG1-CTP-RX OpenROADM-4-1-DEG1-DEG1-CTP-TXtoOpenROADM-4-1-DEG3-DEG3-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-4-1-DEG3-DEG3-CTP-TXtoOpenROADM-4-1-DEG2-DEG2-CTP-RX OpenROADM-4-1-DEG3DEG3-CTP-TX OpenROADM-4-1-DEG2DEG2-CTP-RX OpenROADM-4-1-DEG2-DEG2-CTP-TXtoOpenROADM-4-1-DEG3-DEG3-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-4-1-SRG1-SRG1-CP-TXtoOpenROADM-4-1-DEG3-DEG3-CTP-RX OpenROADM-4-1-SRG1SRG1-CP-TX OpenROADM-4-1-DEG3DEG3-CTP-RX OpenROADM-4-1-DEG3-DEG3-CTP-TXtoOpenROADM-4-1-SRG1-SRG1-CP-RX - ADD-LINK + ADD-LINK OpenROADM-4-1-DEG3-DEG3-CTP-TXtoOpenROADM-4-1-SRG1-SRG1-CP-RX OpenROADM-4-1-DEG3DEG3-CTP-TX OpenROADM-4-1-SRG1SRG1-CP-RX OpenROADM-4-1-SRG1-SRG1-CP-TXtoOpenROADM-4-1-DEG3-DEG3-CTP-RX - DROP-LINK + DROP-LINK XPONDER-4-1XPDR-NW1-TX-toOpenROADM-4-1-SRG1-SRG1-PP1-RX XPONDER-4-1XPDR-NW1-TX OpenROADM-4-1-SRG1SRG1-PP1-RX OpenROADM-4-1-SRG1-SRG1-PP1-TX-to-XPONDER-4-1XPDR-NW1-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-4-1-SRG1-SRG1-PP1-TX-to-XPONDER-4-1XPDR-NW1-RX OpenROADM-4-1-SRG1SRG1-PP1-TX XPONDER-4-1XPDR-NW1-RX XPONDER-4-1XPDR-NW1-TX-toOpenROADM-4-1-SRG1-SRG1-PP1-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-4-1XPDR-NW2-TX-toOpenROADM-4-1-SRG1-SRG1-PP2-RX XPONDER-4-1XPDR-NW2-TX OpenROADM-4-1-SRG1SRG1-PP2-RX OpenROADM-4-1-SRG1-SRG1-PP2-TX-to-XPONDER-4-1XPDR-NW2-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-4-1-SRG1-SRG1-PP2-TX-to-XPONDER-4-1XPDR-NW2-RX OpenROADM-4-1-SRG1SRG1-PP2-TX XPONDER-4-1XPDR-NW2-RX XPONDER-4-1XPDR-NW2-TX-toOpenROADM-4-1-SRG1-SRG1-PP2-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-4-1XPDR-NW3-TX-toOpenROADM-4-1-SRG1-SRG1-PP3-RX XPONDER-4-1XPDR-NW3-TX OpenROADM-4-1-SRG1SRG1-PP3-RX OpenROADM-4-1-SRG1-SRG1-PP3-TX-to-XPONDER-4-1XPDR-NW3-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-4-1-SRG1-SRG1-PP3-TX-to-XPONDER-4-1XPDR-NW3-RX OpenROADM-4-1-SRG1SRG1-PP3-TX XPONDER-4-1XPDR-NW3-RX XPONDER-4-1XPDR-NW3-TX-toOpenROADM-4-1-SRG1-SRG1-PP3-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-4-1XPDR-NW4-TX-toOpenROADM-4-1-SRG1-SRG1-PP4-RX XPONDER-4-1XPDR-NW4-TX OpenROADM-4-1-SRG1SRG1-PP4-RX OpenROADM-4-1-SRG1-SRG1-PP4-TX-to-XPONDER-4-1XPDR-NW4-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-4-1-SRG1-SRG1-PP4-TX-to-XPONDER-4-1XPDR-NW4-RX OpenROADM-4-1-SRG1SRG1-PP4-TX XPONDER-4-1XPDR-NW4-RX XPONDER-4-1XPDR-NW4-TX-toOpenROADM-4-1-SRG1-SRG1-PP4-RX - XPONDER-INPUT + XPONDER-INPUT OpenROADM-4-2-DEG1-DEG1-CTP-TXtoOpenROADM-4-2-DEG2-DEG2-CTP-RX OpenROADM-4-2-DEG1DEG1-CTP-TX OpenROADM-4-2-DEG2DEG2-CTP-RX OpenROADM-4-2-DEG2-DEG2-CTP-TXtoOpenROADM-4-2-DEG1-DEG1-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-4-2-DEG1-DEG1-CTP-TXtoOpenROADM-4-2-DEG3-DEG3-CTP-RX OpenROADM-4-2-DEG1DEG1-CTP-TX OpenROADM-4-2-DEG3DEG3-CTP-RX OpenROADM-4-2-DEG3-DEG3-CTP-TXtoOpenROADM-4-2-DEG1-DEG1-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-4-2-SRG1-SRG1-CP-TXtoOpenROADM-4-2-DEG1-DEG1-CTP-RX OpenROADM-4-2-SRG1SRG1-CP-TX OpenROADM-4-2-DEG1DEG1-CTP-RX OpenROADM-4-2-DEG1-DEG1-CTP-TXtoOpenROADM-4-2-SRG1-SRG1-CP-RX - ADD-LINK + ADD-LINK OpenROADM-4-2-DEG1-DEG1-CTP-TXtoOpenROADM-4-2-SRG1-SRG1-CP-RX OpenROADM-4-2-DEG1DEG1-CTP-TX OpenROADM-4-2-SRG1SRG1-CP-RX OpenROADM-4-2-SRG1-SRG1-CP-TXtoOpenROADM-4-2-DEG1-DEG1-CTP-RX - DROP-LINK + DROP-LINK OpenROADM-4-2-DEG2-DEG2-CTP-TXtoOpenROADM-4-2-DEG1-DEG1-CTP-RX OpenROADM-4-2-DEG2DEG2-CTP-TX OpenROADM-4-2-DEG1DEG1-CTP-RX OpenROADM-4-2-DEG1-DEG1-CTP-TXtoOpenROADM-4-2-DEG2-DEG2-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-4-2-DEG2-DEG2-CTP-TXtoOpenROADM-4-2-DEG3-DEG3-CTP-RX OpenROADM-4-2-DEG2DEG2-CTP-TX OpenROADM-4-2-DEG3DEG3-CTP-RX OpenROADM-4-2-DEG3-DEG3-CTP-TXtoOpenROADM-4-2-DEG2-DEG2-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-4-2-SRG1-SRG1-CP-TXtoOpenROADM-4-2-DEG2-DEG2-CTP-RX OpenROADM-4-2-SRG1SRG1-CP-TX OpenROADM-4-2-DEG2DEG2-CTP-RX OpenROADM-4-2-DEG2-DEG2-CTP-TXtoOpenROADM-4-2-SRG1-SRG1-CP-RX - ADD-LINK + ADD-LINK OpenROADM-4-2-DEG2-DEG2-CTP-TXtoOpenROADM-4-2-SRG1-SRG1-CP-RX OpenROADM-4-2-DEG2DEG2-CTP-TX OpenROADM-4-2-SRG1SRG1-CP-RX OpenROADM-4-2-SRG1-SRG1-CP-TXtoOpenROADM-4-2-DEG2-DEG2-CTP-RX - DROP-LINK + DROP-LINK OpenROADM-4-2-DEG3-DEG3-CTP-TXtoOpenROADM-4-2-DEG1-DEG1-CTP-RX OpenROADM-4-2-DEG3DEG3-CTP-TX OpenROADM-4-2-DEG1DEG1-CTP-RX OpenROADM-4-2-DEG1-DEG1-CTP-TXtoOpenROADM-4-2-DEG3-DEG3-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-4-2-DEG3-DEG3-CTP-TXtoOpenROADM-4-2-DEG2-DEG2-CTP-RX OpenROADM-4-2-DEG3DEG3-CTP-TX OpenROADM-4-2-DEG2DEG2-CTP-RX OpenROADM-4-2-DEG2-DEG2-CTP-TXtoOpenROADM-4-2-DEG3-DEG3-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-4-2-SRG1-SRG1-CP-TXtoOpenROADM-4-2-DEG3-DEG3-CTP-RX OpenROADM-4-2-SRG1SRG1-CP-TX OpenROADM-4-2-DEG3DEG3-CTP-RX OpenROADM-4-2-DEG3-DEG3-CTP-TXtoOpenROADM-4-2-SRG1-SRG1-CP-RX - ADD-LINK + ADD-LINK OpenROADM-4-2-DEG3-DEG3-CTP-TXtoOpenROADM-4-2-SRG1-SRG1-CP-RX OpenROADM-4-2-DEG3DEG3-CTP-TX OpenROADM-4-2-SRG1SRG1-CP-RX OpenROADM-4-2-SRG1-SRG1-CP-TXtoOpenROADM-4-2-DEG3-DEG3-CTP-RX - DROP-LINK + DROP-LINK XPONDER-4-2XPDR-NW1-TX-toOpenROADM-4-2-SRG1-SRG1-PP1-RX XPONDER-4-2XPDR-NW1-TX OpenROADM-4-2-SRG1SRG1-PP1-RX OpenROADM-4-2-SRG1-SRG1-PP1-TX-to-XPONDER-4-2XPDR-NW1-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-4-2-SRG1-SRG1-PP1-TX-to-XPONDER-4-2XPDR-NW1-RX OpenROADM-4-2-SRG1SRG1-PP1-TX XPONDER-4-2XPDR-NW1-RX XPONDER-4-2XPDR-NW1-TX-toOpenROADM-4-2-SRG1-SRG1-PP1-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-4-2XPDR-NW2-TX-toOpenROADM-4-2-SRG1-SRG1-PP2-RX XPONDER-4-2XPDR-NW2-TX OpenROADM-4-2-SRG1SRG1-PP2-RX OpenROADM-4-2-SRG1-SRG1-PP2-TX-to-XPONDER-4-2XPDR-NW2-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-4-2-SRG1-SRG1-PP2-TX-to-XPONDER-4-2XPDR-NW2-RX OpenROADM-4-2-SRG1SRG1-PP2-TX XPONDER-4-2XPDR-NW2-RX XPONDER-4-2XPDR-NW2-TX-toOpenROADM-4-2-SRG1-SRG1-PP2-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-4-2XPDR-NW3-TX-toOpenROADM-4-2-SRG1-SRG1-PP3-RX XPONDER-4-2XPDR-NW3-TX OpenROADM-4-2-SRG1SRG1-PP3-RX OpenROADM-4-2-SRG1-SRG1-PP3-TX-to-XPONDER-4-2XPDR-NW3-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-4-2-SRG1-SRG1-PP3-TX-to-XPONDER-4-2XPDR-NW3-RX OpenROADM-4-2-SRG1SRG1-PP3-TX XPONDER-4-2XPDR-NW3-RX XPONDER-4-2XPDR-NW3-TX-toOpenROADM-4-2-SRG1-SRG1-PP3-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-4-2XPDR-NW4-TX-toOpenROADM-4-2-SRG1-SRG1-PP4-RX XPONDER-4-2XPDR-NW4-TX OpenROADM-4-2-SRG1SRG1-PP4-RX OpenROADM-4-2-SRG1-SRG1-PP4-TX-to-XPONDER-4-2XPDR-NW4-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-4-2-SRG1-SRG1-PP4-TX-to-XPONDER-4-2XPDR-NW4-RX OpenROADM-4-2-SRG1SRG1-PP4-TX XPONDER-4-2XPDR-NW4-RX XPONDER-4-2XPDR-NW4-TX-toOpenROADM-4-2-SRG1-SRG1-PP4-RX - XPONDER-INPUT + XPONDER-INPUT OpenROADM-4-3-DEG1-DEG1-CTP-TXtoOpenROADM-4-3-DEG2-DEG2-CTP-RX OpenROADM-4-3-DEG1DEG1-CTP-TX OpenROADM-4-3-DEG2DEG2-CTP-RX OpenROADM-4-3-DEG2-DEG2-CTP-TXtoOpenROADM-4-3-DEG1-DEG1-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-4-3-DEG1-DEG1-CTP-TXtoOpenROADM-4-3-DEG3-DEG3-CTP-RX OpenROADM-4-3-DEG1DEG1-CTP-TX OpenROADM-4-3-DEG3DEG3-CTP-RX OpenROADM-4-3-DEG3-DEG3-CTP-TXtoOpenROADM-4-3-DEG1-DEG1-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-4-3-SRG1-SRG1-CP-TXtoOpenROADM-4-3-DEG1-DEG1-CTP-RX OpenROADM-4-3-SRG1SRG1-CP-TX OpenROADM-4-3-DEG1DEG1-CTP-RX OpenROADM-4-3-DEG1-DEG1-CTP-TXtoOpenROADM-4-3-SRG1-SRG1-CP-RX - ADD-LINK + ADD-LINK OpenROADM-4-3-DEG1-DEG1-CTP-TXtoOpenROADM-4-3-SRG1-SRG1-CP-RX OpenROADM-4-3-DEG1DEG1-CTP-TX OpenROADM-4-3-SRG1SRG1-CP-RX OpenROADM-4-3-SRG1-SRG1-CP-TXtoOpenROADM-4-3-DEG1-DEG1-CTP-RX - DROP-LINK + DROP-LINK OpenROADM-4-3-DEG2-DEG2-CTP-TXtoOpenROADM-4-3-DEG1-DEG1-CTP-RX OpenROADM-4-3-DEG2DEG2-CTP-TX OpenROADM-4-3-DEG1DEG1-CTP-RX OpenROADM-4-3-DEG1-DEG1-CTP-TXtoOpenROADM-4-3-DEG2-DEG2-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-4-3-DEG2-DEG2-CTP-TXtoOpenROADM-4-3-DEG3-DEG3-CTP-RX OpenROADM-4-3-DEG2DEG2-CTP-TX OpenROADM-4-3-DEG3DEG3-CTP-RX OpenROADM-4-3-DEG3-DEG3-CTP-TXtoOpenROADM-4-3-DEG2-DEG2-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-4-3-SRG1-SRG1-CP-TXtoOpenROADM-4-3-DEG2-DEG2-CTP-RX OpenROADM-4-3-SRG1SRG1-CP-TX OpenROADM-4-3-DEG2DEG2-CTP-RX OpenROADM-4-3-DEG2-DEG2-CTP-TXtoOpenROADM-4-3-SRG1-SRG1-CP-RX - ADD-LINK + ADD-LINK OpenROADM-4-3-DEG2-DEG2-CTP-TXtoOpenROADM-4-3-SRG1-SRG1-CP-RX OpenROADM-4-3-DEG2DEG2-CTP-TX OpenROADM-4-3-SRG1SRG1-CP-RX OpenROADM-4-3-SRG1-SRG1-CP-TXtoOpenROADM-4-3-DEG2-DEG2-CTP-RX - DROP-LINK + DROP-LINK OpenROADM-4-3-DEG3-DEG3-CTP-TXtoOpenROADM-4-3-DEG1-DEG1-CTP-RX OpenROADM-4-3-DEG3DEG3-CTP-TX OpenROADM-4-3-DEG1DEG1-CTP-RX OpenROADM-4-3-DEG1-DEG1-CTP-TXtoOpenROADM-4-3-DEG3-DEG3-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-4-3-DEG3-DEG3-CTP-TXtoOpenROADM-4-3-DEG2-DEG2-CTP-RX OpenROADM-4-3-DEG3DEG3-CTP-TX OpenROADM-4-3-DEG2DEG2-CTP-RX OpenROADM-4-3-DEG2-DEG2-CTP-TXtoOpenROADM-4-3-DEG3-DEG3-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-4-3-SRG1-SRG1-CP-TXtoOpenROADM-4-3-DEG3-DEG3-CTP-RX OpenROADM-4-3-SRG1SRG1-CP-TX OpenROADM-4-3-DEG3DEG3-CTP-RX OpenROADM-4-3-DEG3-DEG3-CTP-TXtoOpenROADM-4-3-SRG1-SRG1-CP-RX - ADD-LINK + ADD-LINK OpenROADM-4-3-DEG3-DEG3-CTP-TXtoOpenROADM-4-3-SRG1-SRG1-CP-RX OpenROADM-4-3-DEG3DEG3-CTP-TX OpenROADM-4-3-SRG1SRG1-CP-RX OpenROADM-4-3-SRG1-SRG1-CP-TXtoOpenROADM-4-3-DEG3-DEG3-CTP-RX - DROP-LINK + DROP-LINK XPONDER-4-3XPDR-NW1-TX-toOpenROADM-4-3-SRG1-SRG1-PP1-RX XPONDER-4-3XPDR-NW1-TX OpenROADM-4-3-SRG1SRG1-PP1-RX OpenROADM-4-3-SRG1-SRG1-PP1-TX-to-XPONDER-4-3XPDR-NW1-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-4-3-SRG1-SRG1-PP1-TX-to-XPONDER-4-3XPDR-NW1-RX OpenROADM-4-3-SRG1SRG1-PP1-TX XPONDER-4-3XPDR-NW1-RX XPONDER-4-3XPDR-NW1-TX-toOpenROADM-4-3-SRG1-SRG1-PP1-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-4-3XPDR-NW2-TX-toOpenROADM-4-3-SRG1-SRG1-PP2-RX XPONDER-4-3XPDR-NW2-TX OpenROADM-4-3-SRG1SRG1-PP2-RX OpenROADM-4-3-SRG1-SRG1-PP2-TX-to-XPONDER-4-3XPDR-NW2-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-4-3-SRG1-SRG1-PP2-TX-to-XPONDER-4-3XPDR-NW2-RX OpenROADM-4-3-SRG1SRG1-PP2-TX XPONDER-4-3XPDR-NW2-RX XPONDER-4-3XPDR-NW2-TX-toOpenROADM-4-3-SRG1-SRG1-PP2-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-4-3XPDR-NW3-TX-toOpenROADM-4-3-SRG1-SRG1-PP3-RX XPONDER-4-3XPDR-NW3-TX OpenROADM-4-3-SRG1SRG1-PP3-RX OpenROADM-4-3-SRG1-SRG1-PP3-TX-to-XPONDER-4-3XPDR-NW3-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-4-3-SRG1-SRG1-PP3-TX-to-XPONDER-4-3XPDR-NW3-RX OpenROADM-4-3-SRG1SRG1-PP3-TX XPONDER-4-3XPDR-NW3-RX XPONDER-4-3XPDR-NW3-TX-toOpenROADM-4-3-SRG1-SRG1-PP3-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-4-3XPDR-NW4-TX-toOpenROADM-4-3-SRG1-SRG1-PP4-RX XPONDER-4-3XPDR-NW4-TX OpenROADM-4-3-SRG1SRG1-PP4-RX OpenROADM-4-3-SRG1-SRG1-PP4-TX-to-XPONDER-4-3XPDR-NW4-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-4-3-SRG1-SRG1-PP4-TX-to-XPONDER-4-3XPDR-NW4-RX OpenROADM-4-3-SRG1SRG1-PP4-TX XPONDER-4-3XPDR-NW4-RX XPONDER-4-3XPDR-NW4-TX-toOpenROADM-4-3-SRG1-SRG1-PP4-RX - XPONDER-INPUT + XPONDER-INPUT OpenROADM-4-4-DEG1-DEG1-CTP-TXtoOpenROADM-4-4-DEG2-DEG2-CTP-RX OpenROADM-4-4-DEG1DEG1-CTP-TX OpenROADM-4-4-DEG2DEG2-CTP-RX OpenROADM-4-4-DEG2-DEG2-CTP-TXtoOpenROADM-4-4-DEG1-DEG1-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-4-4-DEG1-DEG1-CTP-TXtoOpenROADM-4-4-DEG3-DEG3-CTP-RX OpenROADM-4-4-DEG1DEG1-CTP-TX OpenROADM-4-4-DEG3DEG3-CTP-RX OpenROADM-4-4-DEG3-DEG3-CTP-TXtoOpenROADM-4-4-DEG1-DEG1-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-4-4-SRG1-SRG1-CP-TXtoOpenROADM-4-4-DEG1-DEG1-CTP-RX OpenROADM-4-4-SRG1SRG1-CP-TX OpenROADM-4-4-DEG1DEG1-CTP-RX OpenROADM-4-4-DEG1-DEG1-CTP-TXtoOpenROADM-4-4-SRG1-SRG1-CP-RX - ADD-LINK + ADD-LINK OpenROADM-4-4-DEG1-DEG1-CTP-TXtoOpenROADM-4-4-SRG1-SRG1-CP-RX OpenROADM-4-4-DEG1DEG1-CTP-TX OpenROADM-4-4-SRG1SRG1-CP-RX OpenROADM-4-4-SRG1-SRG1-CP-TXtoOpenROADM-4-4-DEG1-DEG1-CTP-RX - DROP-LINK + DROP-LINK OpenROADM-4-4-DEG2-DEG2-CTP-TXtoOpenROADM-4-4-DEG1-DEG1-CTP-RX OpenROADM-4-4-DEG2DEG2-CTP-TX OpenROADM-4-4-DEG1DEG1-CTP-RX OpenROADM-4-4-DEG1-DEG1-CTP-TXtoOpenROADM-4-4-DEG2-DEG2-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-4-4-DEG2-DEG2-CTP-TXtoOpenROADM-4-4-DEG3-DEG3-CTP-RX OpenROADM-4-4-DEG2DEG2-CTP-TX OpenROADM-4-4-DEG3DEG3-CTP-RX OpenROADM-4-4-DEG3-DEG3-CTP-TXtoOpenROADM-4-4-DEG2-DEG2-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-4-4-SRG1-SRG1-CP-TXtoOpenROADM-4-4-DEG2-DEG2-CTP-RX OpenROADM-4-4-SRG1SRG1-CP-TX OpenROADM-4-4-DEG2DEG2-CTP-RX OpenROADM-4-4-DEG2-DEG2-CTP-TXtoOpenROADM-4-4-SRG1-SRG1-CP-RX - ADD-LINK + ADD-LINK OpenROADM-4-4-DEG2-DEG2-CTP-TXtoOpenROADM-4-4-SRG1-SRG1-CP-RX OpenROADM-4-4-DEG2DEG2-CTP-TX OpenROADM-4-4-SRG1SRG1-CP-RX OpenROADM-4-4-SRG1-SRG1-CP-TXtoOpenROADM-4-4-DEG2-DEG2-CTP-RX - DROP-LINK + DROP-LINK OpenROADM-4-4-DEG3-DEG3-CTP-TXtoOpenROADM-4-4-DEG1-DEG1-CTP-RX OpenROADM-4-4-DEG3DEG3-CTP-TX OpenROADM-4-4-DEG1DEG1-CTP-RX OpenROADM-4-4-DEG1-DEG1-CTP-TXtoOpenROADM-4-4-DEG3-DEG3-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-4-4-DEG3-DEG3-CTP-TXtoOpenROADM-4-4-DEG2-DEG2-CTP-RX OpenROADM-4-4-DEG3DEG3-CTP-TX OpenROADM-4-4-DEG2DEG2-CTP-RX OpenROADM-4-4-DEG2-DEG2-CTP-TXtoOpenROADM-4-4-DEG3-DEG3-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-4-4-SRG1-SRG1-CP-TXtoOpenROADM-4-4-DEG3-DEG3-CTP-RX OpenROADM-4-4-SRG1SRG1-CP-TX OpenROADM-4-4-DEG3DEG3-CTP-RX OpenROADM-4-4-DEG3-DEG3-CTP-TXtoOpenROADM-4-4-SRG1-SRG1-CP-RX - ADD-LINK + ADD-LINK OpenROADM-4-4-DEG3-DEG3-CTP-TXtoOpenROADM-4-4-SRG1-SRG1-CP-RX OpenROADM-4-4-DEG3DEG3-CTP-TX OpenROADM-4-4-SRG1SRG1-CP-RX OpenROADM-4-4-SRG1-SRG1-CP-TXtoOpenROADM-4-4-DEG3-DEG3-CTP-RX - DROP-LINK + DROP-LINK XPONDER-4-4XPDR-NW1-TX-toOpenROADM-4-4-SRG1-SRG1-PP1-RX XPONDER-4-4XPDR-NW1-TX OpenROADM-4-4-SRG1SRG1-PP1-RX OpenROADM-4-4-SRG1-SRG1-PP1-TX-to-XPONDER-4-4XPDR-NW1-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-4-4-SRG1-SRG1-PP1-TX-to-XPONDER-4-4XPDR-NW1-RX OpenROADM-4-4-SRG1SRG1-PP1-TX XPONDER-4-4XPDR-NW1-RX XPONDER-4-4XPDR-NW1-TX-toOpenROADM-4-4-SRG1-SRG1-PP1-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-4-4XPDR-NW2-TX-toOpenROADM-4-4-SRG1-SRG1-PP2-RX XPONDER-4-4XPDR-NW2-TX OpenROADM-4-4-SRG1SRG1-PP2-RX OpenROADM-4-4-SRG1-SRG1-PP2-TX-to-XPONDER-4-4XPDR-NW2-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-4-4-SRG1-SRG1-PP2-TX-to-XPONDER-4-4XPDR-NW2-RX OpenROADM-4-4-SRG1SRG1-PP2-TX XPONDER-4-4XPDR-NW2-RX XPONDER-4-4XPDR-NW2-TX-toOpenROADM-4-4-SRG1-SRG1-PP2-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-4-4XPDR-NW3-TX-toOpenROADM-4-4-SRG1-SRG1-PP3-RX XPONDER-4-4XPDR-NW3-TX OpenROADM-4-4-SRG1SRG1-PP3-RX OpenROADM-4-4-SRG1-SRG1-PP3-TX-to-XPONDER-4-4XPDR-NW3-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-4-4-SRG1-SRG1-PP3-TX-to-XPONDER-4-4XPDR-NW3-RX OpenROADM-4-4-SRG1SRG1-PP3-TX XPONDER-4-4XPDR-NW3-RX XPONDER-4-4XPDR-NW3-TX-toOpenROADM-4-4-SRG1-SRG1-PP3-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-4-4XPDR-NW4-TX-toOpenROADM-4-4-SRG1-SRG1-PP4-RX XPONDER-4-4XPDR-NW4-TX OpenROADM-4-4-SRG1SRG1-PP4-RX OpenROADM-4-4-SRG1-SRG1-PP4-TX-to-XPONDER-4-4XPDR-NW4-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-4-4-SRG1-SRG1-PP4-TX-to-XPONDER-4-4XPDR-NW4-RX OpenROADM-4-4-SRG1SRG1-PP4-TX XPONDER-4-4XPDR-NW4-RX XPONDER-4-4XPDR-NW4-TX-toOpenROADM-4-4-SRG1-SRG1-PP4-RX - XPONDER-INPUT + XPONDER-INPUT OpenROADM-4-1-DEG1-to-OpenROADM-4-2-DEG1 OpenROADM-4-2-DEG1-to-OpenROADM-4-1-DEG1 1 - ROADM-TO-ROADM + ROADM-TO-ROADM OpenROADM-4-1-DEG1DEG1-TTP-TX OpenROADM-4-2-DEG1DEG1-TTP-RX @@ -3873,7 +3873,7 @@ OpenROADM-4-2-DEG1-to-OpenROADM-4-1-DEG1 OpenROADM-4-1-DEG1-to-OpenROADM-4-2-DEG1 1 - ROADM-TO-ROADM + ROADM-TO-ROADM OpenROADM-4-2-DEG1DEG1-TTP-TX OpenROADM-4-1-DEG1DEG1-TTP-RX @@ -3898,7 +3898,7 @@ OpenROADM-4-2-DEG2-to-OpenROADM-4-3-DEG2 OpenROADM-4-3-DEG2-to-OpenROADM-4-2-DEG2 1 - ROADM-TO-ROADM + ROADM-TO-ROADM OpenROADM-4-2-DEG2DEG2-TTP-TX OpenROADM-4-3-DEG2DEG2-TTP-RX @@ -3923,7 +3923,7 @@ OpenROADM-4-3-DEG2-to-OpenROADM-4-2-DEG2 OpenROADM-4-2-DEG2-to-OpenROADM-4-3-DEG2 1 - ROADM-TO-ROADM + ROADM-TO-ROADM OpenROADM-4-3-DEG2DEG2-TTP-TX OpenROADM-4-2-DEG2DEG2-TTP-RX @@ -3948,7 +3948,7 @@ OpenROADM-4-3-DEG1-to-OpenROADM-4-4-DEG1 OpenROADM-4-4-DEG1-to-OpenROADM-4-3-DEG1 1 - ROADM-TO-ROADM + ROADM-TO-ROADM OpenROADM-4-3-DEG1DEG1-TTP-TX OpenROADM-4-4-DEG1DEG1-TTP-RX @@ -3973,7 +3973,7 @@ OpenROADM-4-4-DEG1-to-OpenROADM-4-3-DEG1 OpenROADM-4-3-DEG1-to-OpenROADM-4-4-DEG1 1 - ROADM-TO-ROADM + ROADM-TO-ROADM OpenROADM-4-4-DEG1DEG1-TTP-TX OpenROADM-4-3-DEG1DEG1-TTP-RX @@ -3998,7 +3998,7 @@ OpenROADM-4-4-DEG2-to-OpenROADM-4-1-DEG2 OpenROADM-4-1-DEG2-to-OpenROADM-4-4-DEG2 1 - ROADM-TO-ROADM + ROADM-TO-ROADM OpenROADM-4-4-DEG2DEG2-TTP-TX OpenROADM-4-1-DEG2DEG2-TTP-RX @@ -4023,7 +4023,7 @@ OpenROADM-4-1-DEG2-to-OpenROADM-4-4-DEG2 OpenROADM-4-4-DEG2-to-OpenROADM-4-1-DEG2 1 - ROADM-TO-ROADM + ROADM-TO-ROADM OpenROADM-4-1-DEG2DEG2-TTP-TX OpenROADM-4-4-DEG2DEG2-TTP-RX @@ -4047,328 +4047,328 @@ OpenROADM-5-1-DEG1-DEG1-CTP-TXtoOpenROADM-5-1-DEG2-DEG2-CTP-RX OpenROADM-5-1-DEG1DEG1-CTP-TX OpenROADM-5-1-DEG2DEG2-CTP-RX OpenROADM-5-1-DEG2-DEG2-CTP-TXtoOpenROADM-5-1-DEG1-DEG1-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-5-1-DEG1-DEG1-CTP-TXtoOpenROADM-5-1-DEG3-DEG3-CTP-RX OpenROADM-5-1-DEG1DEG1-CTP-TX OpenROADM-5-1-DEG3DEG3-CTP-RX OpenROADM-5-1-DEG3-DEG3-CTP-TXtoOpenROADM-5-1-DEG1-DEG1-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-5-1-SRG1-SRG1-CP-TXtoOpenROADM-5-1-DEG1-DEG1-CTP-RX OpenROADM-5-1-SRG1SRG1-CP-TX OpenROADM-5-1-DEG1DEG1-CTP-RX OpenROADM-5-1-DEG1-DEG1-CTP-TXtoOpenROADM-5-1-SRG1-SRG1-CP-RX - ADD-LINK + ADD-LINK OpenROADM-5-1-DEG1-DEG1-CTP-TXtoOpenROADM-5-1-SRG1-SRG1-CP-RX OpenROADM-5-1-DEG1DEG1-CTP-TX OpenROADM-5-1-SRG1SRG1-CP-RX OpenROADM-5-1-SRG1-SRG1-CP-TXtoOpenROADM-5-1-DEG1-DEG1-CTP-RX - DROP-LINK + DROP-LINK OpenROADM-5-1-DEG2-DEG2-CTP-TXtoOpenROADM-5-1-DEG1-DEG1-CTP-RX OpenROADM-5-1-DEG2DEG2-CTP-TX OpenROADM-5-1-DEG1DEG1-CTP-RX OpenROADM-5-1-DEG1-DEG1-CTP-TXtoOpenROADM-5-1-DEG2-DEG2-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-5-1-DEG2-DEG2-CTP-TXtoOpenROADM-5-1-DEG3-DEG3-CTP-RX OpenROADM-5-1-DEG2DEG2-CTP-TX OpenROADM-5-1-DEG3DEG3-CTP-RX OpenROADM-5-1-DEG3-DEG3-CTP-TXtoOpenROADM-5-1-DEG2-DEG2-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-5-1-SRG1-SRG1-CP-TXtoOpenROADM-5-1-DEG2-DEG2-CTP-RX OpenROADM-5-1-SRG1SRG1-CP-TX OpenROADM-5-1-DEG2DEG2-CTP-RX OpenROADM-5-1-DEG2-DEG2-CTP-TXtoOpenROADM-5-1-SRG1-SRG1-CP-RX - ADD-LINK + ADD-LINK OpenROADM-5-1-DEG2-DEG2-CTP-TXtoOpenROADM-5-1-SRG1-SRG1-CP-RX OpenROADM-5-1-DEG2DEG2-CTP-TX OpenROADM-5-1-SRG1SRG1-CP-RX OpenROADM-5-1-SRG1-SRG1-CP-TXtoOpenROADM-5-1-DEG2-DEG2-CTP-RX - DROP-LINK + DROP-LINK OpenROADM-5-1-DEG3-DEG3-CTP-TXtoOpenROADM-5-1-DEG1-DEG1-CTP-RX OpenROADM-5-1-DEG3DEG3-CTP-TX OpenROADM-5-1-DEG1DEG1-CTP-RX OpenROADM-5-1-DEG1-DEG1-CTP-TXtoOpenROADM-5-1-DEG3-DEG3-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-5-1-DEG3-DEG3-CTP-TXtoOpenROADM-5-1-DEG2-DEG2-CTP-RX OpenROADM-5-1-DEG3DEG3-CTP-TX OpenROADM-5-1-DEG2DEG2-CTP-RX OpenROADM-5-1-DEG2-DEG2-CTP-TXtoOpenROADM-5-1-DEG3-DEG3-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-5-1-SRG1-SRG1-CP-TXtoOpenROADM-5-1-DEG3-DEG3-CTP-RX OpenROADM-5-1-SRG1SRG1-CP-TX OpenROADM-5-1-DEG3DEG3-CTP-RX OpenROADM-5-1-DEG3-DEG3-CTP-TXtoOpenROADM-5-1-SRG1-SRG1-CP-RX - ADD-LINK + ADD-LINK OpenROADM-5-1-DEG3-DEG3-CTP-TXtoOpenROADM-5-1-SRG1-SRG1-CP-RX OpenROADM-5-1-DEG3DEG3-CTP-TX OpenROADM-5-1-SRG1SRG1-CP-RX OpenROADM-5-1-SRG1-SRG1-CP-TXtoOpenROADM-5-1-DEG3-DEG3-CTP-RX - DROP-LINK + DROP-LINK XPONDER-5-1XPDR-NW1-TX-toOpenROADM-5-1-SRG1-SRG1-PP1-RX XPONDER-5-1XPDR-NW1-TX OpenROADM-5-1-SRG1SRG1-PP1-RX OpenROADM-5-1-SRG1-SRG1-PP1-TX-to-XPONDER-5-1XPDR-NW1-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-5-1-SRG1-SRG1-PP1-TX-to-XPONDER-5-1XPDR-NW1-RX OpenROADM-5-1-SRG1SRG1-PP1-TX XPONDER-5-1XPDR-NW1-RX XPONDER-5-1XPDR-NW1-TX-toOpenROADM-5-1-SRG1-SRG1-PP1-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-5-1XPDR-NW2-TX-toOpenROADM-5-1-SRG1-SRG1-PP2-RX XPONDER-5-1XPDR-NW2-TX OpenROADM-5-1-SRG1SRG1-PP2-RX OpenROADM-5-1-SRG1-SRG1-PP2-TX-to-XPONDER-5-1XPDR-NW2-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-5-1-SRG1-SRG1-PP2-TX-to-XPONDER-5-1XPDR-NW2-RX OpenROADM-5-1-SRG1SRG1-PP2-TX XPONDER-5-1XPDR-NW2-RX XPONDER-5-1XPDR-NW2-TX-toOpenROADM-5-1-SRG1-SRG1-PP2-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-5-1XPDR-NW3-TX-toOpenROADM-5-1-SRG1-SRG1-PP3-RX XPONDER-5-1XPDR-NW3-TX OpenROADM-5-1-SRG1SRG1-PP3-RX OpenROADM-5-1-SRG1-SRG1-PP3-TX-to-XPONDER-5-1XPDR-NW3-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-5-1-SRG1-SRG1-PP3-TX-to-XPONDER-5-1XPDR-NW3-RX OpenROADM-5-1-SRG1SRG1-PP3-TX XPONDER-5-1XPDR-NW3-RX XPONDER-5-1XPDR-NW3-TX-toOpenROADM-5-1-SRG1-SRG1-PP3-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-5-1XPDR-NW4-TX-toOpenROADM-5-1-SRG1-SRG1-PP4-RX XPONDER-5-1XPDR-NW4-TX OpenROADM-5-1-SRG1SRG1-PP4-RX OpenROADM-5-1-SRG1-SRG1-PP4-TX-to-XPONDER-5-1XPDR-NW4-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-5-1-SRG1-SRG1-PP4-TX-to-XPONDER-5-1XPDR-NW4-RX OpenROADM-5-1-SRG1SRG1-PP4-TX XPONDER-5-1XPDR-NW4-RX XPONDER-5-1XPDR-NW4-TX-toOpenROADM-5-1-SRG1-SRG1-PP4-RX - XPONDER-INPUT + XPONDER-INPUT OpenROADM-5-2-DEG1-DEG1-CTP-TXtoOpenROADM-5-2-DEG2-DEG2-CTP-RX OpenROADM-5-2-DEG1DEG1-CTP-TX OpenROADM-5-2-DEG2DEG2-CTP-RX OpenROADM-5-2-DEG2-DEG2-CTP-TXtoOpenROADM-5-2-DEG1-DEG1-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-5-2-DEG1-DEG1-CTP-TXtoOpenROADM-5-2-DEG3-DEG3-CTP-RX OpenROADM-5-2-DEG1DEG1-CTP-TX OpenROADM-5-2-DEG3DEG3-CTP-RX OpenROADM-5-2-DEG3-DEG3-CTP-TXtoOpenROADM-5-2-DEG1-DEG1-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-5-2-SRG1-SRG1-CP-TXtoOpenROADM-5-2-DEG1-DEG1-CTP-RX OpenROADM-5-2-SRG1SRG1-CP-TX OpenROADM-5-2-DEG1DEG1-CTP-RX OpenROADM-5-2-DEG1-DEG1-CTP-TXtoOpenROADM-5-2-SRG1-SRG1-CP-RX - ADD-LINK + ADD-LINK OpenROADM-5-2-DEG1-DEG1-CTP-TXtoOpenROADM-5-2-SRG1-SRG1-CP-RX OpenROADM-5-2-DEG1DEG1-CTP-TX OpenROADM-5-2-SRG1SRG1-CP-RX OpenROADM-5-2-SRG1-SRG1-CP-TXtoOpenROADM-5-2-DEG1-DEG1-CTP-RX - DROP-LINK + DROP-LINK OpenROADM-5-2-DEG2-DEG2-CTP-TXtoOpenROADM-5-2-DEG1-DEG1-CTP-RX OpenROADM-5-2-DEG2DEG2-CTP-TX OpenROADM-5-2-DEG1DEG1-CTP-RX OpenROADM-5-2-DEG1-DEG1-CTP-TXtoOpenROADM-5-2-DEG2-DEG2-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-5-2-DEG2-DEG2-CTP-TXtoOpenROADM-5-2-DEG3-DEG3-CTP-RX OpenROADM-5-2-DEG2DEG2-CTP-TX OpenROADM-5-2-DEG3DEG3-CTP-RX OpenROADM-5-2-DEG3-DEG3-CTP-TXtoOpenROADM-5-2-DEG2-DEG2-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-5-2-SRG1-SRG1-CP-TXtoOpenROADM-5-2-DEG2-DEG2-CTP-RX OpenROADM-5-2-SRG1SRG1-CP-TX OpenROADM-5-2-DEG2DEG2-CTP-RX OpenROADM-5-2-DEG2-DEG2-CTP-TXtoOpenROADM-5-2-SRG1-SRG1-CP-RX - ADD-LINK + ADD-LINK OpenROADM-5-2-DEG2-DEG2-CTP-TXtoOpenROADM-5-2-SRG1-SRG1-CP-RX OpenROADM-5-2-DEG2DEG2-CTP-TX OpenROADM-5-2-SRG1SRG1-CP-RX OpenROADM-5-2-SRG1-SRG1-CP-TXtoOpenROADM-5-2-DEG2-DEG2-CTP-RX - DROP-LINK + DROP-LINK OpenROADM-5-2-DEG3-DEG3-CTP-TXtoOpenROADM-5-2-DEG1-DEG1-CTP-RX OpenROADM-5-2-DEG3DEG3-CTP-TX OpenROADM-5-2-DEG1DEG1-CTP-RX OpenROADM-5-2-DEG1-DEG1-CTP-TXtoOpenROADM-5-2-DEG3-DEG3-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-5-2-DEG3-DEG3-CTP-TXtoOpenROADM-5-2-DEG2-DEG2-CTP-RX OpenROADM-5-2-DEG3DEG3-CTP-TX OpenROADM-5-2-DEG2DEG2-CTP-RX OpenROADM-5-2-DEG2-DEG2-CTP-TXtoOpenROADM-5-2-DEG3-DEG3-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-5-2-SRG1-SRG1-CP-TXtoOpenROADM-5-2-DEG3-DEG3-CTP-RX OpenROADM-5-2-SRG1SRG1-CP-TX OpenROADM-5-2-DEG3DEG3-CTP-RX OpenROADM-5-2-DEG3-DEG3-CTP-TXtoOpenROADM-5-2-SRG1-SRG1-CP-RX - ADD-LINK + ADD-LINK OpenROADM-5-2-DEG3-DEG3-CTP-TXtoOpenROADM-5-2-SRG1-SRG1-CP-RX OpenROADM-5-2-DEG3DEG3-CTP-TX OpenROADM-5-2-SRG1SRG1-CP-RX OpenROADM-5-2-SRG1-SRG1-CP-TXtoOpenROADM-5-2-DEG3-DEG3-CTP-RX - DROP-LINK + DROP-LINK XPONDER-5-2XPDR-NW1-TX-toOpenROADM-5-2-SRG1-SRG1-PP1-RX XPONDER-5-2XPDR-NW1-TX OpenROADM-5-2-SRG1SRG1-PP1-RX OpenROADM-5-2-SRG1-SRG1-PP1-TX-to-XPONDER-5-2XPDR-NW1-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-5-2-SRG1-SRG1-PP1-TX-to-XPONDER-5-2XPDR-NW1-RX OpenROADM-5-2-SRG1SRG1-PP1-TX XPONDER-5-2XPDR-NW1-RX XPONDER-5-2XPDR-NW1-TX-toOpenROADM-5-2-SRG1-SRG1-PP1-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-5-2XPDR-NW2-TX-toOpenROADM-5-2-SRG1-SRG1-PP2-RX XPONDER-5-2XPDR-NW2-TX OpenROADM-5-2-SRG1SRG1-PP2-RX OpenROADM-5-2-SRG1-SRG1-PP2-TX-to-XPONDER-5-2XPDR-NW2-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-5-2-SRG1-SRG1-PP2-TX-to-XPONDER-5-2XPDR-NW2-RX OpenROADM-5-2-SRG1SRG1-PP2-TX XPONDER-5-2XPDR-NW2-RX XPONDER-5-2XPDR-NW2-TX-toOpenROADM-5-2-SRG1-SRG1-PP2-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-5-2XPDR-NW3-TX-toOpenROADM-5-2-SRG1-SRG1-PP3-RX XPONDER-5-2XPDR-NW3-TX OpenROADM-5-2-SRG1SRG1-PP3-RX OpenROADM-5-2-SRG1-SRG1-PP3-TX-to-XPONDER-5-2XPDR-NW3-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-5-2-SRG1-SRG1-PP3-TX-to-XPONDER-5-2XPDR-NW3-RX OpenROADM-5-2-SRG1SRG1-PP3-TX XPONDER-5-2XPDR-NW3-RX XPONDER-5-2XPDR-NW3-TX-toOpenROADM-5-2-SRG1-SRG1-PP3-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-5-2XPDR-NW4-TX-toOpenROADM-5-2-SRG1-SRG1-PP4-RX XPONDER-5-2XPDR-NW4-TX OpenROADM-5-2-SRG1SRG1-PP4-RX OpenROADM-5-2-SRG1-SRG1-PP4-TX-to-XPONDER-5-2XPDR-NW4-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-5-2-SRG1-SRG1-PP4-TX-to-XPONDER-5-2XPDR-NW4-RX OpenROADM-5-2-SRG1SRG1-PP4-TX XPONDER-5-2XPDR-NW4-RX XPONDER-5-2XPDR-NW4-TX-toOpenROADM-5-2-SRG1-SRG1-PP4-RX - XPONDER-INPUT + XPONDER-INPUT OpenROADM-5-3-DEG1-DEG1-CTP-TXtoOpenROADM-5-3-DEG2-DEG2-CTP-RX OpenROADM-5-3-DEG1DEG1-CTP-TX OpenROADM-5-3-DEG2DEG2-CTP-RX OpenROADM-5-3-DEG2-DEG2-CTP-TXtoOpenROADM-5-3-DEG1-DEG1-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-5-3-DEG1-DEG1-CTP-TXtoOpenROADM-5-3-DEG3-DEG3-CTP-RX OpenROADM-5-3-DEG1DEG1-CTP-TX OpenROADM-5-3-DEG3DEG3-CTP-RX OpenROADM-5-3-DEG3-DEG3-CTP-TXtoOpenROADM-5-3-DEG1-DEG1-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-5-3-SRG1-SRG1-CP-TXtoOpenROADM-5-3-DEG1-DEG1-CTP-RX OpenROADM-5-3-SRG1SRG1-CP-TX OpenROADM-5-3-DEG1DEG1-CTP-RX OpenROADM-5-3-DEG1-DEG1-CTP-TXtoOpenROADM-5-3-SRG1-SRG1-CP-RX - ADD-LINK + ADD-LINK OpenROADM-5-3-DEG1-DEG1-CTP-TXtoOpenROADM-5-3-SRG1-SRG1-CP-RX OpenROADM-5-3-DEG1DEG1-CTP-TX OpenROADM-5-3-SRG1SRG1-CP-RX OpenROADM-5-3-SRG1-SRG1-CP-TXtoOpenROADM-5-3-DEG1-DEG1-CTP-RX - DROP-LINK + DROP-LINK OpenROADM-5-3-DEG2-DEG2-CTP-TXtoOpenROADM-5-3-DEG1-DEG1-CTP-RX OpenROADM-5-3-DEG2DEG2-CTP-TX OpenROADM-5-3-DEG1DEG1-CTP-RX OpenROADM-5-3-DEG1-DEG1-CTP-TXtoOpenROADM-5-3-DEG2-DEG2-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-5-3-DEG2-DEG2-CTP-TXtoOpenROADM-5-3-DEG3-DEG3-CTP-RX OpenROADM-5-3-DEG2DEG2-CTP-TX OpenROADM-5-3-DEG3DEG3-CTP-RX OpenROADM-5-3-DEG3-DEG3-CTP-TXtoOpenROADM-5-3-DEG2-DEG2-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-5-3-SRG1-SRG1-CP-TXtoOpenROADM-5-3-DEG2-DEG2-CTP-RX OpenROADM-5-3-SRG1SRG1-CP-TX OpenROADM-5-3-DEG2DEG2-CTP-RX OpenROADM-5-3-DEG2-DEG2-CTP-TXtoOpenROADM-5-3-SRG1-SRG1-CP-RX - ADD-LINK + ADD-LINK OpenROADM-5-3-DEG2-DEG2-CTP-TXtoOpenROADM-5-3-SRG1-SRG1-CP-RX OpenROADM-5-3-DEG2DEG2-CTP-TX OpenROADM-5-3-SRG1SRG1-CP-RX OpenROADM-5-3-SRG1-SRG1-CP-TXtoOpenROADM-5-3-DEG2-DEG2-CTP-RX - DROP-LINK + DROP-LINK OpenROADM-5-3-DEG3-DEG3-CTP-TXtoOpenROADM-5-3-DEG1-DEG1-CTP-RX OpenROADM-5-3-DEG3DEG3-CTP-TX OpenROADM-5-3-DEG1DEG1-CTP-RX OpenROADM-5-3-DEG1-DEG1-CTP-TXtoOpenROADM-5-3-DEG3-DEG3-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-5-3-DEG3-DEG3-CTP-TXtoOpenROADM-5-3-DEG2-DEG2-CTP-RX OpenROADM-5-3-DEG3DEG3-CTP-TX OpenROADM-5-3-DEG2DEG2-CTP-RX OpenROADM-5-3-DEG2-DEG2-CTP-TXtoOpenROADM-5-3-DEG3-DEG3-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-5-3-SRG1-SRG1-CP-TXtoOpenROADM-5-3-DEG3-DEG3-CTP-RX OpenROADM-5-3-SRG1SRG1-CP-TX OpenROADM-5-3-DEG3DEG3-CTP-RX OpenROADM-5-3-DEG3-DEG3-CTP-TXtoOpenROADM-5-3-SRG1-SRG1-CP-RX - ADD-LINK + ADD-LINK OpenROADM-5-3-DEG3-DEG3-CTP-TXtoOpenROADM-5-3-SRG1-SRG1-CP-RX OpenROADM-5-3-DEG3DEG3-CTP-TX OpenROADM-5-3-SRG1SRG1-CP-RX OpenROADM-5-3-SRG1-SRG1-CP-TXtoOpenROADM-5-3-DEG3-DEG3-CTP-RX - DROP-LINK + DROP-LINK XPONDER-5-3XPDR-NW1-TX-toOpenROADM-5-3-SRG1-SRG1-PP1-RX XPONDER-5-3XPDR-NW1-TX OpenROADM-5-3-SRG1SRG1-PP1-RX OpenROADM-5-3-SRG1-SRG1-PP1-TX-to-XPONDER-5-3XPDR-NW1-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-5-3-SRG1-SRG1-PP1-TX-to-XPONDER-5-3XPDR-NW1-RX OpenROADM-5-3-SRG1SRG1-PP1-TX XPONDER-5-3XPDR-NW1-RX XPONDER-5-3XPDR-NW1-TX-toOpenROADM-5-3-SRG1-SRG1-PP1-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-5-3XPDR-NW2-TX-toOpenROADM-5-3-SRG1-SRG1-PP2-RX XPONDER-5-3XPDR-NW2-TX OpenROADM-5-3-SRG1SRG1-PP2-RX OpenROADM-5-3-SRG1-SRG1-PP2-TX-to-XPONDER-5-3XPDR-NW2-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-5-3-SRG1-SRG1-PP2-TX-to-XPONDER-5-3XPDR-NW2-RX OpenROADM-5-3-SRG1SRG1-PP2-TX XPONDER-5-3XPDR-NW2-RX XPONDER-5-3XPDR-NW2-TX-toOpenROADM-5-3-SRG1-SRG1-PP2-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-5-3XPDR-NW3-TX-toOpenROADM-5-3-SRG1-SRG1-PP3-RX XPONDER-5-3XPDR-NW3-TX OpenROADM-5-3-SRG1SRG1-PP3-RX OpenROADM-5-3-SRG1-SRG1-PP3-TX-to-XPONDER-5-3XPDR-NW3-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-5-3-SRG1-SRG1-PP3-TX-to-XPONDER-5-3XPDR-NW3-RX OpenROADM-5-3-SRG1SRG1-PP3-TX XPONDER-5-3XPDR-NW3-RX XPONDER-5-3XPDR-NW3-TX-toOpenROADM-5-3-SRG1-SRG1-PP3-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-5-3XPDR-NW4-TX-toOpenROADM-5-3-SRG1-SRG1-PP4-RX XPONDER-5-3XPDR-NW4-TX OpenROADM-5-3-SRG1SRG1-PP4-RX OpenROADM-5-3-SRG1-SRG1-PP4-TX-to-XPONDER-5-3XPDR-NW4-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-5-3-SRG1-SRG1-PP4-TX-to-XPONDER-5-3XPDR-NW4-RX OpenROADM-5-3-SRG1SRG1-PP4-TX XPONDER-5-3XPDR-NW4-RX XPONDER-5-3XPDR-NW4-TX-toOpenROADM-5-3-SRG1-SRG1-PP4-RX - XPONDER-INPUT + XPONDER-INPUT OpenROADM-5-4-DEG1-DEG1-CTP-TXtoOpenROADM-5-4-DEG2-DEG2-CTP-RX OpenROADM-5-4-DEG1DEG1-CTP-TX OpenROADM-5-4-DEG2DEG2-CTP-RX OpenROADM-5-4-DEG2-DEG2-CTP-TXtoOpenROADM-5-4-DEG1-DEG1-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-5-4-DEG1-DEG1-CTP-TXtoOpenROADM-5-4-DEG3-DEG3-CTP-RX OpenROADM-5-4-DEG1DEG1-CTP-TX OpenROADM-5-4-DEG3DEG3-CTP-RX OpenROADM-5-4-DEG3-DEG3-CTP-TXtoOpenROADM-5-4-DEG1-DEG1-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-5-4-SRG1-SRG1-CP-TXtoOpenROADM-5-4-DEG1-DEG1-CTP-RX OpenROADM-5-4-SRG1SRG1-CP-TX OpenROADM-5-4-DEG1DEG1-CTP-RX OpenROADM-5-4-DEG1-DEG1-CTP-TXtoOpenROADM-5-4-SRG1-SRG1-CP-RX - ADD-LINK + ADD-LINK OpenROADM-5-4-DEG1-DEG1-CTP-TXtoOpenROADM-5-4-SRG1-SRG1-CP-RX OpenROADM-5-4-DEG1DEG1-CTP-TX OpenROADM-5-4-SRG1SRG1-CP-RX OpenROADM-5-4-SRG1-SRG1-CP-TXtoOpenROADM-5-4-DEG1-DEG1-CTP-RX - DROP-LINK + DROP-LINK OpenROADM-5-4-DEG2-DEG2-CTP-TXtoOpenROADM-5-4-DEG1-DEG1-CTP-RX OpenROADM-5-4-DEG2DEG2-CTP-TX OpenROADM-5-4-DEG1DEG1-CTP-RX OpenROADM-5-4-DEG1-DEG1-CTP-TXtoOpenROADM-5-4-DEG2-DEG2-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-5-4-DEG2-DEG2-CTP-TXtoOpenROADM-5-4-DEG3-DEG3-CTP-RX OpenROADM-5-4-DEG2DEG2-CTP-TX OpenROADM-5-4-DEG3DEG3-CTP-RX OpenROADM-5-4-DEG3-DEG3-CTP-TXtoOpenROADM-5-4-DEG2-DEG2-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-5-4-SRG1-SRG1-CP-TXtoOpenROADM-5-4-DEG2-DEG2-CTP-RX OpenROADM-5-4-SRG1SRG1-CP-TX OpenROADM-5-4-DEG2DEG2-CTP-RX OpenROADM-5-4-DEG2-DEG2-CTP-TXtoOpenROADM-5-4-SRG1-SRG1-CP-RX - ADD-LINK + ADD-LINK OpenROADM-5-4-DEG2-DEG2-CTP-TXtoOpenROADM-5-4-SRG1-SRG1-CP-RX OpenROADM-5-4-DEG2DEG2-CTP-TX OpenROADM-5-4-SRG1SRG1-CP-RX OpenROADM-5-4-SRG1-SRG1-CP-TXtoOpenROADM-5-4-DEG2-DEG2-CTP-RX - DROP-LINK + DROP-LINK OpenROADM-5-4-DEG3-DEG3-CTP-TXtoOpenROADM-5-4-DEG1-DEG1-CTP-RX OpenROADM-5-4-DEG3DEG3-CTP-TX OpenROADM-5-4-DEG1DEG1-CTP-RX OpenROADM-5-4-DEG1-DEG1-CTP-TXtoOpenROADM-5-4-DEG3-DEG3-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-5-4-DEG3-DEG3-CTP-TXtoOpenROADM-5-4-DEG2-DEG2-CTP-RX OpenROADM-5-4-DEG3DEG3-CTP-TX OpenROADM-5-4-DEG2DEG2-CTP-RX OpenROADM-5-4-DEG2-DEG2-CTP-TXtoOpenROADM-5-4-DEG3-DEG3-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-5-4-SRG1-SRG1-CP-TXtoOpenROADM-5-4-DEG3-DEG3-CTP-RX OpenROADM-5-4-SRG1SRG1-CP-TX OpenROADM-5-4-DEG3DEG3-CTP-RX OpenROADM-5-4-DEG3-DEG3-CTP-TXtoOpenROADM-5-4-SRG1-SRG1-CP-RX - ADD-LINK + ADD-LINK OpenROADM-5-4-DEG3-DEG3-CTP-TXtoOpenROADM-5-4-SRG1-SRG1-CP-RX OpenROADM-5-4-DEG3DEG3-CTP-TX OpenROADM-5-4-SRG1SRG1-CP-RX OpenROADM-5-4-SRG1-SRG1-CP-TXtoOpenROADM-5-4-DEG3-DEG3-CTP-RX - DROP-LINK + DROP-LINK XPONDER-5-4XPDR-NW1-TX-toOpenROADM-5-4-SRG1-SRG1-PP1-RX XPONDER-5-4XPDR-NW1-TX OpenROADM-5-4-SRG1SRG1-PP1-RX OpenROADM-5-4-SRG1-SRG1-PP1-TX-to-XPONDER-5-4XPDR-NW1-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-5-4-SRG1-SRG1-PP1-TX-to-XPONDER-5-4XPDR-NW1-RX OpenROADM-5-4-SRG1SRG1-PP1-TX XPONDER-5-4XPDR-NW1-RX XPONDER-5-4XPDR-NW1-TX-toOpenROADM-5-4-SRG1-SRG1-PP1-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-5-4XPDR-NW2-TX-toOpenROADM-5-4-SRG1-SRG1-PP2-RX XPONDER-5-4XPDR-NW2-TX OpenROADM-5-4-SRG1SRG1-PP2-RX OpenROADM-5-4-SRG1-SRG1-PP2-TX-to-XPONDER-5-4XPDR-NW2-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-5-4-SRG1-SRG1-PP2-TX-to-XPONDER-5-4XPDR-NW2-RX OpenROADM-5-4-SRG1SRG1-PP2-TX XPONDER-5-4XPDR-NW2-RX XPONDER-5-4XPDR-NW2-TX-toOpenROADM-5-4-SRG1-SRG1-PP2-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-5-4XPDR-NW3-TX-toOpenROADM-5-4-SRG1-SRG1-PP3-RX XPONDER-5-4XPDR-NW3-TX OpenROADM-5-4-SRG1SRG1-PP3-RX OpenROADM-5-4-SRG1-SRG1-PP3-TX-to-XPONDER-5-4XPDR-NW3-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-5-4-SRG1-SRG1-PP3-TX-to-XPONDER-5-4XPDR-NW3-RX OpenROADM-5-4-SRG1SRG1-PP3-TX XPONDER-5-4XPDR-NW3-RX XPONDER-5-4XPDR-NW3-TX-toOpenROADM-5-4-SRG1-SRG1-PP3-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-5-4XPDR-NW4-TX-toOpenROADM-5-4-SRG1-SRG1-PP4-RX XPONDER-5-4XPDR-NW4-TX OpenROADM-5-4-SRG1SRG1-PP4-RX OpenROADM-5-4-SRG1-SRG1-PP4-TX-to-XPONDER-5-4XPDR-NW4-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-5-4-SRG1-SRG1-PP4-TX-to-XPONDER-5-4XPDR-NW4-RX OpenROADM-5-4-SRG1SRG1-PP4-TX XPONDER-5-4XPDR-NW4-RX XPONDER-5-4XPDR-NW4-TX-toOpenROADM-5-4-SRG1-SRG1-PP4-RX - XPONDER-INPUT + XPONDER-INPUT OpenROADM-5-1-DEG1-to-OpenROADM-5-2-DEG1 OpenROADM-5-2-DEG1-to-OpenROADM-5-1-DEG1 1 - ROADM-TO-ROADM + ROADM-TO-ROADM OpenROADM-5-1-DEG1DEG1-TTP-TX OpenROADM-5-2-DEG1DEG1-TTP-RX @@ -4393,7 +4393,7 @@ OpenROADM-5-2-DEG1-to-OpenROADM-5-1-DEG1 OpenROADM-5-1-DEG1-to-OpenROADM-5-2-DEG1 1 - ROADM-TO-ROADM + ROADM-TO-ROADM OpenROADM-5-2-DEG1DEG1-TTP-TX OpenROADM-5-1-DEG1DEG1-TTP-RX @@ -4418,7 +4418,7 @@ OpenROADM-5-2-DEG2-to-OpenROADM-5-3-DEG2 OpenROADM-5-3-DEG2-to-OpenROADM-5-2-DEG2 1 - ROADM-TO-ROADM + ROADM-TO-ROADM OpenROADM-5-2-DEG2DEG2-TTP-TX OpenROADM-5-3-DEG2DEG2-TTP-RX @@ -4443,7 +4443,7 @@ OpenROADM-5-3-DEG2-to-OpenROADM-5-2-DEG2 OpenROADM-5-2-DEG2-to-OpenROADM-5-3-DEG2 1 - ROADM-TO-ROADM + ROADM-TO-ROADM OpenROADM-5-3-DEG2DEG2-TTP-TX OpenROADM-5-2-DEG2DEG2-TTP-RX @@ -4468,7 +4468,7 @@ OpenROADM-5-3-DEG1-to-OpenROADM-5-4-DEG1 OpenROADM-5-4-DEG1-to-OpenROADM-5-3-DEG1 1 - ROADM-TO-ROADM + ROADM-TO-ROADM OpenROADM-5-3-DEG1DEG1-TTP-TX OpenROADM-5-4-DEG1DEG1-TTP-RX @@ -4493,7 +4493,7 @@ OpenROADM-5-4-DEG1-to-OpenROADM-5-3-DEG1 OpenROADM-5-3-DEG1-to-OpenROADM-5-4-DEG1 1 - ROADM-TO-ROADM + ROADM-TO-ROADM OpenROADM-5-4-DEG1DEG1-TTP-TX OpenROADM-5-3-DEG1DEG1-TTP-RX @@ -4518,7 +4518,7 @@ OpenROADM-5-4-DEG2-to-OpenROADM-5-1-DEG2 OpenROADM-5-1-DEG2-to-OpenROADM-5-4-DEG2 1 - ROADM-TO-ROADM + ROADM-TO-ROADM OpenROADM-5-4-DEG2DEG2-TTP-TX OpenROADM-5-1-DEG2DEG2-TTP-RX @@ -4543,7 +4543,7 @@ OpenROADM-5-1-DEG2-to-OpenROADM-5-4-DEG2 OpenROADM-5-4-DEG2-to-OpenROADM-5-1-DEG2 1 - ROADM-TO-ROADM + ROADM-TO-ROADM OpenROADM-5-1-DEG2DEG2-TTP-TX OpenROADM-5-4-DEG2DEG2-TTP-RX @@ -4568,7 +4568,7 @@ OpenROADM-1-4-DEG3-to-OpenROADM-2-1-DEG3 OpenROADM-2-1-DEG3-to-OpenROADM-1-4-DEG3 1 - ROADM-TO-ROADM + ROADM-TO-ROADM OpenROADM-1-4-DEG3DEG3-TTP-TX OpenROADM-2-1-DEG3DEG3-TTP-RX @@ -4593,7 +4593,7 @@ OpenROADM-2-1-DEG3-to-OpenROADM-1-4-DEG3 OpenROADM-1-4-DEG3-to-OpenROADM-2-1-DEG3 1 - ROADM-TO-ROADM + ROADM-TO-ROADM OpenROADM-2-1-DEG3DEG3-TTP-TX OpenROADM-1-4-DEG3DEG3-TTP-RX @@ -4618,7 +4618,7 @@ OpenROADM-1-3-DEG3-to-OpenROADM-2-2-DEG3 OpenROADM-2-2-DEG3-to-OpenROADM-1-3-DEG3 1 - ROADM-TO-ROADM + ROADM-TO-ROADM OpenROADM-1-3-DEG3DEG3-TTP-TX OpenROADM-2-2-DEG3DEG3-TTP-RX @@ -4643,7 +4643,7 @@ OpenROADM-2-2-DEG3-to-OpenROADM-1-3-DEG3 OpenROADM-1-3-DEG3-to-OpenROADM-2-2-DEG3 1 - ROADM-TO-ROADM + ROADM-TO-ROADM OpenROADM-2-2-DEG3DEG3-TTP-TX OpenROADM-1-3-DEG3DEG3-TTP-RX @@ -4668,7 +4668,7 @@ OpenROADM-2-4-DEG3-to-OpenROADM-3-1-DEG3 OpenROADM-3-1-DEG3-to-OpenROADM-2-4-DEG3 1 - ROADM-TO-ROADM + ROADM-TO-ROADM OpenROADM-2-4-DEG3DEG3-TTP-TX OpenROADM-3-1-DEG3DEG3-TTP-RX @@ -4693,7 +4693,7 @@ OpenROADM-3-1-DEG3-to-OpenROADM-2-4-DEG3 OpenROADM-2-4-DEG3-to-OpenROADM-3-1-DEG3 1 - ROADM-TO-ROADM + ROADM-TO-ROADM OpenROADM-3-1-DEG3DEG3-TTP-TX OpenROADM-2-4-DEG3DEG3-TTP-RX @@ -4718,7 +4718,7 @@ OpenROADM-2-3-DEG3-to-OpenROADM-3-2-DEG3 OpenROADM-3-2-DEG3-to-OpenROADM-2-3-DEG3 1 - ROADM-TO-ROADM + ROADM-TO-ROADM OpenROADM-2-3-DEG3DEG3-TTP-TX OpenROADM-3-2-DEG3DEG3-TTP-RX @@ -4743,7 +4743,7 @@ OpenROADM-3-2-DEG3-to-OpenROADM-2-3-DEG3 OpenROADM-2-3-DEG3-to-OpenROADM-3-2-DEG3 1 - ROADM-TO-ROADM + ROADM-TO-ROADM OpenROADM-3-2-DEG3DEG3-TTP-TX OpenROADM-2-3-DEG3DEG3-TTP-RX @@ -4768,7 +4768,7 @@ OpenROADM-3-4-DEG3-to-OpenROADM-4-1-DEG3 OpenROADM-4-1-DEG3-to-OpenROADM-3-4-DEG3 1 - ROADM-TO-ROADM + ROADM-TO-ROADM OpenROADM-3-4-DEG3DEG3-TTP-TX OpenROADM-4-1-DEG3DEG3-TTP-RX @@ -4793,7 +4793,7 @@ OpenROADM-4-1-DEG3-to-OpenROADM-3-4-DEG3 OpenROADM-3-4-DEG3-to-OpenROADM-4-1-DEG3 1 - ROADM-TO-ROADM + ROADM-TO-ROADM OpenROADM-4-1-DEG3DEG3-TTP-TX OpenROADM-3-4-DEG3DEG3-TTP-RX @@ -4818,7 +4818,7 @@ OpenROADM-3-3-DEG3-to-OpenROADM-4-2-DEG3 OpenROADM-4-2-DEG3-to-OpenROADM-3-3-DEG3 1 - ROADM-TO-ROADM + ROADM-TO-ROADM OpenROADM-3-3-DEG3DEG3-TTP-TX OpenROADM-4-2-DEG3DEG3-TTP-RX @@ -4843,7 +4843,7 @@ OpenROADM-4-2-DEG3-to-OpenROADM-3-3-DEG3 OpenROADM-3-3-DEG3-to-OpenROADM-4-2-DEG3 1 - ROADM-TO-ROADM + ROADM-TO-ROADM OpenROADM-4-2-DEG3DEG3-TTP-TX OpenROADM-3-3-DEG3DEG3-TTP-RX @@ -4868,7 +4868,7 @@ OpenROADM-4-4-DEG3-to-OpenROADM-5-1-DEG3 OpenROADM-5-1-DEG3-to-OpenROADM-4-4-DEG3 1 - ROADM-TO-ROADM + ROADM-TO-ROADM OpenROADM-4-4-DEG3DEG3-TTP-TX OpenROADM-5-1-DEG3DEG3-TTP-RX @@ -4893,7 +4893,7 @@ OpenROADM-5-1-DEG3-to-OpenROADM-4-4-DEG3 OpenROADM-4-4-DEG3-to-OpenROADM-5-1-DEG3 1 - ROADM-TO-ROADM + ROADM-TO-ROADM OpenROADM-5-1-DEG3DEG3-TTP-TX OpenROADM-4-4-DEG3DEG3-TTP-RX @@ -4918,7 +4918,7 @@ OpenROADM-4-3-DEG3-to-OpenROADM-5-2-DEG3 OpenROADM-5-2-DEG3-to-OpenROADM-4-3-DEG3 10 - ROADM-TO-ROADM + ROADM-TO-ROADM OpenROADM-4-3-DEG3DEG3-TTP-TX OpenROADM-5-2-DEG3DEG3-TTP-RX @@ -4943,7 +4943,7 @@ OpenROADM-5-2-DEG3-to-OpenROADM-4-3-DEG3 OpenROADM-4-3-DEG3-to-OpenROADM-5-2-DEG3 10 - ROADM-TO-ROADM + ROADM-TO-ROADM OpenROADM-5-2-DEG3DEG3-TTP-TX OpenROADM-4-3-DEG3DEG3-TTP-RX @@ -4968,7 +4968,7 @@ OpenROADM-5-4-DEG3-to-OpenROADM-1-1-DEG3 OpenROADM-1-1-DEG3-to-OpenROADM-5-4-DEG3 1 - ROADM-TO-ROADM + ROADM-TO-ROADM OpenROADM-5-4-DEG3DEG3-TTP-TX OpenROADM-1-1-DEG3DEG3-TTP-RX @@ -4993,7 +4993,7 @@ OpenROADM-1-1-DEG3-to-OpenROADM-5-4-DEG3 OpenROADM-5-4-DEG3-to-OpenROADM-1-1-DEG3 1 - ROADM-TO-ROADM + ROADM-TO-ROADM OpenROADM-1-1-DEG3DEG3-TTP-TX OpenROADM-5-4-DEG3DEG3-TTP-RX @@ -5018,7 +5018,7 @@ OpenROADM-5-3-DEG3-to-OpenROADM-1-2-DEG3 OpenROADM-1-2-DEG3-to-OpenROADM-5-3-DEG3 10 - ROADM-TO-ROADM + ROADM-TO-ROADM OpenROADM-5-3-DEG3DEG3-TTP-TX OpenROADM-1-2-DEG3DEG3-TTP-RX @@ -5043,7 +5043,7 @@ OpenROADM-1-2-DEG3-to-OpenROADM-5-3-DEG3 OpenROADM-5-3-DEG3-to-OpenROADM-1-2-DEG3 10 - ROADM-TO-ROADM + ROADM-TO-ROADM OpenROADM-1-2-DEG3DEG3-TTP-TX OpenROADM-5-3-DEG3DEG3-TTP-RX diff --git a/tests/sample_configs/NW-simple-topology.xml b/tests/sample_configs/NW-simple-topology.xml index d007741a0..cb2297a7f 100644 --- a/tests/sample_configs/NW-simple-topology.xml +++ b/tests/sample_configs/NW-simple-topology.xml @@ -1,15 +1,15 @@ openroadm-topology OpenROADM-1-1-DEG1 - DEGREE + DEGREE DEG1-CTP-TX - DEGREE-TX-CTP + DEGREE-TX-CTP DEG1-CTP-RX - DEGREE-RX-CTP + DEGREE-RX-CTP DEG1-TTP-RX - DEGREE-RX-TTP + DEGREE-RX-TTP DEG1-TTP-TX - DEGREE-TX-TTP + DEGREE-TX-TTP 1 2 @@ -24,15 +24,15 @@ Transport-underlayOpenROADM-1-1 OpenROADM-1-1-DEG2 - DEGREE + DEGREE DEG2-CTP-TX - DEGREE-TX-CTP + DEGREE-TX-CTP DEG2-CTP-RX - DEGREE-RX-CTP + DEGREE-RX-CTP DEG2-TTP-RX - DEGREE-RX-TTP + DEGREE-RX-TTP DEG2-TTP-TX - DEGREE-TX-TTP + DEGREE-TX-TTP 1 2 @@ -47,15 +47,15 @@ Transport-underlayOpenROADM-1-1 OpenROADM-1-1-DEG3 - DEGREE + DEGREE DEG3-CTP-TX - DEGREE-TX-CTP + DEGREE-TX-CTP DEG3-CTP-RX - DEGREE-RX-CTP + DEGREE-RX-CTP DEG3-TTP-RX - DEGREE-RX-TTP + DEGREE-RX-TTP DEG3-TTP-TX - DEGREE-TX-TTP + DEGREE-TX-TTP 1 2 @@ -69,7 +69,7 @@ 10 Transport-underlayOpenROADM-1-1 - OpenROADM-1-1-SRG1 SRG + OpenROADM-1-1-SRG1 SRG Transport-underlayOpenROADM-1-1 1 @@ -84,94 +84,94 @@ 10 SRG1-CP-RX - SRG-RX-CP + SRG-RX-CP SRG1-CP-TX - SRG-TX-CP + SRG-TX-CP SRG1-PP1-RX - SRG-RX-PP + SRG-RX-PP SRG1-PP1-TX - SRG-TX-PP + SRG-TX-PP SRG1-PP2-RX - SRG-RX-PP + SRG-RX-PP SRG1-PP2-TX - SRG-TX-PP + SRG-TX-PP SRG1-PP3-RX - SRG-RX-PP + SRG-RX-PP SRG1-PP3-TX - SRG-TX-PP + SRG-TX-PP SRG1-PP4-RX - SRG-RX-PP + SRG-RX-PP SRG1-PP4-TX - SRG-TX-PP + SRG-TX-PP SRG1-PP5-RX - SRG-RX-PP + SRG-RX-PP SRG1-PP5-TX - SRG-TX-PP + SRG-TX-PP XPONDER-1-1 Transport-underlayXPONDER-1-1 - XPONDER - XPDR-NW1-RX XPONDER-NETWORK + XPONDER + XPDR-NW1-RX XPONDER-NETWORK Client-1 XPDR-NW1-RX - XPDR-NW1-TX XPONDER-NETWORK + XPDR-NW1-TX XPONDER-NETWORK Client-1 XPDR-NW1-TX - Client-1 XPONDER-CLIENT + Client-1 XPONDER-CLIENT XPDR-NW1 - XPDR-NW2-RX XPONDER-NETWORK + XPDR-NW2-RX XPONDER-NETWORK Client-2 XPDR-NW2-RX - XPDR-NW2-TX XPONDER-NETWORK + XPDR-NW2-TX XPONDER-NETWORK Client-2 XPDR-NW2-TX - Client-2 XPONDER-CLIENT + Client-2 XPONDER-CLIENT XPDR-NW2 - XPDR-NW3-RX XPONDER-NETWORK + XPDR-NW3-RX XPONDER-NETWORK Client-3 XPDR-NW3-RX - XPDR-NW3-TX XPONDER-NETWORK + XPDR-NW3-TX XPONDER-NETWORK Client-3 XPDR-NW3-TX - Client-3 XPONDER-CLIENT + Client-3 XPONDER-CLIENT XPDR-NW3 - XPDR-NW4-RX XPONDER-NETWORK + XPDR-NW4-RX XPONDER-NETWORK Client-4 XPDR-NW4-RX - XPDR-NW4-TX XPONDER-NETWORK + XPDR-NW4-TX XPONDER-NETWORK Client-4 XPDR-NW4-TX - Client-4 XPONDER-CLIENT + Client-4 XPONDER-CLIENT XPDR-NW4 - XPDR-NW5-RX XPONDER-NETWORK + XPDR-NW5-RX XPONDER-NETWORK Client-5 XPDR-NW5-RX - XPDR-NW5-TX XPONDER-NETWORK + XPDR-NW5-TX XPONDER-NETWORK Client-5 XPDR-NW5-TX - Client-5 XPONDER-CLIENT + Client-5 XPONDER-CLIENT XPDR-NW5 OpenROADM-1-2-DEG1 - DEGREE + DEGREE DEG1-CTP-TX - DEGREE-TX-CTP + DEGREE-TX-CTP DEG1-CTP-RX - DEGREE-RX-CTP + DEGREE-RX-CTP DEG1-TTP-RX - DEGREE-RX-TTP + DEGREE-RX-TTP DEG1-TTP-TX - DEGREE-TX-TTP + DEGREE-TX-TTP 1 2 @@ -186,15 +186,15 @@ Transport-underlayOpenROADM-1-2 OpenROADM-1-2-DEG2 - DEGREE + DEGREE DEG2-CTP-TX - DEGREE-TX-CTP + DEGREE-TX-CTP DEG2-CTP-RX - DEGREE-RX-CTP + DEGREE-RX-CTP DEG2-TTP-RX - DEGREE-RX-TTP + DEGREE-RX-TTP DEG2-TTP-TX - DEGREE-TX-TTP + DEGREE-TX-TTP 1 2 @@ -209,15 +209,15 @@ Transport-underlayOpenROADM-1-2 OpenROADM-1-2-DEG3 - DEGREE + DEGREE DEG3-CTP-TX - DEGREE-TX-CTP + DEGREE-TX-CTP DEG3-CTP-RX - DEGREE-RX-CTP + DEGREE-RX-CTP DEG3-TTP-RX - DEGREE-RX-TTP + DEGREE-RX-TTP DEG3-TTP-TX - DEGREE-TX-TTP + DEGREE-TX-TTP 1 2 @@ -231,7 +231,7 @@ 10 Transport-underlayOpenROADM-1-2 - OpenROADM-1-2-SRG1 SRG + OpenROADM-1-2-SRG1 SRG Transport-underlayOpenROADM-1-2 1 @@ -246,95 +246,95 @@ 10 SRG1-CP-RX - SRG-RX-CP + SRG-RX-CP SRG1-CP-TX - SRG-TX-CP + SRG-TX-CP SRG1-PP1-RX - SRG-RX-PP + SRG-RX-PP SRG1-PP1-TX - SRG-TX-PP + SRG-TX-PP SRG1-PP2-RX - SRG-RX-PP + SRG-RX-PP SRG1-PP2-TX - SRG-TX-PP + SRG-TX-PP SRG1-PP3-RX - SRG-RX-PP + SRG-RX-PP SRG1-PP3-TX - SRG-TX-PP + SRG-TX-PP SRG1-PP4-RX - SRG-RX-PP + SRG-RX-PP SRG1-PP4-TX - SRG-TX-PP + SRG-TX-PP SRG1-PP5-RX - SRG-RX-PP + SRG-RX-PP SRG1-PP5-TX - SRG-TX-PP + SRG-TX-PP XPONDER-1-2 Transport-underlayXPONDER-1-2 - XPONDER - XPDR-NW1-RX XPONDER-NETWORK + XPONDER + XPDR-NW1-RX XPONDER-NETWORK Client-1 XPDR-NW1-RX - XPDR-NW1-TX XPONDER-NETWORK + XPDR-NW1-TX XPONDER-NETWORK Client-1 XPDR-NW1-TX - Client-1 XPONDER-CLIENT + Client-1 XPONDER-CLIENT XPDR-NW1 - XPDR-NW2-RX XPONDER-NETWORK + XPDR-NW2-RX XPONDER-NETWORK Client-2 XPDR-NW2-RX - XPDR-NW2-TX XPONDER-NETWORK + XPDR-NW2-TX XPONDER-NETWORK Client-2 XPDR-NW2-TX - Client-2 XPONDER-CLIENT + Client-2 XPONDER-CLIENT XPDR-NW2 - XPDR-NW3-RX XPONDER-NETWORK + XPDR-NW3-RX XPONDER-NETWORK Client-3 XPDR-NW3-RX - XPDR-NW3-TX XPONDER-NETWORK + XPDR-NW3-TX XPONDER-NETWORK Client-3 XPDR-NW3-TX - Client-3 XPONDER-CLIENT + Client-3 XPONDER-CLIENT XPDR-NW3 - XPDR-NW4-RX XPONDER-NETWORK + XPDR-NW4-RX XPONDER-NETWORK Client-4 XPDR-NW4-RX - XPDR-NW4-TX XPONDER-NETWORK + XPDR-NW4-TX XPONDER-NETWORK Client-4 XPDR-NW4-TX - Client-4 XPONDER-CLIENT + Client-4 XPONDER-CLIENT XPDR-NW4 - XPDR-NW5-RX XPONDER-NETWORK + XPDR-NW5-RX XPONDER-NETWORK Client-5 XPDR-NW5-RX - XPDR-NW5-TX XPONDER-NETWORK + XPDR-NW5-TX XPONDER-NETWORK Client-5 XPDR-NW5-TX - Client-5 XPONDER-CLIENT + Client-5 XPONDER-CLIENT XPDR-NW5 OpenROADM-2-1-DEG1 - DEGREE + DEGREE DEG1-CTP-TX - DEGREE-TX-CTP + DEGREE-TX-CTP DEG1-CTP-RX - DEGREE-RX-CTP + DEGREE-RX-CTP DEG1-TTP-RX - DEGREE-RX-TTP + DEGREE-RX-TTP DEG1-TTP-TX - DEGREE-TX-TTP + DEGREE-TX-TTP 3 4 @@ -349,15 +349,15 @@ Transport-underlayOpenROADM-2-1 OpenROADM-2-1-DEG2 - DEGREE + DEGREE DEG2-CTP-TX - DEGREE-TX-CTP + DEGREE-TX-CTP DEG2-CTP-RX - DEGREE-RX-CTP + DEGREE-RX-CTP DEG2-TTP-RX - DEGREE-RX-TTP + DEGREE-RX-TTP DEG2-TTP-TX - DEGREE-TX-TTP + DEGREE-TX-TTP 3 4 @@ -372,15 +372,15 @@ Transport-underlayOpenROADM-2-1 OpenROADM-2-1-DEG3 - DEGREE + DEGREE DEG3-CTP-TX - DEGREE-TX-CTP + DEGREE-TX-CTP DEG3-CTP-RX - DEGREE-RX-CTP + DEGREE-RX-CTP DEG3-TTP-RX - DEGREE-RX-TTP + DEGREE-RX-TTP DEG3-TTP-TX - DEGREE-TX-TTP + DEGREE-TX-TTP 3 4 @@ -394,7 +394,7 @@ 12 Transport-underlayOpenROADM-2-1 - OpenROADM-2-1-SRG1 SRG + OpenROADM-2-1-SRG1 SRG Transport-underlayOpenROADM-2-1 3 @@ -409,94 +409,94 @@ 12 SRG1-CP-RX - SRG-RX-CP + SRG-RX-CP SRG1-CP-TX - SRG-TX-CP + SRG-TX-CP SRG1-PP1-RX - SRG-RX-PP + SRG-RX-PP SRG1-PP1-TX - SRG-TX-PP + SRG-TX-PP SRG1-PP2-RX - SRG-RX-PP + SRG-RX-PP SRG1-PP2-TX - SRG-TX-PP + SRG-TX-PP SRG1-PP3-RX - SRG-RX-PP + SRG-RX-PP SRG1-PP3-TX - SRG-TX-PP + SRG-TX-PP SRG1-PP4-RX - SRG-RX-PP + SRG-RX-PP SRG1-PP4-TX - SRG-TX-PP + SRG-TX-PP SRG1-PP5-RX - SRG-RX-PP + SRG-RX-PP SRG1-PP5-TX - SRG-TX-PP + SRG-TX-PP XPONDER-2-1 Transport-underlayXPONDER-2-1 - XPONDER - XPDR-NW1-RX XPONDER-NETWORK + XPONDER + XPDR-NW1-RX XPONDER-NETWORK Client-1 XPDR-NW1-RX - XPDR-NW1-TX XPONDER-NETWORK + XPDR-NW1-TX XPONDER-NETWORK Client-1 XPDR-NW1-TX - Client-1 XPONDER-CLIENT + Client-1 XPONDER-CLIENT XPDR-NW1 - XPDR-NW2-RX XPONDER-NETWORK + XPDR-NW2-RX XPONDER-NETWORK Client-2 XPDR-NW2-RX - XPDR-NW2-TX XPONDER-NETWORK + XPDR-NW2-TX XPONDER-NETWORK Client-2 XPDR-NW2-TX - Client-2 XPONDER-CLIENT + Client-2 XPONDER-CLIENT XPDR-NW2 - XPDR-NW3-RX XPONDER-NETWORK + XPDR-NW3-RX XPONDER-NETWORK Client-3 XPDR-NW3-RX - XPDR-NW3-TX XPONDER-NETWORK + XPDR-NW3-TX XPONDER-NETWORK Client-3 XPDR-NW3-TX - Client-3 XPONDER-CLIENT + Client-3 XPONDER-CLIENT XPDR-NW3 - XPDR-NW4-RX XPONDER-NETWORK + XPDR-NW4-RX XPONDER-NETWORK Client-4 XPDR-NW4-RX - XPDR-NW4-TX XPONDER-NETWORK + XPDR-NW4-TX XPONDER-NETWORK Client-4 XPDR-NW4-TX - Client-4 XPONDER-CLIENT + Client-4 XPONDER-CLIENT XPDR-NW4 - XPDR-NW5-RX XPONDER-NETWORK + XPDR-NW5-RX XPONDER-NETWORK Client-5 XPDR-NW5-RX - XPDR-NW5-TX XPONDER-NETWORK + XPDR-NW5-TX XPONDER-NETWORK Client-5 XPDR-NW5-TX - Client-5 XPONDER-CLIENT + Client-5 XPONDER-CLIENT XPDR-NW5 OpenROADM-2-2-DEG1 - DEGREE + DEGREE DEG1-CTP-TX - DEGREE-TX-CTP + DEGREE-TX-CTP DEG1-CTP-RX - DEGREE-RX-CTP + DEGREE-RX-CTP DEG1-TTP-RX - DEGREE-RX-TTP + DEGREE-RX-TTP DEG1-TTP-TX - DEGREE-TX-TTP + DEGREE-TX-TTP 3 4 @@ -511,15 +511,15 @@ Transport-underlayOpenROADM-2-2 OpenROADM-2-2-DEG2 - DEGREE + DEGREE DEG2-CTP-TX - DEGREE-TX-CTP + DEGREE-TX-CTP DEG2-CTP-RX - DEGREE-RX-CTP + DEGREE-RX-CTP DEG2-TTP-RX - DEGREE-RX-TTP + DEGREE-RX-TTP DEG2-TTP-TX - DEGREE-TX-TTP + DEGREE-TX-TTP 3 4 @@ -534,15 +534,15 @@ Transport-underlayOpenROADM-2-2 OpenROADM-2-2-DEG3 - DEGREE + DEGREE DEG3-CTP-TX - DEGREE-TX-CTP + DEGREE-TX-CTP DEG3-CTP-RX - DEGREE-RX-CTP + DEGREE-RX-CTP DEG3-TTP-RX - DEGREE-RX-TTP + DEGREE-RX-TTP DEG3-TTP-TX - DEGREE-TX-TTP + DEGREE-TX-TTP 3 4 @@ -556,7 +556,7 @@ 12 Transport-underlayOpenROADM-2-2 - OpenROADM-2-2-SRG1 SRG + OpenROADM-2-2-SRG1 SRG Transport-underlayOpenROADM-2-2 3 @@ -571,94 +571,94 @@ 12 SRG1-CP-RX - SRG-RX-CP + SRG-RX-CP SRG1-CP-TX - SRG-TX-CP + SRG-TX-CP SRG1-PP1-RX - SRG-RX-PP + SRG-RX-PP SRG1-PP1-TX - SRG-TX-PP + SRG-TX-PP SRG1-PP2-RX - SRG-RX-PP + SRG-RX-PP SRG1-PP2-TX - SRG-TX-PP + SRG-TX-PP SRG1-PP3-RX - SRG-RX-PP + SRG-RX-PP SRG1-PP3-TX - SRG-TX-PP + SRG-TX-PP SRG1-PP4-RX - SRG-RX-PP + SRG-RX-PP SRG1-PP4-TX - SRG-TX-PP + SRG-TX-PP SRG1-PP5-RX - SRG-RX-PP + SRG-RX-PP SRG1-PP5-TX - SRG-TX-PP + SRG-TX-PP XPONDER-2-2 Transport-underlayXPONDER-2-2 - XPONDER - XPDR-NW1-RX XPONDER-NETWORK + XPONDER + XPDR-NW1-RX XPONDER-NETWORK Client-1 XPDR-NW1-RX - XPDR-NW1-TX XPONDER-NETWORK + XPDR-NW1-TX XPONDER-NETWORK Client-1 XPDR-NW1-TX - Client-1 XPONDER-CLIENT + Client-1 XPONDER-CLIENT XPDR-NW1 - XPDR-NW2-RX XPONDER-NETWORK + XPDR-NW2-RX XPONDER-NETWORK Client-2 XPDR-NW2-RX - XPDR-NW2-TX XPONDER-NETWORK + XPDR-NW2-TX XPONDER-NETWORK Client-2 XPDR-NW2-TX - Client-2 XPONDER-CLIENT + Client-2 XPONDER-CLIENT XPDR-NW2 - XPDR-NW3-RX XPONDER-NETWORK + XPDR-NW3-RX XPONDER-NETWORK Client-3 XPDR-NW3-RX - XPDR-NW3-TX XPONDER-NETWORK + XPDR-NW3-TX XPONDER-NETWORK Client-3 XPDR-NW3-TX - Client-3 XPONDER-CLIENT + Client-3 XPONDER-CLIENT XPDR-NW3 - XPDR-NW4-RX XPONDER-NETWORK + XPDR-NW4-RX XPONDER-NETWORK Client-4 XPDR-NW4-RX - XPDR-NW4-TX XPONDER-NETWORK + XPDR-NW4-TX XPONDER-NETWORK Client-4 XPDR-NW4-TX - Client-4 XPONDER-CLIENT + Client-4 XPONDER-CLIENT XPDR-NW4 - XPDR-NW5-RX XPONDER-NETWORK + XPDR-NW5-RX XPONDER-NETWORK Client-5 XPDR-NW5-RX - XPDR-NW5-TX XPONDER-NETWORK + XPDR-NW5-TX XPONDER-NETWORK Client-5 XPDR-NW5-TX - Client-5 XPONDER-CLIENT + Client-5 XPONDER-CLIENT XPDR-NW5 OpenROADM-3-1-DEG1 - DEGREE + DEGREE DEG1-CTP-TX - DEGREE-TX-CTP + DEGREE-TX-CTP DEG1-CTP-RX - DEGREE-RX-CTP + DEGREE-RX-CTP DEG1-TTP-RX - DEGREE-RX-TTP + DEGREE-RX-TTP DEG1-TTP-TX - DEGREE-TX-TTP + DEGREE-TX-TTP 5 6 @@ -673,15 +673,15 @@ Transport-underlayOpenROADM-3-1 OpenROADM-3-1-DEG2 - DEGREE + DEGREE DEG2-CTP-TX - DEGREE-TX-CTP + DEGREE-TX-CTP DEG2-CTP-RX - DEGREE-RX-CTP + DEGREE-RX-CTP DEG2-TTP-RX - DEGREE-RX-TTP + DEGREE-RX-TTP DEG2-TTP-TX - DEGREE-TX-TTP + DEGREE-TX-TTP 5 6 @@ -696,15 +696,15 @@ Transport-underlayOpenROADM-3-1 OpenROADM-3-1-DEG3 - DEGREE + DEGREE DEG3-CTP-TX - DEGREE-TX-CTP + DEGREE-TX-CTP DEG3-CTP-RX - DEGREE-RX-CTP + DEGREE-RX-CTP DEG3-TTP-RX - DEGREE-RX-TTP + DEGREE-RX-TTP DEG3-TTP-TX - DEGREE-TX-TTP + DEGREE-TX-TTP 5 6 @@ -718,7 +718,7 @@ 14 Transport-underlayOpenROADM-3-1 - OpenROADM-3-1-SRG1 SRG + OpenROADM-3-1-SRG1 SRG Transport-underlayOpenROADM-3-1 5 @@ -733,94 +733,94 @@ 14 SRG1-CP-RX - SRG-RX-CP + SRG-RX-CP SRG1-CP-TX - SRG-TX-CP + SRG-TX-CP SRG1-PP1-RX - SRG-RX-PP + SRG-RX-PP SRG1-PP1-TX - SRG-TX-PP + SRG-TX-PP SRG1-PP2-RX - SRG-RX-PP + SRG-RX-PP SRG1-PP2-TX - SRG-TX-PP + SRG-TX-PP SRG1-PP3-RX - SRG-RX-PP + SRG-RX-PP SRG1-PP3-TX - SRG-TX-PP + SRG-TX-PP SRG1-PP4-RX - SRG-RX-PP + SRG-RX-PP SRG1-PP4-TX - SRG-TX-PP + SRG-TX-PP SRG1-PP5-RX - SRG-RX-PP + SRG-RX-PP SRG1-PP5-TX - SRG-TX-PP + SRG-TX-PP XPONDER-3-1 Transport-underlayXPONDER-3-1 - XPONDER - XPDR-NW1-RX XPONDER-NETWORK + XPONDER + XPDR-NW1-RX XPONDER-NETWORK Client-1 XPDR-NW1-RX - XPDR-NW1-TX XPONDER-NETWORK + XPDR-NW1-TX XPONDER-NETWORK Client-1 XPDR-NW1-TX - Client-1 XPONDER-CLIENT + Client-1 XPONDER-CLIENT XPDR-NW1 - XPDR-NW2-RX XPONDER-NETWORK + XPDR-NW2-RX XPONDER-NETWORK Client-2 XPDR-NW2-RX - XPDR-NW2-TX XPONDER-NETWORK + XPDR-NW2-TX XPONDER-NETWORK Client-2 XPDR-NW2-TX - Client-2 XPONDER-CLIENT + Client-2 XPONDER-CLIENT XPDR-NW2 - XPDR-NW3-RX XPONDER-NETWORK + XPDR-NW3-RX XPONDER-NETWORK Client-3 XPDR-NW3-RX - XPDR-NW3-TX XPONDER-NETWORK + XPDR-NW3-TX XPONDER-NETWORK Client-3 XPDR-NW3-TX - Client-3 XPONDER-CLIENT + Client-3 XPONDER-CLIENT XPDR-NW3 - XPDR-NW4-RX XPONDER-NETWORK + XPDR-NW4-RX XPONDER-NETWORK Client-4 XPDR-NW4-RX - XPDR-NW4-TX XPONDER-NETWORK + XPDR-NW4-TX XPONDER-NETWORK Client-4 XPDR-NW4-TX - Client-4 XPONDER-CLIENT + Client-4 XPONDER-CLIENT XPDR-NW4 - XPDR-NW5-RX XPONDER-NETWORK + XPDR-NW5-RX XPONDER-NETWORK Client-5 XPDR-NW5-RX - XPDR-NW5-TX XPONDER-NETWORK + XPDR-NW5-TX XPONDER-NETWORK Client-5 XPDR-NW5-TX - Client-5 XPONDER-CLIENT + Client-5 XPONDER-CLIENT XPDR-NW5 OpenROADM-3-2-DEG1 - DEGREE + DEGREE DEG1-CTP-TX - DEGREE-TX-CTP + DEGREE-TX-CTP DEG1-CTP-RX - DEGREE-RX-CTP + DEGREE-RX-CTP DEG1-TTP-RX - DEGREE-RX-TTP + DEGREE-RX-TTP DEG1-TTP-TX - DEGREE-TX-TTP + DEGREE-TX-TTP 5 6 @@ -835,15 +835,15 @@ Transport-underlayOpenROADM-3-2 OpenROADM-3-2-DEG2 - DEGREE + DEGREE DEG2-CTP-TX - DEGREE-TX-CTP + DEGREE-TX-CTP DEG2-CTP-RX - DEGREE-RX-CTP + DEGREE-RX-CTP DEG2-TTP-RX - DEGREE-RX-TTP + DEGREE-RX-TTP DEG2-TTP-TX - DEGREE-TX-TTP + DEGREE-TX-TTP 5 6 @@ -858,15 +858,15 @@ Transport-underlayOpenROADM-3-2 OpenROADM-3-2-DEG3 - DEGREE + DEGREE DEG3-CTP-TX - DEGREE-TX-CTP + DEGREE-TX-CTP DEG3-CTP-RX - DEGREE-RX-CTP + DEGREE-RX-CTP DEG3-TTP-RX - DEGREE-RX-TTP + DEGREE-RX-TTP DEG3-TTP-TX - DEGREE-TX-TTP + DEGREE-TX-TTP 5 6 @@ -880,7 +880,7 @@ 14 Transport-underlayOpenROADM-3-2 - OpenROADM-3-2-SRG1 SRG + OpenROADM-3-2-SRG1 SRG Transport-underlayOpenROADM-3-2 5 @@ -895,94 +895,94 @@ 14 SRG1-CP-RX - SRG-RX-CP + SRG-RX-CP SRG1-CP-TX - SRG-TX-CP + SRG-TX-CP SRG1-PP1-RX - SRG-RX-PP + SRG-RX-PP SRG1-PP1-TX - SRG-TX-PP + SRG-TX-PP SRG1-PP2-RX - SRG-RX-PP + SRG-RX-PP SRG1-PP2-TX - SRG-TX-PP + SRG-TX-PP SRG1-PP3-RX - SRG-RX-PP + SRG-RX-PP SRG1-PP3-TX - SRG-TX-PP + SRG-TX-PP SRG1-PP4-RX - SRG-RX-PP + SRG-RX-PP SRG1-PP4-TX - SRG-TX-PP + SRG-TX-PP SRG1-PP5-RX - SRG-RX-PP + SRG-RX-PP SRG1-PP5-TX - SRG-TX-PP + SRG-TX-PP XPONDER-3-2 Transport-underlayXPONDER-3-2 - XPONDER - XPDR-NW1-RX XPONDER-NETWORK + XPONDER + XPDR-NW1-RX XPONDER-NETWORK Client-1 XPDR-NW1-RX - XPDR-NW1-TX XPONDER-NETWORK + XPDR-NW1-TX XPONDER-NETWORK Client-1 XPDR-NW1-TX - Client-1 XPONDER-CLIENT + Client-1 XPONDER-CLIENT XPDR-NW1 - XPDR-NW2-RX XPONDER-NETWORK + XPDR-NW2-RX XPONDER-NETWORK Client-2 XPDR-NW2-RX - XPDR-NW2-TX XPONDER-NETWORK + XPDR-NW2-TX XPONDER-NETWORK Client-2 XPDR-NW2-TX - Client-2 XPONDER-CLIENT + Client-2 XPONDER-CLIENT XPDR-NW2 - XPDR-NW3-RX XPONDER-NETWORK + XPDR-NW3-RX XPONDER-NETWORK Client-3 XPDR-NW3-RX - XPDR-NW3-TX XPONDER-NETWORK + XPDR-NW3-TX XPONDER-NETWORK Client-3 XPDR-NW3-TX - Client-3 XPONDER-CLIENT + Client-3 XPONDER-CLIENT XPDR-NW3 - XPDR-NW4-RX XPONDER-NETWORK + XPDR-NW4-RX XPONDER-NETWORK Client-4 XPDR-NW4-RX - XPDR-NW4-TX XPONDER-NETWORK + XPDR-NW4-TX XPONDER-NETWORK Client-4 XPDR-NW4-TX - Client-4 XPONDER-CLIENT + Client-4 XPONDER-CLIENT XPDR-NW4 - XPDR-NW5-RX XPONDER-NETWORK + XPDR-NW5-RX XPONDER-NETWORK Client-5 XPDR-NW5-RX - XPDR-NW5-TX XPONDER-NETWORK + XPDR-NW5-TX XPONDER-NETWORK Client-5 XPDR-NW5-TX - Client-5 XPONDER-CLIENT + Client-5 XPONDER-CLIENT XPDR-NW5 OpenROADM-4-1-DEG1 - DEGREE + DEGREE DEG1-CTP-TX - DEGREE-TX-CTP + DEGREE-TX-CTP DEG1-CTP-RX - DEGREE-RX-CTP + DEGREE-RX-CTP DEG1-TTP-RX - DEGREE-RX-TTP + DEGREE-RX-TTP DEG1-TTP-TX - DEGREE-TX-TTP + DEGREE-TX-TTP 7 8 @@ -997,15 +997,15 @@ Transport-underlayOpenROADM-4-1 OpenROADM-4-1-DEG2 - DEGREE + DEGREE DEG2-CTP-TX - DEGREE-TX-CTP + DEGREE-TX-CTP DEG2-CTP-RX - DEGREE-RX-CTP + DEGREE-RX-CTP DEG2-TTP-RX - DEGREE-RX-TTP + DEGREE-RX-TTP DEG2-TTP-TX - DEGREE-TX-TTP + DEGREE-TX-TTP 7 8 @@ -1020,15 +1020,15 @@ Transport-underlayOpenROADM-4-1 OpenROADM-4-1-DEG3 - DEGREE + DEGREE DEG3-CTP-TX - DEGREE-TX-CTP + DEGREE-TX-CTP DEG3-CTP-RX - DEGREE-RX-CTP + DEGREE-RX-CTP DEG3-TTP-RX - DEGREE-RX-TTP + DEGREE-RX-TTP DEG3-TTP-TX - DEGREE-TX-TTP + DEGREE-TX-TTP 7 8 @@ -1042,7 +1042,7 @@ 16 Transport-underlayOpenROADM-4-1 - OpenROADM-4-1-SRG1 SRG + OpenROADM-4-1-SRG1 SRG Transport-underlayOpenROADM-4-1 7 @@ -1057,94 +1057,94 @@ 16 SRG1-CP-RX - SRG-RX-CP + SRG-RX-CP SRG1-CP-TX - SRG-TX-CP + SRG-TX-CP SRG1-PP1-RX - SRG-RX-PP + SRG-RX-PP SRG1-PP1-TX - SRG-TX-PP + SRG-TX-PP SRG1-PP2-RX - SRG-RX-PP + SRG-RX-PP SRG1-PP2-TX - SRG-TX-PP + SRG-TX-PP SRG1-PP3-RX - SRG-RX-PP + SRG-RX-PP SRG1-PP3-TX - SRG-TX-PP + SRG-TX-PP SRG1-PP4-RX - SRG-RX-PP + SRG-RX-PP SRG1-PP4-TX - SRG-TX-PP + SRG-TX-PP SRG1-PP5-RX - SRG-RX-PP + SRG-RX-PP SRG1-PP5-TX - SRG-TX-PP + SRG-TX-PP XPONDER-4-1 Transport-underlayXPONDER-4-1 - XPONDER - XPDR-NW1-RX XPONDER-NETWORK + XPONDER + XPDR-NW1-RX XPONDER-NETWORK Client-1 XPDR-NW1-RX - XPDR-NW1-TX XPONDER-NETWORK + XPDR-NW1-TX XPONDER-NETWORK Client-1 XPDR-NW1-TX - Client-1 XPONDER-CLIENT + Client-1 XPONDER-CLIENT XPDR-NW1 - XPDR-NW2-RX XPONDER-NETWORK + XPDR-NW2-RX XPONDER-NETWORK Client-2 XPDR-NW2-RX - XPDR-NW2-TX XPONDER-NETWORK + XPDR-NW2-TX XPONDER-NETWORK Client-2 XPDR-NW2-TX - Client-2 XPONDER-CLIENT + Client-2 XPONDER-CLIENT XPDR-NW2 - XPDR-NW3-RX XPONDER-NETWORK + XPDR-NW3-RX XPONDER-NETWORK Client-3 XPDR-NW3-RX - XPDR-NW3-TX XPONDER-NETWORK + XPDR-NW3-TX XPONDER-NETWORK Client-3 XPDR-NW3-TX - Client-3 XPONDER-CLIENT + Client-3 XPONDER-CLIENT XPDR-NW3 - XPDR-NW4-RX XPONDER-NETWORK + XPDR-NW4-RX XPONDER-NETWORK Client-4 XPDR-NW4-RX - XPDR-NW4-TX XPONDER-NETWORK + XPDR-NW4-TX XPONDER-NETWORK Client-4 XPDR-NW4-TX - Client-4 XPONDER-CLIENT + Client-4 XPONDER-CLIENT XPDR-NW4 - XPDR-NW5-RX XPONDER-NETWORK + XPDR-NW5-RX XPONDER-NETWORK Client-5 XPDR-NW5-RX - XPDR-NW5-TX XPONDER-NETWORK + XPDR-NW5-TX XPONDER-NETWORK Client-5 XPDR-NW5-TX - Client-5 XPONDER-CLIENT + Client-5 XPONDER-CLIENT XPDR-NW5 OpenROADM-4-2-DEG1 - DEGREE + DEGREE DEG1-CTP-TX - DEGREE-TX-CTP + DEGREE-TX-CTP DEG1-CTP-RX - DEGREE-RX-CTP + DEGREE-RX-CTP DEG1-TTP-RX - DEGREE-RX-TTP + DEGREE-RX-TTP DEG1-TTP-TX - DEGREE-TX-TTP + DEGREE-TX-TTP 7 8 @@ -1159,15 +1159,15 @@ Transport-underlayOpenROADM-4-2 OpenROADM-4-2-DEG2 - DEGREE + DEGREE DEG2-CTP-TX - DEGREE-TX-CTP + DEGREE-TX-CTP DEG2-CTP-RX - DEGREE-RX-CTP + DEGREE-RX-CTP DEG2-TTP-RX - DEGREE-RX-TTP + DEGREE-RX-TTP DEG2-TTP-TX - DEGREE-TX-TTP + DEGREE-TX-TTP 7 8 @@ -1182,15 +1182,15 @@ Transport-underlayOpenROADM-4-2 OpenROADM-4-2-DEG3 - DEGREE + DEGREE DEG3-CTP-TX - DEGREE-TX-CTP + DEGREE-TX-CTP DEG3-CTP-RX - DEGREE-RX-CTP + DEGREE-RX-CTP DEG3-TTP-RX - DEGREE-RX-TTP + DEGREE-RX-TTP DEG3-TTP-TX - DEGREE-TX-TTP + DEGREE-TX-TTP 7 8 @@ -1204,7 +1204,7 @@ 16 Transport-underlayOpenROADM-4-2 - OpenROADM-4-2-SRG1 SRG + OpenROADM-4-2-SRG1 SRG Transport-underlayOpenROADM-4-2 7 @@ -1219,94 +1219,94 @@ 16 SRG1-CP-RX - SRG-RX-CP + SRG-RX-CP SRG1-CP-TX - SRG-TX-CP + SRG-TX-CP SRG1-PP1-RX - SRG-RX-PP + SRG-RX-PP SRG1-PP1-TX - SRG-TX-PP + SRG-TX-PP SRG1-PP2-RX - SRG-RX-PP + SRG-RX-PP SRG1-PP2-TX - SRG-TX-PP + SRG-TX-PP SRG1-PP3-RX - SRG-RX-PP + SRG-RX-PP SRG1-PP3-TX - SRG-TX-PP + SRG-TX-PP SRG1-PP4-RX - SRG-RX-PP + SRG-RX-PP SRG1-PP4-TX - SRG-TX-PP + SRG-TX-PP SRG1-PP5-RX - SRG-RX-PP + SRG-RX-PP SRG1-PP5-TX - SRG-TX-PP + SRG-TX-PP XPONDER-4-2 Transport-underlayXPONDER-4-2 - XPONDER - XPDR-NW1-RX XPONDER-NETWORK + XPONDER + XPDR-NW1-RX XPONDER-NETWORK Client-1 XPDR-NW1-RX - XPDR-NW1-TX XPONDER-NETWORK + XPDR-NW1-TX XPONDER-NETWORK Client-1 XPDR-NW1-TX - Client-1 XPONDER-CLIENT + Client-1 XPONDER-CLIENT XPDR-NW1 - XPDR-NW2-RX XPONDER-NETWORK + XPDR-NW2-RX XPONDER-NETWORK Client-2 XPDR-NW2-RX - XPDR-NW2-TX XPONDER-NETWORK + XPDR-NW2-TX XPONDER-NETWORK Client-2 XPDR-NW2-TX - Client-2 XPONDER-CLIENT + Client-2 XPONDER-CLIENT XPDR-NW2 - XPDR-NW3-RX XPONDER-NETWORK + XPDR-NW3-RX XPONDER-NETWORK Client-3 XPDR-NW3-RX - XPDR-NW3-TX XPONDER-NETWORK + XPDR-NW3-TX XPONDER-NETWORK Client-3 XPDR-NW3-TX - Client-3 XPONDER-CLIENT + Client-3 XPONDER-CLIENT XPDR-NW3 - XPDR-NW4-RX XPONDER-NETWORK + XPDR-NW4-RX XPONDER-NETWORK Client-4 XPDR-NW4-RX - XPDR-NW4-TX XPONDER-NETWORK + XPDR-NW4-TX XPONDER-NETWORK Client-4 XPDR-NW4-TX - Client-4 XPONDER-CLIENT + Client-4 XPONDER-CLIENT XPDR-NW4 - XPDR-NW5-RX XPONDER-NETWORK + XPDR-NW5-RX XPONDER-NETWORK Client-5 XPDR-NW5-RX - XPDR-NW5-TX XPONDER-NETWORK + XPDR-NW5-TX XPONDER-NETWORK Client-5 XPDR-NW5-TX - Client-5 XPONDER-CLIENT + Client-5 XPONDER-CLIENT XPDR-NW5 OpenROADM-5-1-DEG1 - DEGREE + DEGREE DEG1-CTP-TX - DEGREE-TX-CTP + DEGREE-TX-CTP DEG1-CTP-RX - DEGREE-RX-CTP + DEGREE-RX-CTP DEG1-TTP-RX - DEGREE-RX-TTP + DEGREE-RX-TTP DEG1-TTP-TX - DEGREE-TX-TTP + DEGREE-TX-TTP 9 10 @@ -1321,15 +1321,15 @@ Transport-underlayOpenROADM-5-1 OpenROADM-5-1-DEG2 - DEGREE + DEGREE DEG2-CTP-TX - DEGREE-TX-CTP + DEGREE-TX-CTP DEG2-CTP-RX - DEGREE-RX-CTP + DEGREE-RX-CTP DEG2-TTP-RX - DEGREE-RX-TTP + DEGREE-RX-TTP DEG2-TTP-TX - DEGREE-TX-TTP + DEGREE-TX-TTP 9 10 @@ -1344,15 +1344,15 @@ Transport-underlayOpenROADM-5-1 OpenROADM-5-1-DEG3 - DEGREE + DEGREE DEG3-CTP-TX - DEGREE-TX-CTP + DEGREE-TX-CTP DEG3-CTP-RX - DEGREE-RX-CTP + DEGREE-RX-CTP DEG3-TTP-RX - DEGREE-RX-TTP + DEGREE-RX-TTP DEG3-TTP-TX - DEGREE-TX-TTP + DEGREE-TX-TTP 9 10 @@ -1366,7 +1366,7 @@ 18 Transport-underlayOpenROADM-5-1 - OpenROADM-5-1-SRG1 SRG + OpenROADM-5-1-SRG1 SRG Transport-underlayOpenROADM-5-1 9 @@ -1381,94 +1381,94 @@ 18 SRG1-CP-RX - SRG-RX-CP + SRG-RX-CP SRG1-CP-TX - SRG-TX-CP + SRG-TX-CP SRG1-PP1-RX - SRG-RX-PP + SRG-RX-PP SRG1-PP1-TX - SRG-TX-PP + SRG-TX-PP SRG1-PP2-RX - SRG-RX-PP + SRG-RX-PP SRG1-PP2-TX - SRG-TX-PP + SRG-TX-PP SRG1-PP3-RX - SRG-RX-PP + SRG-RX-PP SRG1-PP3-TX - SRG-TX-PP + SRG-TX-PP SRG1-PP4-RX - SRG-RX-PP + SRG-RX-PP SRG1-PP4-TX - SRG-TX-PP + SRG-TX-PP SRG1-PP5-RX - SRG-RX-PP + SRG-RX-PP SRG1-PP5-TX - SRG-TX-PP + SRG-TX-PP XPONDER-5-1 Transport-underlayXPONDER-5-1 - XPONDER - XPDR-NW1-RX XPONDER-NETWORK + XPONDER + XPDR-NW1-RX XPONDER-NETWORK Client-1 XPDR-NW1-RX - XPDR-NW1-TX XPONDER-NETWORK + XPDR-NW1-TX XPONDER-NETWORK Client-1 XPDR-NW1-TX - Client-1 XPONDER-CLIENT + Client-1 XPONDER-CLIENT XPDR-NW1 - XPDR-NW2-RX XPONDER-NETWORK + XPDR-NW2-RX XPONDER-NETWORK Client-2 XPDR-NW2-RX - XPDR-NW2-TX XPONDER-NETWORK + XPDR-NW2-TX XPONDER-NETWORK Client-2 XPDR-NW2-TX - Client-2 XPONDER-CLIENT + Client-2 XPONDER-CLIENT XPDR-NW2 - XPDR-NW3-RX XPONDER-NETWORK + XPDR-NW3-RX XPONDER-NETWORK Client-3 XPDR-NW3-RX - XPDR-NW3-TX XPONDER-NETWORK + XPDR-NW3-TX XPONDER-NETWORK Client-3 XPDR-NW3-TX - Client-3 XPONDER-CLIENT + Client-3 XPONDER-CLIENT XPDR-NW3 - XPDR-NW4-RX XPONDER-NETWORK + XPDR-NW4-RX XPONDER-NETWORK Client-4 XPDR-NW4-RX - XPDR-NW4-TX XPONDER-NETWORK + XPDR-NW4-TX XPONDER-NETWORK Client-4 XPDR-NW4-TX - Client-4 XPONDER-CLIENT + Client-4 XPONDER-CLIENT XPDR-NW4 - XPDR-NW5-RX XPONDER-NETWORK + XPDR-NW5-RX XPONDER-NETWORK Client-5 XPDR-NW5-RX - XPDR-NW5-TX XPONDER-NETWORK + XPDR-NW5-TX XPONDER-NETWORK Client-5 XPDR-NW5-TX - Client-5 XPONDER-CLIENT + Client-5 XPONDER-CLIENT XPDR-NW5 OpenROADM-5-2-DEG1 - DEGREE + DEGREE DEG1-CTP-TX - DEGREE-TX-CTP + DEGREE-TX-CTP DEG1-CTP-RX - DEGREE-RX-CTP + DEGREE-RX-CTP DEG1-TTP-RX - DEGREE-RX-TTP + DEGREE-RX-TTP DEG1-TTP-TX - DEGREE-TX-TTP + DEGREE-TX-TTP 9 10 @@ -1483,15 +1483,15 @@ Transport-underlayOpenROADM-5-2 OpenROADM-5-2-DEG2 - DEGREE + DEGREE DEG2-CTP-TX - DEGREE-TX-CTP + DEGREE-TX-CTP DEG2-CTP-RX - DEGREE-RX-CTP + DEGREE-RX-CTP DEG2-TTP-RX - DEGREE-RX-TTP + DEGREE-RX-TTP DEG2-TTP-TX - DEGREE-TX-TTP + DEGREE-TX-TTP 9 10 @@ -1506,15 +1506,15 @@ Transport-underlayOpenROADM-5-2 OpenROADM-5-2-DEG3 - DEGREE + DEGREE DEG3-CTP-TX - DEGREE-TX-CTP + DEGREE-TX-CTP DEG3-CTP-RX - DEGREE-RX-CTP + DEGREE-RX-CTP DEG3-TTP-RX - DEGREE-RX-TTP + DEGREE-RX-TTP DEG3-TTP-TX - DEGREE-TX-TTP + DEGREE-TX-TTP 9 10 @@ -1528,7 +1528,7 @@ 18 Transport-underlayOpenROADM-5-2 - OpenROADM-5-2-SRG1 SRG + OpenROADM-5-2-SRG1 SRG Transport-underlayOpenROADM-5-2 9 @@ -1543,265 +1543,265 @@ 18 SRG1-CP-RX - SRG-RX-CP + SRG-RX-CP SRG1-CP-TX - SRG-TX-CP + SRG-TX-CP SRG1-PP1-RX - SRG-RX-PP + SRG-RX-PP SRG1-PP1-TX - SRG-TX-PP + SRG-TX-PP SRG1-PP2-RX - SRG-RX-PP + SRG-RX-PP SRG1-PP2-TX - SRG-TX-PP + SRG-TX-PP SRG1-PP3-RX - SRG-RX-PP + SRG-RX-PP SRG1-PP3-TX - SRG-TX-PP + SRG-TX-PP SRG1-PP4-RX - SRG-RX-PP + SRG-RX-PP SRG1-PP4-TX - SRG-TX-PP + SRG-TX-PP SRG1-PP5-RX - SRG-RX-PP + SRG-RX-PP SRG1-PP5-TX - SRG-TX-PP + SRG-TX-PP XPONDER-5-2 Transport-underlayXPONDER-5-2 - XPONDER - XPDR-NW1-RX XPONDER-NETWORK + XPONDER + XPDR-NW1-RX XPONDER-NETWORK Client-1 XPDR-NW1-RX - XPDR-NW1-TX XPONDER-NETWORK + XPDR-NW1-TX XPONDER-NETWORK Client-1 XPDR-NW1-TX - Client-1 XPONDER-CLIENT + Client-1 XPONDER-CLIENT XPDR-NW1 - XPDR-NW2-RX XPONDER-NETWORK + XPDR-NW2-RX XPONDER-NETWORK Client-2 XPDR-NW2-RX - XPDR-NW2-TX XPONDER-NETWORK + XPDR-NW2-TX XPONDER-NETWORK Client-2 XPDR-NW2-TX - Client-2 XPONDER-CLIENT + Client-2 XPONDER-CLIENT XPDR-NW2 - XPDR-NW3-RX XPONDER-NETWORK + XPDR-NW3-RX XPONDER-NETWORK Client-3 XPDR-NW3-RX - XPDR-NW3-TX XPONDER-NETWORK + XPDR-NW3-TX XPONDER-NETWORK Client-3 XPDR-NW3-TX - Client-3 XPONDER-CLIENT + Client-3 XPONDER-CLIENT XPDR-NW3 - XPDR-NW4-RX XPONDER-NETWORK + XPDR-NW4-RX XPONDER-NETWORK Client-4 XPDR-NW4-RX - XPDR-NW4-TX XPONDER-NETWORK + XPDR-NW4-TX XPONDER-NETWORK Client-4 XPDR-NW4-TX - Client-4 XPONDER-CLIENT + Client-4 XPONDER-CLIENT XPDR-NW4 - XPDR-NW5-RX XPONDER-NETWORK + XPDR-NW5-RX XPONDER-NETWORK Client-5 XPDR-NW5-RX - XPDR-NW5-TX XPONDER-NETWORK + XPDR-NW5-TX XPONDER-NETWORK Client-5 XPDR-NW5-TX - Client-5 XPONDER-CLIENT + Client-5 XPONDER-CLIENT XPDR-NW5 OpenROADM-1-1-DEG1-DEG1-CTP-TXtoOpenROADM-1-1-DEG2-DEG2-CTP-RX OpenROADM-1-1-DEG1DEG1-CTP-TX OpenROADM-1-1-DEG2DEG2-CTP-RX OpenROADM-1-1-DEG2-DEG2-CTP-TXtoOpenROADM-1-1-DEG1-DEG1-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-1-1-DEG1-DEG1-CTP-TXtoOpenROADM-1-1-DEG3-DEG3-CTP-RX OpenROADM-1-1-DEG1DEG1-CTP-TX OpenROADM-1-1-DEG3DEG3-CTP-RX OpenROADM-1-1-DEG3-DEG3-CTP-TXtoOpenROADM-1-1-DEG1-DEG1-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-1-1-SRG1-SRG1-CP-TXtoOpenROADM-1-1-DEG1-DEG1-CTP-RX OpenROADM-1-1-SRG1SRG1-CP-TX OpenROADM-1-1-DEG1DEG1-CTP-RX OpenROADM-1-1-DEG1-DEG1-CTP-TXtoOpenROADM-1-1-SRG1-SRG1-CP-RX - ADD-LINK + ADD-LINK OpenROADM-1-1-DEG1-DEG1-CTP-TXtoOpenROADM-1-1-SRG1-SRG1-CP-RX OpenROADM-1-1-DEG1DEG1-CTP-TX OpenROADM-1-1-SRG1SRG1-CP-RX OpenROADM-1-1-SRG1-SRG1-CP-TXtoOpenROADM-1-1-DEG1-DEG1-CTP-RX - DROP-LINK + DROP-LINK OpenROADM-1-1-DEG2-DEG2-CTP-TXtoOpenROADM-1-1-DEG1-DEG1-CTP-RX OpenROADM-1-1-DEG2DEG2-CTP-TX OpenROADM-1-1-DEG1DEG1-CTP-RX OpenROADM-1-1-DEG1-DEG1-CTP-TXtoOpenROADM-1-1-DEG2-DEG2-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-1-1-DEG2-DEG2-CTP-TXtoOpenROADM-1-1-DEG3-DEG3-CTP-RX OpenROADM-1-1-DEG2DEG2-CTP-TX OpenROADM-1-1-DEG3DEG3-CTP-RX OpenROADM-1-1-DEG3-DEG3-CTP-TXtoOpenROADM-1-1-DEG2-DEG2-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-1-1-SRG1-SRG1-CP-TXtoOpenROADM-1-1-DEG2-DEG2-CTP-RX OpenROADM-1-1-SRG1SRG1-CP-TX OpenROADM-1-1-DEG2DEG2-CTP-RX OpenROADM-1-1-DEG2-DEG2-CTP-TXtoOpenROADM-1-1-SRG1-SRG1-CP-RX - ADD-LINK + ADD-LINK OpenROADM-1-1-DEG2-DEG2-CTP-TXtoOpenROADM-1-1-SRG1-SRG1-CP-RX OpenROADM-1-1-DEG2DEG2-CTP-TX OpenROADM-1-1-SRG1SRG1-CP-RX OpenROADM-1-1-SRG1-SRG1-CP-TXtoOpenROADM-1-1-DEG2-DEG2-CTP-RX - DROP-LINK + DROP-LINK OpenROADM-1-1-DEG3-DEG3-CTP-TXtoOpenROADM-1-1-DEG1-DEG1-CTP-RX OpenROADM-1-1-DEG3DEG3-CTP-TX OpenROADM-1-1-DEG1DEG1-CTP-RX OpenROADM-1-1-DEG1-DEG1-CTP-TXtoOpenROADM-1-1-DEG3-DEG3-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-1-1-DEG3-DEG3-CTP-TXtoOpenROADM-1-1-DEG2-DEG2-CTP-RX OpenROADM-1-1-DEG3DEG3-CTP-TX OpenROADM-1-1-DEG2DEG2-CTP-RX OpenROADM-1-1-DEG2-DEG2-CTP-TXtoOpenROADM-1-1-DEG3-DEG3-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-1-1-SRG1-SRG1-CP-TXtoOpenROADM-1-1-DEG3-DEG3-CTP-RX OpenROADM-1-1-SRG1SRG1-CP-TX OpenROADM-1-1-DEG3DEG3-CTP-RX OpenROADM-1-1-DEG3-DEG3-CTP-TXtoOpenROADM-1-1-SRG1-SRG1-CP-RX - ADD-LINK + ADD-LINK OpenROADM-1-1-DEG3-DEG3-CTP-TXtoOpenROADM-1-1-SRG1-SRG1-CP-RX OpenROADM-1-1-DEG3DEG3-CTP-TX OpenROADM-1-1-SRG1SRG1-CP-RX OpenROADM-1-1-SRG1-SRG1-CP-TXtoOpenROADM-1-1-DEG3-DEG3-CTP-RX - DROP-LINK + DROP-LINK XPONDER-1-1XPDR-NW1-TX-toOpenROADM-1-1-SRG1-SRG1-PP1-RX XPONDER-1-1XPDR-NW1-TX OpenROADM-1-1-SRG1SRG1-PP1-RX OpenROADM-1-1-SRG1-SRG1-PP1-TX-to-XPONDER-1-1XPDR-NW1-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-1-1-SRG1-SRG1-PP1-TX-to-XPONDER-1-1XPDR-NW1-RX OpenROADM-1-1-SRG1SRG1-PP1-TX XPONDER-1-1XPDR-NW1-RX XPONDER-1-1XPDR-NW1-TX-toOpenROADM-1-1-SRG1-SRG1-PP1-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-1-1XPDR-NW2-TX-toOpenROADM-1-1-SRG1-SRG1-PP2-RX XPONDER-1-1XPDR-NW2-TX OpenROADM-1-1-SRG1SRG1-PP2-RX OpenROADM-1-1-SRG1-SRG1-PP2-TX-to-XPONDER-1-1XPDR-NW2-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-1-1-SRG1-SRG1-PP2-TX-to-XPONDER-1-1XPDR-NW2-RX OpenROADM-1-1-SRG1SRG1-PP2-TX XPONDER-1-1XPDR-NW2-RX XPONDER-1-1XPDR-NW2-TX-toOpenROADM-1-1-SRG1-SRG1-PP2-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-1-1XPDR-NW3-TX-toOpenROADM-1-1-SRG1-SRG1-PP3-RX XPONDER-1-1XPDR-NW3-TX OpenROADM-1-1-SRG1SRG1-PP3-RX OpenROADM-1-1-SRG1-SRG1-PP3-TX-to-XPONDER-1-1XPDR-NW3-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-1-1-SRG1-SRG1-PP3-TX-to-XPONDER-1-1XPDR-NW3-RX OpenROADM-1-1-SRG1SRG1-PP3-TX XPONDER-1-1XPDR-NW3-RX XPONDER-1-1XPDR-NW3-TX-toOpenROADM-1-1-SRG1-SRG1-PP3-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-1-1XPDR-NW4-TX-toOpenROADM-1-1-SRG1-SRG1-PP4-RX XPONDER-1-1XPDR-NW4-TX OpenROADM-1-1-SRG1SRG1-PP4-RX OpenROADM-1-1-SRG1-SRG1-PP4-TX-to-XPONDER-1-1XPDR-NW4-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-1-1-SRG1-SRG1-PP4-TX-to-XPONDER-1-1XPDR-NW4-RX OpenROADM-1-1-SRG1SRG1-PP4-TX XPONDER-1-1XPDR-NW4-RX XPONDER-1-1XPDR-NW4-TX-toOpenROADM-1-1-SRG1-SRG1-PP4-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-1-1XPDR-NW5-TX-toOpenROADM-1-1-SRG1-SRG1-PP5-RX XPONDER-1-1XPDR-NW5-TX OpenROADM-1-1-SRG1SRG1-PP5-RX OpenROADM-1-1-SRG1-SRG1-PP5-TX-to-XPONDER-1-1XPDR-NW5-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-1-1-SRG1-SRG1-PP5-TX-to-XPONDER-1-1XPDR-NW5-RX OpenROADM-1-1-SRG1SRG1-PP5-TX XPONDER-1-1XPDR-NW5-RX XPONDER-1-1XPDR-NW5-TX-toOpenROADM-1-1-SRG1-SRG1-PP5-RX - XPONDER-INPUT + XPONDER-INPUT OpenROADM-1-2-DEG1-DEG1-CTP-TXtoOpenROADM-1-2-DEG2-DEG2-CTP-RX OpenROADM-1-2-DEG1DEG1-CTP-TX OpenROADM-1-2-DEG2DEG2-CTP-RX OpenROADM-1-2-DEG2-DEG2-CTP-TXtoOpenROADM-1-2-DEG1-DEG1-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-1-2-DEG1-DEG1-CTP-TXtoOpenROADM-1-2-DEG3-DEG3-CTP-RX OpenROADM-1-2-DEG1DEG1-CTP-TX OpenROADM-1-2-DEG3DEG3-CTP-RX OpenROADM-1-2-DEG3-DEG3-CTP-TXtoOpenROADM-1-2-DEG1-DEG1-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-1-2-SRG1-SRG1-CP-TXtoOpenROADM-1-2-DEG1-DEG1-CTP-RX OpenROADM-1-2-SRG1SRG1-CP-TX OpenROADM-1-2-DEG1DEG1-CTP-RX OpenROADM-1-2-DEG1-DEG1-CTP-TXtoOpenROADM-1-2-SRG1-SRG1-CP-RX - ADD-LINK + ADD-LINK OpenROADM-1-2-DEG1-DEG1-CTP-TXtoOpenROADM-1-2-SRG1-SRG1-CP-RX OpenROADM-1-2-DEG1DEG1-CTP-TX OpenROADM-1-2-SRG1SRG1-CP-RX OpenROADM-1-2-SRG1-SRG1-CP-TXtoOpenROADM-1-2-DEG1-DEG1-CTP-RX - DROP-LINK + DROP-LINK OpenROADM-1-2-DEG2-DEG2-CTP-TXtoOpenROADM-1-2-DEG1-DEG1-CTP-RX OpenROADM-1-2-DEG2DEG2-CTP-TX OpenROADM-1-2-DEG1DEG1-CTP-RX OpenROADM-1-2-DEG1-DEG1-CTP-TXtoOpenROADM-1-2-DEG2-DEG2-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-1-2-DEG2-DEG2-CTP-TXtoOpenROADM-1-2-DEG3-DEG3-CTP-RX OpenROADM-1-2-DEG2DEG2-CTP-TX OpenROADM-1-2-DEG3DEG3-CTP-RX OpenROADM-1-2-DEG3-DEG3-CTP-TXtoOpenROADM-1-2-DEG2-DEG2-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-1-2-SRG1-SRG1-CP-TXtoOpenROADM-1-2-DEG2-DEG2-CTP-RX OpenROADM-1-2-SRG1SRG1-CP-TX OpenROADM-1-2-DEG2DEG2-CTP-RX OpenROADM-1-2-DEG2-DEG2-CTP-TXtoOpenROADM-1-2-SRG1-SRG1-CP-RX - ADD-LINK + ADD-LINK OpenROADM-1-2-DEG2-DEG2-CTP-TXtoOpenROADM-1-2-SRG1-SRG1-CP-RX OpenROADM-1-2-DEG2DEG2-CTP-TX OpenROADM-1-2-SRG1SRG1-CP-RX OpenROADM-1-2-SRG1-SRG1-CP-TXtoOpenROADM-1-2-DEG2-DEG2-CTP-RX - DROP-LINK + DROP-LINK OpenROADM-1-2-DEG3-DEG3-CTP-TXtoOpenROADM-1-2-DEG1-DEG1-CTP-RX OpenROADM-1-2-DEG3DEG3-CTP-TX OpenROADM-1-2-DEG1DEG1-CTP-RX OpenROADM-1-2-DEG1-DEG1-CTP-TXtoOpenROADM-1-2-DEG3-DEG3-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-1-2-DEG3-DEG3-CTP-TXtoOpenROADM-1-2-DEG2-DEG2-CTP-RX OpenROADM-1-2-DEG3DEG3-CTP-TX OpenROADM-1-2-DEG2DEG2-CTP-RX OpenROADM-1-2-DEG2-DEG2-CTP-TXtoOpenROADM-1-2-DEG3-DEG3-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-1-2-SRG1-SRG1-CP-TXtoOpenROADM-1-2-DEG3-DEG3-CTP-RX OpenROADM-1-2-SRG1SRG1-CP-TX OpenROADM-1-2-DEG3DEG3-CTP-RX OpenROADM-1-2-DEG3-DEG3-CTP-TXtoOpenROADM-1-2-SRG1-SRG1-CP-RX - ADD-LINK + ADD-LINK OpenROADM-1-2-DEG3-DEG3-CTP-TXtoOpenROADM-1-2-SRG1-SRG1-CP-RX OpenROADM-1-2-DEG3DEG3-CTP-TX OpenROADM-1-2-SRG1SRG1-CP-RX OpenROADM-1-2-SRG1-SRG1-CP-TXtoOpenROADM-1-2-DEG3-DEG3-CTP-RX - DROP-LINK + DROP-LINK XPONDER-1-2XPDR-NW1-TX-toOpenROADM-1-2-SRG1-SRG1-PP1-RX XPONDER-1-2XPDR-NW1-TX OpenROADM-1-2-SRG1SRG1-PP1-RX OpenROADM-1-2-SRG1-SRG1-PP1-TX-to-XPONDER-1-2XPDR-NW1-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-1-2-SRG1-SRG1-PP1-TX-to-XPONDER-1-2XPDR-NW1-RX OpenROADM-1-2-SRG1SRG1-PP1-TX XPONDER-1-2XPDR-NW1-RX XPONDER-1-2XPDR-NW1-TX-toOpenROADM-1-2-SRG1-SRG1-PP1-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-1-2XPDR-NW2-TX-toOpenROADM-1-2-SRG1-SRG1-PP2-RX XPONDER-1-2XPDR-NW2-TX OpenROADM-1-2-SRG1SRG1-PP2-RX OpenROADM-1-2-SRG1-SRG1-PP2-TX-to-XPONDER-1-2XPDR-NW2-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-1-2-SRG1-SRG1-PP2-TX-to-XPONDER-1-2XPDR-NW2-RX OpenROADM-1-2-SRG1SRG1-PP2-TX XPONDER-1-2XPDR-NW2-RX XPONDER-1-2XPDR-NW2-TX-toOpenROADM-1-2-SRG1-SRG1-PP2-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-1-2XPDR-NW3-TX-toOpenROADM-1-2-SRG1-SRG1-PP3-RX XPONDER-1-2XPDR-NW3-TX OpenROADM-1-2-SRG1SRG1-PP3-RX OpenROADM-1-2-SRG1-SRG1-PP3-TX-to-XPONDER-1-2XPDR-NW3-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-1-2-SRG1-SRG1-PP3-TX-to-XPONDER-1-2XPDR-NW3-RX OpenROADM-1-2-SRG1SRG1-PP3-TX XPONDER-1-2XPDR-NW3-RX XPONDER-1-2XPDR-NW3-TX-toOpenROADM-1-2-SRG1-SRG1-PP3-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-1-2XPDR-NW4-TX-toOpenROADM-1-2-SRG1-SRG1-PP4-RX XPONDER-1-2XPDR-NW4-TX OpenROADM-1-2-SRG1SRG1-PP4-RX OpenROADM-1-2-SRG1-SRG1-PP4-TX-to-XPONDER-1-2XPDR-NW4-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-1-2-SRG1-SRG1-PP4-TX-to-XPONDER-1-2XPDR-NW4-RX OpenROADM-1-2-SRG1SRG1-PP4-TX XPONDER-1-2XPDR-NW4-RX XPONDER-1-2XPDR-NW4-TX-toOpenROADM-1-2-SRG1-SRG1-PP4-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-1-2XPDR-NW5-TX-toOpenROADM-1-2-SRG1-SRG1-PP5-RX XPONDER-1-2XPDR-NW5-TX OpenROADM-1-2-SRG1SRG1-PP5-RX OpenROADM-1-2-SRG1-SRG1-PP5-TX-to-XPONDER-1-2XPDR-NW5-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-1-2-SRG1-SRG1-PP5-TX-to-XPONDER-1-2XPDR-NW5-RX OpenROADM-1-2-SRG1SRG1-PP5-TX XPONDER-1-2XPDR-NW5-RX XPONDER-1-2XPDR-NW5-TX-toOpenROADM-1-2-SRG1-SRG1-PP5-RX - XPONDER-INPUT + XPONDER-INPUT OpenROADM-1-1-DEG1-to-OpenROADM-1-2-DEG1 OpenROADM-1-2-DEG1-to-OpenROADM-1-1-DEG1 1 - ROADM-TO-ROADM + ROADM-TO-ROADM OpenROADM-1-1-DEG1DEG1-TTP-TX OpenROADM-1-2-DEG1DEG1-TTP-RX @@ -1826,7 +1826,7 @@ OpenROADM-1-2-DEG1-to-OpenROADM-1-1-DEG1 OpenROADM-1-1-DEG1-to-OpenROADM-1-2-DEG1 1 - ROADM-TO-ROADM + ROADM-TO-ROADM OpenROADM-1-2-DEG1DEG1-TTP-TX OpenROADM-1-1-DEG1DEG1-TTP-RX @@ -1851,7 +1851,7 @@ OpenROADM-1-2-DEG2-to-OpenROADM-1-1-DEG2 OpenROADM-1-1-DEG2-to-OpenROADM-1-2-DEG2 1 - ROADM-TO-ROADM + ROADM-TO-ROADM OpenROADM-1-2-DEG2DEG2-TTP-TX OpenROADM-1-1-DEG2DEG2-TTP-RX @@ -1876,7 +1876,7 @@ OpenROADM-1-1-DEG2-to-OpenROADM-1-2-DEG2 OpenROADM-1-2-DEG2-to-OpenROADM-1-1-DEG2 1 - ROADM-TO-ROADM + ROADM-TO-ROADM OpenROADM-1-1-DEG2DEG2-TTP-TX OpenROADM-1-2-DEG2DEG2-TTP-RX @@ -1900,184 +1900,184 @@ OpenROADM-2-1-DEG1-DEG1-CTP-TXtoOpenROADM-2-1-DEG2-DEG2-CTP-RX OpenROADM-2-1-DEG1DEG1-CTP-TX OpenROADM-2-1-DEG2DEG2-CTP-RX OpenROADM-2-1-DEG2-DEG2-CTP-TXtoOpenROADM-2-1-DEG1-DEG1-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-2-1-DEG1-DEG1-CTP-TXtoOpenROADM-2-1-DEG3-DEG3-CTP-RX OpenROADM-2-1-DEG1DEG1-CTP-TX OpenROADM-2-1-DEG3DEG3-CTP-RX OpenROADM-2-1-DEG3-DEG3-CTP-TXtoOpenROADM-2-1-DEG1-DEG1-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-2-1-SRG1-SRG1-CP-TXtoOpenROADM-2-1-DEG1-DEG1-CTP-RX OpenROADM-2-1-SRG1SRG1-CP-TX OpenROADM-2-1-DEG1DEG1-CTP-RX OpenROADM-2-1-DEG1-DEG1-CTP-TXtoOpenROADM-2-1-SRG1-SRG1-CP-RX - ADD-LINK + ADD-LINK OpenROADM-2-1-DEG1-DEG1-CTP-TXtoOpenROADM-2-1-SRG1-SRG1-CP-RX OpenROADM-2-1-DEG1DEG1-CTP-TX OpenROADM-2-1-SRG1SRG1-CP-RX OpenROADM-2-1-SRG1-SRG1-CP-TXtoOpenROADM-2-1-DEG1-DEG1-CTP-RX - DROP-LINK + DROP-LINK OpenROADM-2-1-DEG2-DEG2-CTP-TXtoOpenROADM-2-1-DEG1-DEG1-CTP-RX OpenROADM-2-1-DEG2DEG2-CTP-TX OpenROADM-2-1-DEG1DEG1-CTP-RX OpenROADM-2-1-DEG1-DEG1-CTP-TXtoOpenROADM-2-1-DEG2-DEG2-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-2-1-DEG2-DEG2-CTP-TXtoOpenROADM-2-1-DEG3-DEG3-CTP-RX OpenROADM-2-1-DEG2DEG2-CTP-TX OpenROADM-2-1-DEG3DEG3-CTP-RX OpenROADM-2-1-DEG3-DEG3-CTP-TXtoOpenROADM-2-1-DEG2-DEG2-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-2-1-SRG1-SRG1-CP-TXtoOpenROADM-2-1-DEG2-DEG2-CTP-RX OpenROADM-2-1-SRG1SRG1-CP-TX OpenROADM-2-1-DEG2DEG2-CTP-RX OpenROADM-2-1-DEG2-DEG2-CTP-TXtoOpenROADM-2-1-SRG1-SRG1-CP-RX - ADD-LINK + ADD-LINK OpenROADM-2-1-DEG2-DEG2-CTP-TXtoOpenROADM-2-1-SRG1-SRG1-CP-RX OpenROADM-2-1-DEG2DEG2-CTP-TX OpenROADM-2-1-SRG1SRG1-CP-RX OpenROADM-2-1-SRG1-SRG1-CP-TXtoOpenROADM-2-1-DEG2-DEG2-CTP-RX - DROP-LINK + DROP-LINK OpenROADM-2-1-DEG3-DEG3-CTP-TXtoOpenROADM-2-1-DEG1-DEG1-CTP-RX OpenROADM-2-1-DEG3DEG3-CTP-TX OpenROADM-2-1-DEG1DEG1-CTP-RX OpenROADM-2-1-DEG1-DEG1-CTP-TXtoOpenROADM-2-1-DEG3-DEG3-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-2-1-DEG3-DEG3-CTP-TXtoOpenROADM-2-1-DEG2-DEG2-CTP-RX OpenROADM-2-1-DEG3DEG3-CTP-TX OpenROADM-2-1-DEG2DEG2-CTP-RX OpenROADM-2-1-DEG2-DEG2-CTP-TXtoOpenROADM-2-1-DEG3-DEG3-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-2-1-SRG1-SRG1-CP-TXtoOpenROADM-2-1-DEG3-DEG3-CTP-RX OpenROADM-2-1-SRG1SRG1-CP-TX OpenROADM-2-1-DEG3DEG3-CTP-RX OpenROADM-2-1-DEG3-DEG3-CTP-TXtoOpenROADM-2-1-SRG1-SRG1-CP-RX - ADD-LINK + ADD-LINK OpenROADM-2-1-DEG3-DEG3-CTP-TXtoOpenROADM-2-1-SRG1-SRG1-CP-RX OpenROADM-2-1-DEG3DEG3-CTP-TX OpenROADM-2-1-SRG1SRG1-CP-RX OpenROADM-2-1-SRG1-SRG1-CP-TXtoOpenROADM-2-1-DEG3-DEG3-CTP-RX - DROP-LINK + DROP-LINK XPONDER-2-1XPDR-NW1-TX-toOpenROADM-2-1-SRG1-SRG1-PP1-RX XPONDER-2-1XPDR-NW1-TX OpenROADM-2-1-SRG1SRG1-PP1-RX OpenROADM-2-1-SRG1-SRG1-PP1-TX-to-XPONDER-2-1XPDR-NW1-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-2-1-SRG1-SRG1-PP1-TX-to-XPONDER-2-1XPDR-NW1-RX OpenROADM-2-1-SRG1SRG1-PP1-TX XPONDER-2-1XPDR-NW1-RX XPONDER-2-1XPDR-NW1-TX-toOpenROADM-2-1-SRG1-SRG1-PP1-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-2-1XPDR-NW2-TX-toOpenROADM-2-1-SRG1-SRG1-PP2-RX XPONDER-2-1XPDR-NW2-TX OpenROADM-2-1-SRG1SRG1-PP2-RX OpenROADM-2-1-SRG1-SRG1-PP2-TX-to-XPONDER-2-1XPDR-NW2-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-2-1-SRG1-SRG1-PP2-TX-to-XPONDER-2-1XPDR-NW2-RX OpenROADM-2-1-SRG1SRG1-PP2-TX XPONDER-2-1XPDR-NW2-RX XPONDER-2-1XPDR-NW2-TX-toOpenROADM-2-1-SRG1-SRG1-PP2-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-2-1XPDR-NW3-TX-toOpenROADM-2-1-SRG1-SRG1-PP3-RX XPONDER-2-1XPDR-NW3-TX OpenROADM-2-1-SRG1SRG1-PP3-RX OpenROADM-2-1-SRG1-SRG1-PP3-TX-to-XPONDER-2-1XPDR-NW3-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-2-1-SRG1-SRG1-PP3-TX-to-XPONDER-2-1XPDR-NW3-RX OpenROADM-2-1-SRG1SRG1-PP3-TX XPONDER-2-1XPDR-NW3-RX XPONDER-2-1XPDR-NW3-TX-toOpenROADM-2-1-SRG1-SRG1-PP3-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-2-1XPDR-NW4-TX-toOpenROADM-2-1-SRG1-SRG1-PP4-RX XPONDER-2-1XPDR-NW4-TX OpenROADM-2-1-SRG1SRG1-PP4-RX OpenROADM-2-1-SRG1-SRG1-PP4-TX-to-XPONDER-2-1XPDR-NW4-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-2-1-SRG1-SRG1-PP4-TX-to-XPONDER-2-1XPDR-NW4-RX OpenROADM-2-1-SRG1SRG1-PP4-TX XPONDER-2-1XPDR-NW4-RX XPONDER-2-1XPDR-NW4-TX-toOpenROADM-2-1-SRG1-SRG1-PP4-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-2-1XPDR-NW5-TX-toOpenROADM-2-1-SRG1-SRG1-PP5-RX XPONDER-2-1XPDR-NW5-TX OpenROADM-2-1-SRG1SRG1-PP5-RX OpenROADM-2-1-SRG1-SRG1-PP5-TX-to-XPONDER-2-1XPDR-NW5-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-2-1-SRG1-SRG1-PP5-TX-to-XPONDER-2-1XPDR-NW5-RX OpenROADM-2-1-SRG1SRG1-PP5-TX XPONDER-2-1XPDR-NW5-RX XPONDER-2-1XPDR-NW5-TX-toOpenROADM-2-1-SRG1-SRG1-PP5-RX - XPONDER-INPUT + XPONDER-INPUT OpenROADM-2-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-2-DEG2-DEG2-CTP-RX OpenROADM-2-2-DEG1DEG1-CTP-TX OpenROADM-2-2-DEG2DEG2-CTP-RX OpenROADM-2-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-2-DEG1-DEG1-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-2-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-2-DEG3-DEG3-CTP-RX OpenROADM-2-2-DEG1DEG1-CTP-TX OpenROADM-2-2-DEG3DEG3-CTP-RX OpenROADM-2-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-2-DEG1-DEG1-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-2-2-SRG1-SRG1-CP-TXtoOpenROADM-2-2-DEG1-DEG1-CTP-RX OpenROADM-2-2-SRG1SRG1-CP-TX OpenROADM-2-2-DEG1DEG1-CTP-RX OpenROADM-2-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-2-SRG1-SRG1-CP-RX - ADD-LINK + ADD-LINK OpenROADM-2-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-2-SRG1-SRG1-CP-RX OpenROADM-2-2-DEG1DEG1-CTP-TX OpenROADM-2-2-SRG1SRG1-CP-RX OpenROADM-2-2-SRG1-SRG1-CP-TXtoOpenROADM-2-2-DEG1-DEG1-CTP-RX - DROP-LINK + DROP-LINK OpenROADM-2-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-2-DEG1-DEG1-CTP-RX OpenROADM-2-2-DEG2DEG2-CTP-TX OpenROADM-2-2-DEG1DEG1-CTP-RX OpenROADM-2-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-2-DEG2-DEG2-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-2-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-2-DEG3-DEG3-CTP-RX OpenROADM-2-2-DEG2DEG2-CTP-TX OpenROADM-2-2-DEG3DEG3-CTP-RX OpenROADM-2-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-2-DEG2-DEG2-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-2-2-SRG1-SRG1-CP-TXtoOpenROADM-2-2-DEG2-DEG2-CTP-RX OpenROADM-2-2-SRG1SRG1-CP-TX OpenROADM-2-2-DEG2DEG2-CTP-RX OpenROADM-2-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-2-SRG1-SRG1-CP-RX - ADD-LINK + ADD-LINK OpenROADM-2-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-2-SRG1-SRG1-CP-RX OpenROADM-2-2-DEG2DEG2-CTP-TX OpenROADM-2-2-SRG1SRG1-CP-RX OpenROADM-2-2-SRG1-SRG1-CP-TXtoOpenROADM-2-2-DEG2-DEG2-CTP-RX - DROP-LINK + DROP-LINK OpenROADM-2-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-2-DEG1-DEG1-CTP-RX OpenROADM-2-2-DEG3DEG3-CTP-TX OpenROADM-2-2-DEG1DEG1-CTP-RX OpenROADM-2-2-DEG1-DEG1-CTP-TXtoOpenROADM-2-2-DEG3-DEG3-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-2-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-2-DEG2-DEG2-CTP-RX OpenROADM-2-2-DEG3DEG3-CTP-TX OpenROADM-2-2-DEG2DEG2-CTP-RX OpenROADM-2-2-DEG2-DEG2-CTP-TXtoOpenROADM-2-2-DEG3-DEG3-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-2-2-SRG1-SRG1-CP-TXtoOpenROADM-2-2-DEG3-DEG3-CTP-RX OpenROADM-2-2-SRG1SRG1-CP-TX OpenROADM-2-2-DEG3DEG3-CTP-RX OpenROADM-2-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-2-SRG1-SRG1-CP-RX - ADD-LINK + ADD-LINK OpenROADM-2-2-DEG3-DEG3-CTP-TXtoOpenROADM-2-2-SRG1-SRG1-CP-RX OpenROADM-2-2-DEG3DEG3-CTP-TX OpenROADM-2-2-SRG1SRG1-CP-RX OpenROADM-2-2-SRG1-SRG1-CP-TXtoOpenROADM-2-2-DEG3-DEG3-CTP-RX - DROP-LINK + DROP-LINK XPONDER-2-2XPDR-NW1-TX-toOpenROADM-2-2-SRG1-SRG1-PP1-RX XPONDER-2-2XPDR-NW1-TX OpenROADM-2-2-SRG1SRG1-PP1-RX OpenROADM-2-2-SRG1-SRG1-PP1-TX-to-XPONDER-2-2XPDR-NW1-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-2-2-SRG1-SRG1-PP1-TX-to-XPONDER-2-2XPDR-NW1-RX OpenROADM-2-2-SRG1SRG1-PP1-TX XPONDER-2-2XPDR-NW1-RX XPONDER-2-2XPDR-NW1-TX-toOpenROADM-2-2-SRG1-SRG1-PP1-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-2-2XPDR-NW2-TX-toOpenROADM-2-2-SRG1-SRG1-PP2-RX XPONDER-2-2XPDR-NW2-TX OpenROADM-2-2-SRG1SRG1-PP2-RX OpenROADM-2-2-SRG1-SRG1-PP2-TX-to-XPONDER-2-2XPDR-NW2-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-2-2-SRG1-SRG1-PP2-TX-to-XPONDER-2-2XPDR-NW2-RX OpenROADM-2-2-SRG1SRG1-PP2-TX XPONDER-2-2XPDR-NW2-RX XPONDER-2-2XPDR-NW2-TX-toOpenROADM-2-2-SRG1-SRG1-PP2-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-2-2XPDR-NW3-TX-toOpenROADM-2-2-SRG1-SRG1-PP3-RX XPONDER-2-2XPDR-NW3-TX OpenROADM-2-2-SRG1SRG1-PP3-RX OpenROADM-2-2-SRG1-SRG1-PP3-TX-to-XPONDER-2-2XPDR-NW3-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-2-2-SRG1-SRG1-PP3-TX-to-XPONDER-2-2XPDR-NW3-RX OpenROADM-2-2-SRG1SRG1-PP3-TX XPONDER-2-2XPDR-NW3-RX XPONDER-2-2XPDR-NW3-TX-toOpenROADM-2-2-SRG1-SRG1-PP3-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-2-2XPDR-NW4-TX-toOpenROADM-2-2-SRG1-SRG1-PP4-RX XPONDER-2-2XPDR-NW4-TX OpenROADM-2-2-SRG1SRG1-PP4-RX OpenROADM-2-2-SRG1-SRG1-PP4-TX-to-XPONDER-2-2XPDR-NW4-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-2-2-SRG1-SRG1-PP4-TX-to-XPONDER-2-2XPDR-NW4-RX OpenROADM-2-2-SRG1SRG1-PP4-TX XPONDER-2-2XPDR-NW4-RX XPONDER-2-2XPDR-NW4-TX-toOpenROADM-2-2-SRG1-SRG1-PP4-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-2-2XPDR-NW5-TX-toOpenROADM-2-2-SRG1-SRG1-PP5-RX XPONDER-2-2XPDR-NW5-TX OpenROADM-2-2-SRG1SRG1-PP5-RX OpenROADM-2-2-SRG1-SRG1-PP5-TX-to-XPONDER-2-2XPDR-NW5-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-2-2-SRG1-SRG1-PP5-TX-to-XPONDER-2-2XPDR-NW5-RX OpenROADM-2-2-SRG1SRG1-PP5-TX XPONDER-2-2XPDR-NW5-RX XPONDER-2-2XPDR-NW5-TX-toOpenROADM-2-2-SRG1-SRG1-PP5-RX - XPONDER-INPUT + XPONDER-INPUT OpenROADM-2-1-DEG1-to-OpenROADM-2-2-DEG1 OpenROADM-2-2-DEG1-to-OpenROADM-2-1-DEG1 1 - ROADM-TO-ROADM + ROADM-TO-ROADM OpenROADM-2-1-DEG1DEG1-TTP-TX OpenROADM-2-2-DEG1DEG1-TTP-RX @@ -2102,7 +2102,7 @@ OpenROADM-2-2-DEG1-to-OpenROADM-2-1-DEG1 OpenROADM-2-1-DEG1-to-OpenROADM-2-2-DEG1 1 - ROADM-TO-ROADM + ROADM-TO-ROADM OpenROADM-2-2-DEG1DEG1-TTP-TX OpenROADM-2-1-DEG1DEG1-TTP-RX @@ -2127,7 +2127,7 @@ OpenROADM-2-2-DEG2-to-OpenROADM-2-1-DEG2 OpenROADM-2-1-DEG2-to-OpenROADM-2-2-DEG2 1 - ROADM-TO-ROADM + ROADM-TO-ROADM OpenROADM-2-2-DEG2DEG2-TTP-TX OpenROADM-2-1-DEG2DEG2-TTP-RX @@ -2152,7 +2152,7 @@ OpenROADM-2-1-DEG2-to-OpenROADM-2-2-DEG2 OpenROADM-2-2-DEG2-to-OpenROADM-2-1-DEG2 1 - ROADM-TO-ROADM + ROADM-TO-ROADM OpenROADM-2-1-DEG2DEG2-TTP-TX OpenROADM-2-2-DEG2DEG2-TTP-RX @@ -2176,184 +2176,184 @@ OpenROADM-3-1-DEG1-DEG1-CTP-TXtoOpenROADM-3-1-DEG2-DEG2-CTP-RX OpenROADM-3-1-DEG1DEG1-CTP-TX OpenROADM-3-1-DEG2DEG2-CTP-RX OpenROADM-3-1-DEG2-DEG2-CTP-TXtoOpenROADM-3-1-DEG1-DEG1-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-3-1-DEG1-DEG1-CTP-TXtoOpenROADM-3-1-DEG3-DEG3-CTP-RX OpenROADM-3-1-DEG1DEG1-CTP-TX OpenROADM-3-1-DEG3DEG3-CTP-RX OpenROADM-3-1-DEG3-DEG3-CTP-TXtoOpenROADM-3-1-DEG1-DEG1-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-3-1-SRG1-SRG1-CP-TXtoOpenROADM-3-1-DEG1-DEG1-CTP-RX OpenROADM-3-1-SRG1SRG1-CP-TX OpenROADM-3-1-DEG1DEG1-CTP-RX OpenROADM-3-1-DEG1-DEG1-CTP-TXtoOpenROADM-3-1-SRG1-SRG1-CP-RX - ADD-LINK + ADD-LINK OpenROADM-3-1-DEG1-DEG1-CTP-TXtoOpenROADM-3-1-SRG1-SRG1-CP-RX OpenROADM-3-1-DEG1DEG1-CTP-TX OpenROADM-3-1-SRG1SRG1-CP-RX OpenROADM-3-1-SRG1-SRG1-CP-TXtoOpenROADM-3-1-DEG1-DEG1-CTP-RX - DROP-LINK + DROP-LINK OpenROADM-3-1-DEG2-DEG2-CTP-TXtoOpenROADM-3-1-DEG1-DEG1-CTP-RX OpenROADM-3-1-DEG2DEG2-CTP-TX OpenROADM-3-1-DEG1DEG1-CTP-RX OpenROADM-3-1-DEG1-DEG1-CTP-TXtoOpenROADM-3-1-DEG2-DEG2-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-3-1-DEG2-DEG2-CTP-TXtoOpenROADM-3-1-DEG3-DEG3-CTP-RX OpenROADM-3-1-DEG2DEG2-CTP-TX OpenROADM-3-1-DEG3DEG3-CTP-RX OpenROADM-3-1-DEG3-DEG3-CTP-TXtoOpenROADM-3-1-DEG2-DEG2-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-3-1-SRG1-SRG1-CP-TXtoOpenROADM-3-1-DEG2-DEG2-CTP-RX OpenROADM-3-1-SRG1SRG1-CP-TX OpenROADM-3-1-DEG2DEG2-CTP-RX OpenROADM-3-1-DEG2-DEG2-CTP-TXtoOpenROADM-3-1-SRG1-SRG1-CP-RX - ADD-LINK + ADD-LINK OpenROADM-3-1-DEG2-DEG2-CTP-TXtoOpenROADM-3-1-SRG1-SRG1-CP-RX OpenROADM-3-1-DEG2DEG2-CTP-TX OpenROADM-3-1-SRG1SRG1-CP-RX OpenROADM-3-1-SRG1-SRG1-CP-TXtoOpenROADM-3-1-DEG2-DEG2-CTP-RX - DROP-LINK + DROP-LINK OpenROADM-3-1-DEG3-DEG3-CTP-TXtoOpenROADM-3-1-DEG1-DEG1-CTP-RX OpenROADM-3-1-DEG3DEG3-CTP-TX OpenROADM-3-1-DEG1DEG1-CTP-RX OpenROADM-3-1-DEG1-DEG1-CTP-TXtoOpenROADM-3-1-DEG3-DEG3-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-3-1-DEG3-DEG3-CTP-TXtoOpenROADM-3-1-DEG2-DEG2-CTP-RX OpenROADM-3-1-DEG3DEG3-CTP-TX OpenROADM-3-1-DEG2DEG2-CTP-RX OpenROADM-3-1-DEG2-DEG2-CTP-TXtoOpenROADM-3-1-DEG3-DEG3-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-3-1-SRG1-SRG1-CP-TXtoOpenROADM-3-1-DEG3-DEG3-CTP-RX OpenROADM-3-1-SRG1SRG1-CP-TX OpenROADM-3-1-DEG3DEG3-CTP-RX OpenROADM-3-1-DEG3-DEG3-CTP-TXtoOpenROADM-3-1-SRG1-SRG1-CP-RX - ADD-LINK + ADD-LINK OpenROADM-3-1-DEG3-DEG3-CTP-TXtoOpenROADM-3-1-SRG1-SRG1-CP-RX OpenROADM-3-1-DEG3DEG3-CTP-TX OpenROADM-3-1-SRG1SRG1-CP-RX OpenROADM-3-1-SRG1-SRG1-CP-TXtoOpenROADM-3-1-DEG3-DEG3-CTP-RX - DROP-LINK + DROP-LINK XPONDER-3-1XPDR-NW1-TX-toOpenROADM-3-1-SRG1-SRG1-PP1-RX XPONDER-3-1XPDR-NW1-TX OpenROADM-3-1-SRG1SRG1-PP1-RX OpenROADM-3-1-SRG1-SRG1-PP1-TX-to-XPONDER-3-1XPDR-NW1-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-3-1-SRG1-SRG1-PP1-TX-to-XPONDER-3-1XPDR-NW1-RX OpenROADM-3-1-SRG1SRG1-PP1-TX XPONDER-3-1XPDR-NW1-RX XPONDER-3-1XPDR-NW1-TX-toOpenROADM-3-1-SRG1-SRG1-PP1-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-3-1XPDR-NW2-TX-toOpenROADM-3-1-SRG1-SRG1-PP2-RX XPONDER-3-1XPDR-NW2-TX OpenROADM-3-1-SRG1SRG1-PP2-RX OpenROADM-3-1-SRG1-SRG1-PP2-TX-to-XPONDER-3-1XPDR-NW2-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-3-1-SRG1-SRG1-PP2-TX-to-XPONDER-3-1XPDR-NW2-RX OpenROADM-3-1-SRG1SRG1-PP2-TX XPONDER-3-1XPDR-NW2-RX XPONDER-3-1XPDR-NW2-TX-toOpenROADM-3-1-SRG1-SRG1-PP2-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-3-1XPDR-NW3-TX-toOpenROADM-3-1-SRG1-SRG1-PP3-RX XPONDER-3-1XPDR-NW3-TX OpenROADM-3-1-SRG1SRG1-PP3-RX OpenROADM-3-1-SRG1-SRG1-PP3-TX-to-XPONDER-3-1XPDR-NW3-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-3-1-SRG1-SRG1-PP3-TX-to-XPONDER-3-1XPDR-NW3-RX OpenROADM-3-1-SRG1SRG1-PP3-TX XPONDER-3-1XPDR-NW3-RX XPONDER-3-1XPDR-NW3-TX-toOpenROADM-3-1-SRG1-SRG1-PP3-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-3-1XPDR-NW4-TX-toOpenROADM-3-1-SRG1-SRG1-PP4-RX XPONDER-3-1XPDR-NW4-TX OpenROADM-3-1-SRG1SRG1-PP4-RX OpenROADM-3-1-SRG1-SRG1-PP4-TX-to-XPONDER-3-1XPDR-NW4-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-3-1-SRG1-SRG1-PP4-TX-to-XPONDER-3-1XPDR-NW4-RX OpenROADM-3-1-SRG1SRG1-PP4-TX XPONDER-3-1XPDR-NW4-RX XPONDER-3-1XPDR-NW4-TX-toOpenROADM-3-1-SRG1-SRG1-PP4-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-3-1XPDR-NW5-TX-toOpenROADM-3-1-SRG1-SRG1-PP5-RX XPONDER-3-1XPDR-NW5-TX OpenROADM-3-1-SRG1SRG1-PP5-RX OpenROADM-3-1-SRG1-SRG1-PP5-TX-to-XPONDER-3-1XPDR-NW5-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-3-1-SRG1-SRG1-PP5-TX-to-XPONDER-3-1XPDR-NW5-RX OpenROADM-3-1-SRG1SRG1-PP5-TX XPONDER-3-1XPDR-NW5-RX XPONDER-3-1XPDR-NW5-TX-toOpenROADM-3-1-SRG1-SRG1-PP5-RX - XPONDER-INPUT + XPONDER-INPUT OpenROADM-3-2-DEG1-DEG1-CTP-TXtoOpenROADM-3-2-DEG2-DEG2-CTP-RX OpenROADM-3-2-DEG1DEG1-CTP-TX OpenROADM-3-2-DEG2DEG2-CTP-RX OpenROADM-3-2-DEG2-DEG2-CTP-TXtoOpenROADM-3-2-DEG1-DEG1-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-3-2-DEG1-DEG1-CTP-TXtoOpenROADM-3-2-DEG3-DEG3-CTP-RX OpenROADM-3-2-DEG1DEG1-CTP-TX OpenROADM-3-2-DEG3DEG3-CTP-RX OpenROADM-3-2-DEG3-DEG3-CTP-TXtoOpenROADM-3-2-DEG1-DEG1-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-3-2-SRG1-SRG1-CP-TXtoOpenROADM-3-2-DEG1-DEG1-CTP-RX OpenROADM-3-2-SRG1SRG1-CP-TX OpenROADM-3-2-DEG1DEG1-CTP-RX OpenROADM-3-2-DEG1-DEG1-CTP-TXtoOpenROADM-3-2-SRG1-SRG1-CP-RX - ADD-LINK + ADD-LINK OpenROADM-3-2-DEG1-DEG1-CTP-TXtoOpenROADM-3-2-SRG1-SRG1-CP-RX OpenROADM-3-2-DEG1DEG1-CTP-TX OpenROADM-3-2-SRG1SRG1-CP-RX OpenROADM-3-2-SRG1-SRG1-CP-TXtoOpenROADM-3-2-DEG1-DEG1-CTP-RX - DROP-LINK + DROP-LINK OpenROADM-3-2-DEG2-DEG2-CTP-TXtoOpenROADM-3-2-DEG1-DEG1-CTP-RX OpenROADM-3-2-DEG2DEG2-CTP-TX OpenROADM-3-2-DEG1DEG1-CTP-RX OpenROADM-3-2-DEG1-DEG1-CTP-TXtoOpenROADM-3-2-DEG2-DEG2-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-3-2-DEG2-DEG2-CTP-TXtoOpenROADM-3-2-DEG3-DEG3-CTP-RX OpenROADM-3-2-DEG2DEG2-CTP-TX OpenROADM-3-2-DEG3DEG3-CTP-RX OpenROADM-3-2-DEG3-DEG3-CTP-TXtoOpenROADM-3-2-DEG2-DEG2-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-3-2-SRG1-SRG1-CP-TXtoOpenROADM-3-2-DEG2-DEG2-CTP-RX OpenROADM-3-2-SRG1SRG1-CP-TX OpenROADM-3-2-DEG2DEG2-CTP-RX OpenROADM-3-2-DEG2-DEG2-CTP-TXtoOpenROADM-3-2-SRG1-SRG1-CP-RX - ADD-LINK + ADD-LINK OpenROADM-3-2-DEG2-DEG2-CTP-TXtoOpenROADM-3-2-SRG1-SRG1-CP-RX OpenROADM-3-2-DEG2DEG2-CTP-TX OpenROADM-3-2-SRG1SRG1-CP-RX OpenROADM-3-2-SRG1-SRG1-CP-TXtoOpenROADM-3-2-DEG2-DEG2-CTP-RX - DROP-LINK + DROP-LINK OpenROADM-3-2-DEG3-DEG3-CTP-TXtoOpenROADM-3-2-DEG1-DEG1-CTP-RX OpenROADM-3-2-DEG3DEG3-CTP-TX OpenROADM-3-2-DEG1DEG1-CTP-RX OpenROADM-3-2-DEG1-DEG1-CTP-TXtoOpenROADM-3-2-DEG3-DEG3-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-3-2-DEG3-DEG3-CTP-TXtoOpenROADM-3-2-DEG2-DEG2-CTP-RX OpenROADM-3-2-DEG3DEG3-CTP-TX OpenROADM-3-2-DEG2DEG2-CTP-RX OpenROADM-3-2-DEG2-DEG2-CTP-TXtoOpenROADM-3-2-DEG3-DEG3-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-3-2-SRG1-SRG1-CP-TXtoOpenROADM-3-2-DEG3-DEG3-CTP-RX OpenROADM-3-2-SRG1SRG1-CP-TX OpenROADM-3-2-DEG3DEG3-CTP-RX OpenROADM-3-2-DEG3-DEG3-CTP-TXtoOpenROADM-3-2-SRG1-SRG1-CP-RX - ADD-LINK + ADD-LINK OpenROADM-3-2-DEG3-DEG3-CTP-TXtoOpenROADM-3-2-SRG1-SRG1-CP-RX OpenROADM-3-2-DEG3DEG3-CTP-TX OpenROADM-3-2-SRG1SRG1-CP-RX OpenROADM-3-2-SRG1-SRG1-CP-TXtoOpenROADM-3-2-DEG3-DEG3-CTP-RX - DROP-LINK + DROP-LINK XPONDER-3-2XPDR-NW1-TX-toOpenROADM-3-2-SRG1-SRG1-PP1-RX XPONDER-3-2XPDR-NW1-TX OpenROADM-3-2-SRG1SRG1-PP1-RX OpenROADM-3-2-SRG1-SRG1-PP1-TX-to-XPONDER-3-2XPDR-NW1-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-3-2-SRG1-SRG1-PP1-TX-to-XPONDER-3-2XPDR-NW1-RX OpenROADM-3-2-SRG1SRG1-PP1-TX XPONDER-3-2XPDR-NW1-RX XPONDER-3-2XPDR-NW1-TX-toOpenROADM-3-2-SRG1-SRG1-PP1-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-3-2XPDR-NW2-TX-toOpenROADM-3-2-SRG1-SRG1-PP2-RX XPONDER-3-2XPDR-NW2-TX OpenROADM-3-2-SRG1SRG1-PP2-RX OpenROADM-3-2-SRG1-SRG1-PP2-TX-to-XPONDER-3-2XPDR-NW2-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-3-2-SRG1-SRG1-PP2-TX-to-XPONDER-3-2XPDR-NW2-RX OpenROADM-3-2-SRG1SRG1-PP2-TX XPONDER-3-2XPDR-NW2-RX XPONDER-3-2XPDR-NW2-TX-toOpenROADM-3-2-SRG1-SRG1-PP2-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-3-2XPDR-NW3-TX-toOpenROADM-3-2-SRG1-SRG1-PP3-RX XPONDER-3-2XPDR-NW3-TX OpenROADM-3-2-SRG1SRG1-PP3-RX OpenROADM-3-2-SRG1-SRG1-PP3-TX-to-XPONDER-3-2XPDR-NW3-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-3-2-SRG1-SRG1-PP3-TX-to-XPONDER-3-2XPDR-NW3-RX OpenROADM-3-2-SRG1SRG1-PP3-TX XPONDER-3-2XPDR-NW3-RX XPONDER-3-2XPDR-NW3-TX-toOpenROADM-3-2-SRG1-SRG1-PP3-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-3-2XPDR-NW4-TX-toOpenROADM-3-2-SRG1-SRG1-PP4-RX XPONDER-3-2XPDR-NW4-TX OpenROADM-3-2-SRG1SRG1-PP4-RX OpenROADM-3-2-SRG1-SRG1-PP4-TX-to-XPONDER-3-2XPDR-NW4-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-3-2-SRG1-SRG1-PP4-TX-to-XPONDER-3-2XPDR-NW4-RX OpenROADM-3-2-SRG1SRG1-PP4-TX XPONDER-3-2XPDR-NW4-RX XPONDER-3-2XPDR-NW4-TX-toOpenROADM-3-2-SRG1-SRG1-PP4-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-3-2XPDR-NW5-TX-toOpenROADM-3-2-SRG1-SRG1-PP5-RX XPONDER-3-2XPDR-NW5-TX OpenROADM-3-2-SRG1SRG1-PP5-RX OpenROADM-3-2-SRG1-SRG1-PP5-TX-to-XPONDER-3-2XPDR-NW5-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-3-2-SRG1-SRG1-PP5-TX-to-XPONDER-3-2XPDR-NW5-RX OpenROADM-3-2-SRG1SRG1-PP5-TX XPONDER-3-2XPDR-NW5-RX XPONDER-3-2XPDR-NW5-TX-toOpenROADM-3-2-SRG1-SRG1-PP5-RX - XPONDER-INPUT + XPONDER-INPUT OpenROADM-3-1-DEG1-to-OpenROADM-3-2-DEG1 OpenROADM-3-2-DEG1-to-OpenROADM-3-1-DEG1 1 - ROADM-TO-ROADM + ROADM-TO-ROADM OpenROADM-3-1-DEG1DEG1-TTP-TX OpenROADM-3-2-DEG1DEG1-TTP-RX @@ -2378,7 +2378,7 @@ OpenROADM-3-2-DEG1-to-OpenROADM-3-1-DEG1 OpenROADM-3-1-DEG1-to-OpenROADM-3-2-DEG1 1 - ROADM-TO-ROADM + ROADM-TO-ROADM OpenROADM-3-2-DEG1DEG1-TTP-TX OpenROADM-3-1-DEG1DEG1-TTP-RX @@ -2403,7 +2403,7 @@ OpenROADM-3-2-DEG2-to-OpenROADM-3-1-DEG2 OpenROADM-3-1-DEG2-to-OpenROADM-3-2-DEG2 1 - ROADM-TO-ROADM + ROADM-TO-ROADM OpenROADM-3-2-DEG2DEG2-TTP-TX OpenROADM-3-1-DEG2DEG2-TTP-RX @@ -2428,7 +2428,7 @@ OpenROADM-3-1-DEG2-to-OpenROADM-3-2-DEG2 OpenROADM-3-2-DEG2-to-OpenROADM-3-1-DEG2 1 - ROADM-TO-ROADM + ROADM-TO-ROADM OpenROADM-3-1-DEG2DEG2-TTP-TX OpenROADM-3-2-DEG2DEG2-TTP-RX @@ -2452,184 +2452,184 @@ OpenROADM-4-1-DEG1-DEG1-CTP-TXtoOpenROADM-4-1-DEG2-DEG2-CTP-RX OpenROADM-4-1-DEG1DEG1-CTP-TX OpenROADM-4-1-DEG2DEG2-CTP-RX OpenROADM-4-1-DEG2-DEG2-CTP-TXtoOpenROADM-4-1-DEG1-DEG1-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-4-1-DEG1-DEG1-CTP-TXtoOpenROADM-4-1-DEG3-DEG3-CTP-RX OpenROADM-4-1-DEG1DEG1-CTP-TX OpenROADM-4-1-DEG3DEG3-CTP-RX OpenROADM-4-1-DEG3-DEG3-CTP-TXtoOpenROADM-4-1-DEG1-DEG1-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-4-1-SRG1-SRG1-CP-TXtoOpenROADM-4-1-DEG1-DEG1-CTP-RX OpenROADM-4-1-SRG1SRG1-CP-TX OpenROADM-4-1-DEG1DEG1-CTP-RX OpenROADM-4-1-DEG1-DEG1-CTP-TXtoOpenROADM-4-1-SRG1-SRG1-CP-RX - ADD-LINK + ADD-LINK OpenROADM-4-1-DEG1-DEG1-CTP-TXtoOpenROADM-4-1-SRG1-SRG1-CP-RX OpenROADM-4-1-DEG1DEG1-CTP-TX OpenROADM-4-1-SRG1SRG1-CP-RX OpenROADM-4-1-SRG1-SRG1-CP-TXtoOpenROADM-4-1-DEG1-DEG1-CTP-RX - DROP-LINK + DROP-LINK OpenROADM-4-1-DEG2-DEG2-CTP-TXtoOpenROADM-4-1-DEG1-DEG1-CTP-RX OpenROADM-4-1-DEG2DEG2-CTP-TX OpenROADM-4-1-DEG1DEG1-CTP-RX OpenROADM-4-1-DEG1-DEG1-CTP-TXtoOpenROADM-4-1-DEG2-DEG2-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-4-1-DEG2-DEG2-CTP-TXtoOpenROADM-4-1-DEG3-DEG3-CTP-RX OpenROADM-4-1-DEG2DEG2-CTP-TX OpenROADM-4-1-DEG3DEG3-CTP-RX OpenROADM-4-1-DEG3-DEG3-CTP-TXtoOpenROADM-4-1-DEG2-DEG2-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-4-1-SRG1-SRG1-CP-TXtoOpenROADM-4-1-DEG2-DEG2-CTP-RX OpenROADM-4-1-SRG1SRG1-CP-TX OpenROADM-4-1-DEG2DEG2-CTP-RX OpenROADM-4-1-DEG2-DEG2-CTP-TXtoOpenROADM-4-1-SRG1-SRG1-CP-RX - ADD-LINK + ADD-LINK OpenROADM-4-1-DEG2-DEG2-CTP-TXtoOpenROADM-4-1-SRG1-SRG1-CP-RX OpenROADM-4-1-DEG2DEG2-CTP-TX OpenROADM-4-1-SRG1SRG1-CP-RX OpenROADM-4-1-SRG1-SRG1-CP-TXtoOpenROADM-4-1-DEG2-DEG2-CTP-RX - DROP-LINK + DROP-LINK OpenROADM-4-1-DEG3-DEG3-CTP-TXtoOpenROADM-4-1-DEG1-DEG1-CTP-RX OpenROADM-4-1-DEG3DEG3-CTP-TX OpenROADM-4-1-DEG1DEG1-CTP-RX OpenROADM-4-1-DEG1-DEG1-CTP-TXtoOpenROADM-4-1-DEG3-DEG3-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-4-1-DEG3-DEG3-CTP-TXtoOpenROADM-4-1-DEG2-DEG2-CTP-RX OpenROADM-4-1-DEG3DEG3-CTP-TX OpenROADM-4-1-DEG2DEG2-CTP-RX OpenROADM-4-1-DEG2-DEG2-CTP-TXtoOpenROADM-4-1-DEG3-DEG3-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-4-1-SRG1-SRG1-CP-TXtoOpenROADM-4-1-DEG3-DEG3-CTP-RX OpenROADM-4-1-SRG1SRG1-CP-TX OpenROADM-4-1-DEG3DEG3-CTP-RX OpenROADM-4-1-DEG3-DEG3-CTP-TXtoOpenROADM-4-1-SRG1-SRG1-CP-RX - ADD-LINK + ADD-LINK OpenROADM-4-1-DEG3-DEG3-CTP-TXtoOpenROADM-4-1-SRG1-SRG1-CP-RX OpenROADM-4-1-DEG3DEG3-CTP-TX OpenROADM-4-1-SRG1SRG1-CP-RX OpenROADM-4-1-SRG1-SRG1-CP-TXtoOpenROADM-4-1-DEG3-DEG3-CTP-RX - DROP-LINK + DROP-LINK XPONDER-4-1XPDR-NW1-TX-toOpenROADM-4-1-SRG1-SRG1-PP1-RX XPONDER-4-1XPDR-NW1-TX OpenROADM-4-1-SRG1SRG1-PP1-RX OpenROADM-4-1-SRG1-SRG1-PP1-TX-to-XPONDER-4-1XPDR-NW1-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-4-1-SRG1-SRG1-PP1-TX-to-XPONDER-4-1XPDR-NW1-RX OpenROADM-4-1-SRG1SRG1-PP1-TX XPONDER-4-1XPDR-NW1-RX XPONDER-4-1XPDR-NW1-TX-toOpenROADM-4-1-SRG1-SRG1-PP1-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-4-1XPDR-NW2-TX-toOpenROADM-4-1-SRG1-SRG1-PP2-RX XPONDER-4-1XPDR-NW2-TX OpenROADM-4-1-SRG1SRG1-PP2-RX OpenROADM-4-1-SRG1-SRG1-PP2-TX-to-XPONDER-4-1XPDR-NW2-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-4-1-SRG1-SRG1-PP2-TX-to-XPONDER-4-1XPDR-NW2-RX OpenROADM-4-1-SRG1SRG1-PP2-TX XPONDER-4-1XPDR-NW2-RX XPONDER-4-1XPDR-NW2-TX-toOpenROADM-4-1-SRG1-SRG1-PP2-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-4-1XPDR-NW3-TX-toOpenROADM-4-1-SRG1-SRG1-PP3-RX XPONDER-4-1XPDR-NW3-TX OpenROADM-4-1-SRG1SRG1-PP3-RX OpenROADM-4-1-SRG1-SRG1-PP3-TX-to-XPONDER-4-1XPDR-NW3-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-4-1-SRG1-SRG1-PP3-TX-to-XPONDER-4-1XPDR-NW3-RX OpenROADM-4-1-SRG1SRG1-PP3-TX XPONDER-4-1XPDR-NW3-RX XPONDER-4-1XPDR-NW3-TX-toOpenROADM-4-1-SRG1-SRG1-PP3-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-4-1XPDR-NW4-TX-toOpenROADM-4-1-SRG1-SRG1-PP4-RX XPONDER-4-1XPDR-NW4-TX OpenROADM-4-1-SRG1SRG1-PP4-RX OpenROADM-4-1-SRG1-SRG1-PP4-TX-to-XPONDER-4-1XPDR-NW4-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-4-1-SRG1-SRG1-PP4-TX-to-XPONDER-4-1XPDR-NW4-RX OpenROADM-4-1-SRG1SRG1-PP4-TX XPONDER-4-1XPDR-NW4-RX XPONDER-4-1XPDR-NW4-TX-toOpenROADM-4-1-SRG1-SRG1-PP4-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-4-1XPDR-NW5-TX-toOpenROADM-4-1-SRG1-SRG1-PP5-RX XPONDER-4-1XPDR-NW5-TX OpenROADM-4-1-SRG1SRG1-PP5-RX OpenROADM-4-1-SRG1-SRG1-PP5-TX-to-XPONDER-4-1XPDR-NW5-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-4-1-SRG1-SRG1-PP5-TX-to-XPONDER-4-1XPDR-NW5-RX OpenROADM-4-1-SRG1SRG1-PP5-TX XPONDER-4-1XPDR-NW5-RX XPONDER-4-1XPDR-NW5-TX-toOpenROADM-4-1-SRG1-SRG1-PP5-RX - XPONDER-INPUT + XPONDER-INPUT OpenROADM-4-2-DEG1-DEG1-CTP-TXtoOpenROADM-4-2-DEG2-DEG2-CTP-RX OpenROADM-4-2-DEG1DEG1-CTP-TX OpenROADM-4-2-DEG2DEG2-CTP-RX OpenROADM-4-2-DEG2-DEG2-CTP-TXtoOpenROADM-4-2-DEG1-DEG1-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-4-2-DEG1-DEG1-CTP-TXtoOpenROADM-4-2-DEG3-DEG3-CTP-RX OpenROADM-4-2-DEG1DEG1-CTP-TX OpenROADM-4-2-DEG3DEG3-CTP-RX OpenROADM-4-2-DEG3-DEG3-CTP-TXtoOpenROADM-4-2-DEG1-DEG1-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-4-2-SRG1-SRG1-CP-TXtoOpenROADM-4-2-DEG1-DEG1-CTP-RX OpenROADM-4-2-SRG1SRG1-CP-TX OpenROADM-4-2-DEG1DEG1-CTP-RX OpenROADM-4-2-DEG1-DEG1-CTP-TXtoOpenROADM-4-2-SRG1-SRG1-CP-RX - ADD-LINK + ADD-LINK OpenROADM-4-2-DEG1-DEG1-CTP-TXtoOpenROADM-4-2-SRG1-SRG1-CP-RX OpenROADM-4-2-DEG1DEG1-CTP-TX OpenROADM-4-2-SRG1SRG1-CP-RX OpenROADM-4-2-SRG1-SRG1-CP-TXtoOpenROADM-4-2-DEG1-DEG1-CTP-RX - DROP-LINK + DROP-LINK OpenROADM-4-2-DEG2-DEG2-CTP-TXtoOpenROADM-4-2-DEG1-DEG1-CTP-RX OpenROADM-4-2-DEG2DEG2-CTP-TX OpenROADM-4-2-DEG1DEG1-CTP-RX OpenROADM-4-2-DEG1-DEG1-CTP-TXtoOpenROADM-4-2-DEG2-DEG2-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-4-2-DEG2-DEG2-CTP-TXtoOpenROADM-4-2-DEG3-DEG3-CTP-RX OpenROADM-4-2-DEG2DEG2-CTP-TX OpenROADM-4-2-DEG3DEG3-CTP-RX OpenROADM-4-2-DEG3-DEG3-CTP-TXtoOpenROADM-4-2-DEG2-DEG2-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-4-2-SRG1-SRG1-CP-TXtoOpenROADM-4-2-DEG2-DEG2-CTP-RX OpenROADM-4-2-SRG1SRG1-CP-TX OpenROADM-4-2-DEG2DEG2-CTP-RX OpenROADM-4-2-DEG2-DEG2-CTP-TXtoOpenROADM-4-2-SRG1-SRG1-CP-RX - ADD-LINK + ADD-LINK OpenROADM-4-2-DEG2-DEG2-CTP-TXtoOpenROADM-4-2-SRG1-SRG1-CP-RX OpenROADM-4-2-DEG2DEG2-CTP-TX OpenROADM-4-2-SRG1SRG1-CP-RX OpenROADM-4-2-SRG1-SRG1-CP-TXtoOpenROADM-4-2-DEG2-DEG2-CTP-RX - DROP-LINK + DROP-LINK OpenROADM-4-2-DEG3-DEG3-CTP-TXtoOpenROADM-4-2-DEG1-DEG1-CTP-RX OpenROADM-4-2-DEG3DEG3-CTP-TX OpenROADM-4-2-DEG1DEG1-CTP-RX OpenROADM-4-2-DEG1-DEG1-CTP-TXtoOpenROADM-4-2-DEG3-DEG3-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-4-2-DEG3-DEG3-CTP-TXtoOpenROADM-4-2-DEG2-DEG2-CTP-RX OpenROADM-4-2-DEG3DEG3-CTP-TX OpenROADM-4-2-DEG2DEG2-CTP-RX OpenROADM-4-2-DEG2-DEG2-CTP-TXtoOpenROADM-4-2-DEG3-DEG3-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-4-2-SRG1-SRG1-CP-TXtoOpenROADM-4-2-DEG3-DEG3-CTP-RX OpenROADM-4-2-SRG1SRG1-CP-TX OpenROADM-4-2-DEG3DEG3-CTP-RX OpenROADM-4-2-DEG3-DEG3-CTP-TXtoOpenROADM-4-2-SRG1-SRG1-CP-RX - ADD-LINK + ADD-LINK OpenROADM-4-2-DEG3-DEG3-CTP-TXtoOpenROADM-4-2-SRG1-SRG1-CP-RX OpenROADM-4-2-DEG3DEG3-CTP-TX OpenROADM-4-2-SRG1SRG1-CP-RX OpenROADM-4-2-SRG1-SRG1-CP-TXtoOpenROADM-4-2-DEG3-DEG3-CTP-RX - DROP-LINK + DROP-LINK XPONDER-4-2XPDR-NW1-TX-toOpenROADM-4-2-SRG1-SRG1-PP1-RX XPONDER-4-2XPDR-NW1-TX OpenROADM-4-2-SRG1SRG1-PP1-RX OpenROADM-4-2-SRG1-SRG1-PP1-TX-to-XPONDER-4-2XPDR-NW1-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-4-2-SRG1-SRG1-PP1-TX-to-XPONDER-4-2XPDR-NW1-RX OpenROADM-4-2-SRG1SRG1-PP1-TX XPONDER-4-2XPDR-NW1-RX XPONDER-4-2XPDR-NW1-TX-toOpenROADM-4-2-SRG1-SRG1-PP1-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-4-2XPDR-NW2-TX-toOpenROADM-4-2-SRG1-SRG1-PP2-RX XPONDER-4-2XPDR-NW2-TX OpenROADM-4-2-SRG1SRG1-PP2-RX OpenROADM-4-2-SRG1-SRG1-PP2-TX-to-XPONDER-4-2XPDR-NW2-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-4-2-SRG1-SRG1-PP2-TX-to-XPONDER-4-2XPDR-NW2-RX OpenROADM-4-2-SRG1SRG1-PP2-TX XPONDER-4-2XPDR-NW2-RX XPONDER-4-2XPDR-NW2-TX-toOpenROADM-4-2-SRG1-SRG1-PP2-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-4-2XPDR-NW3-TX-toOpenROADM-4-2-SRG1-SRG1-PP3-RX XPONDER-4-2XPDR-NW3-TX OpenROADM-4-2-SRG1SRG1-PP3-RX OpenROADM-4-2-SRG1-SRG1-PP3-TX-to-XPONDER-4-2XPDR-NW3-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-4-2-SRG1-SRG1-PP3-TX-to-XPONDER-4-2XPDR-NW3-RX OpenROADM-4-2-SRG1SRG1-PP3-TX XPONDER-4-2XPDR-NW3-RX XPONDER-4-2XPDR-NW3-TX-toOpenROADM-4-2-SRG1-SRG1-PP3-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-4-2XPDR-NW4-TX-toOpenROADM-4-2-SRG1-SRG1-PP4-RX XPONDER-4-2XPDR-NW4-TX OpenROADM-4-2-SRG1SRG1-PP4-RX OpenROADM-4-2-SRG1-SRG1-PP4-TX-to-XPONDER-4-2XPDR-NW4-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-4-2-SRG1-SRG1-PP4-TX-to-XPONDER-4-2XPDR-NW4-RX OpenROADM-4-2-SRG1SRG1-PP4-TX XPONDER-4-2XPDR-NW4-RX XPONDER-4-2XPDR-NW4-TX-toOpenROADM-4-2-SRG1-SRG1-PP4-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-4-2XPDR-NW5-TX-toOpenROADM-4-2-SRG1-SRG1-PP5-RX XPONDER-4-2XPDR-NW5-TX OpenROADM-4-2-SRG1SRG1-PP5-RX OpenROADM-4-2-SRG1-SRG1-PP5-TX-to-XPONDER-4-2XPDR-NW5-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-4-2-SRG1-SRG1-PP5-TX-to-XPONDER-4-2XPDR-NW5-RX OpenROADM-4-2-SRG1SRG1-PP5-TX XPONDER-4-2XPDR-NW5-RX XPONDER-4-2XPDR-NW5-TX-toOpenROADM-4-2-SRG1-SRG1-PP5-RX - XPONDER-INPUT + XPONDER-INPUT OpenROADM-4-1-DEG1-to-OpenROADM-4-2-DEG1 OpenROADM-4-2-DEG1-to-OpenROADM-4-1-DEG1 1 - ROADM-TO-ROADM + ROADM-TO-ROADM OpenROADM-4-1-DEG1DEG1-TTP-TX OpenROADM-4-2-DEG1DEG1-TTP-RX @@ -2654,7 +2654,7 @@ OpenROADM-4-2-DEG1-to-OpenROADM-4-1-DEG1 OpenROADM-4-1-DEG1-to-OpenROADM-4-2-DEG1 1 - ROADM-TO-ROADM + ROADM-TO-ROADM OpenROADM-4-2-DEG1DEG1-TTP-TX OpenROADM-4-1-DEG1DEG1-TTP-RX @@ -2679,7 +2679,7 @@ OpenROADM-4-2-DEG2-to-OpenROADM-4-1-DEG2 OpenROADM-4-1-DEG2-to-OpenROADM-4-2-DEG2 1 - ROADM-TO-ROADM + ROADM-TO-ROADM OpenROADM-4-2-DEG2DEG2-TTP-TX OpenROADM-4-1-DEG2DEG2-TTP-RX @@ -2704,7 +2704,7 @@ OpenROADM-4-1-DEG2-to-OpenROADM-4-2-DEG2 OpenROADM-4-2-DEG2-to-OpenROADM-4-1-DEG2 1 - ROADM-TO-ROADM + ROADM-TO-ROADM OpenROADM-4-1-DEG2DEG2-TTP-TX OpenROADM-4-2-DEG2DEG2-TTP-RX @@ -2728,184 +2728,184 @@ OpenROADM-5-1-DEG1-DEG1-CTP-TXtoOpenROADM-5-1-DEG2-DEG2-CTP-RX OpenROADM-5-1-DEG1DEG1-CTP-TX OpenROADM-5-1-DEG2DEG2-CTP-RX OpenROADM-5-1-DEG2-DEG2-CTP-TXtoOpenROADM-5-1-DEG1-DEG1-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-5-1-DEG1-DEG1-CTP-TXtoOpenROADM-5-1-DEG3-DEG3-CTP-RX OpenROADM-5-1-DEG1DEG1-CTP-TX OpenROADM-5-1-DEG3DEG3-CTP-RX OpenROADM-5-1-DEG3-DEG3-CTP-TXtoOpenROADM-5-1-DEG1-DEG1-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-5-1-SRG1-SRG1-CP-TXtoOpenROADM-5-1-DEG1-DEG1-CTP-RX OpenROADM-5-1-SRG1SRG1-CP-TX OpenROADM-5-1-DEG1DEG1-CTP-RX OpenROADM-5-1-DEG1-DEG1-CTP-TXtoOpenROADM-5-1-SRG1-SRG1-CP-RX - ADD-LINK + ADD-LINK OpenROADM-5-1-DEG1-DEG1-CTP-TXtoOpenROADM-5-1-SRG1-SRG1-CP-RX OpenROADM-5-1-DEG1DEG1-CTP-TX OpenROADM-5-1-SRG1SRG1-CP-RX OpenROADM-5-1-SRG1-SRG1-CP-TXtoOpenROADM-5-1-DEG1-DEG1-CTP-RX - DROP-LINK + DROP-LINK OpenROADM-5-1-DEG2-DEG2-CTP-TXtoOpenROADM-5-1-DEG1-DEG1-CTP-RX OpenROADM-5-1-DEG2DEG2-CTP-TX OpenROADM-5-1-DEG1DEG1-CTP-RX OpenROADM-5-1-DEG1-DEG1-CTP-TXtoOpenROADM-5-1-DEG2-DEG2-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-5-1-DEG2-DEG2-CTP-TXtoOpenROADM-5-1-DEG3-DEG3-CTP-RX OpenROADM-5-1-DEG2DEG2-CTP-TX OpenROADM-5-1-DEG3DEG3-CTP-RX OpenROADM-5-1-DEG3-DEG3-CTP-TXtoOpenROADM-5-1-DEG2-DEG2-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-5-1-SRG1-SRG1-CP-TXtoOpenROADM-5-1-DEG2-DEG2-CTP-RX OpenROADM-5-1-SRG1SRG1-CP-TX OpenROADM-5-1-DEG2DEG2-CTP-RX OpenROADM-5-1-DEG2-DEG2-CTP-TXtoOpenROADM-5-1-SRG1-SRG1-CP-RX - ADD-LINK + ADD-LINK OpenROADM-5-1-DEG2-DEG2-CTP-TXtoOpenROADM-5-1-SRG1-SRG1-CP-RX OpenROADM-5-1-DEG2DEG2-CTP-TX OpenROADM-5-1-SRG1SRG1-CP-RX OpenROADM-5-1-SRG1-SRG1-CP-TXtoOpenROADM-5-1-DEG2-DEG2-CTP-RX - DROP-LINK + DROP-LINK OpenROADM-5-1-DEG3-DEG3-CTP-TXtoOpenROADM-5-1-DEG1-DEG1-CTP-RX OpenROADM-5-1-DEG3DEG3-CTP-TX OpenROADM-5-1-DEG1DEG1-CTP-RX OpenROADM-5-1-DEG1-DEG1-CTP-TXtoOpenROADM-5-1-DEG3-DEG3-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-5-1-DEG3-DEG3-CTP-TXtoOpenROADM-5-1-DEG2-DEG2-CTP-RX OpenROADM-5-1-DEG3DEG3-CTP-TX OpenROADM-5-1-DEG2DEG2-CTP-RX OpenROADM-5-1-DEG2-DEG2-CTP-TXtoOpenROADM-5-1-DEG3-DEG3-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-5-1-SRG1-SRG1-CP-TXtoOpenROADM-5-1-DEG3-DEG3-CTP-RX OpenROADM-5-1-SRG1SRG1-CP-TX OpenROADM-5-1-DEG3DEG3-CTP-RX OpenROADM-5-1-DEG3-DEG3-CTP-TXtoOpenROADM-5-1-SRG1-SRG1-CP-RX - ADD-LINK + ADD-LINK OpenROADM-5-1-DEG3-DEG3-CTP-TXtoOpenROADM-5-1-SRG1-SRG1-CP-RX OpenROADM-5-1-DEG3DEG3-CTP-TX OpenROADM-5-1-SRG1SRG1-CP-RX OpenROADM-5-1-SRG1-SRG1-CP-TXtoOpenROADM-5-1-DEG3-DEG3-CTP-RX - DROP-LINK + DROP-LINK XPONDER-5-1XPDR-NW1-TX-toOpenROADM-5-1-SRG1-SRG1-PP1-RX XPONDER-5-1XPDR-NW1-TX OpenROADM-5-1-SRG1SRG1-PP1-RX OpenROADM-5-1-SRG1-SRG1-PP1-TX-to-XPONDER-5-1XPDR-NW1-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-5-1-SRG1-SRG1-PP1-TX-to-XPONDER-5-1XPDR-NW1-RX OpenROADM-5-1-SRG1SRG1-PP1-TX XPONDER-5-1XPDR-NW1-RX XPONDER-5-1XPDR-NW1-TX-toOpenROADM-5-1-SRG1-SRG1-PP1-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-5-1XPDR-NW2-TX-toOpenROADM-5-1-SRG1-SRG1-PP2-RX XPONDER-5-1XPDR-NW2-TX OpenROADM-5-1-SRG1SRG1-PP2-RX OpenROADM-5-1-SRG1-SRG1-PP2-TX-to-XPONDER-5-1XPDR-NW2-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-5-1-SRG1-SRG1-PP2-TX-to-XPONDER-5-1XPDR-NW2-RX OpenROADM-5-1-SRG1SRG1-PP2-TX XPONDER-5-1XPDR-NW2-RX XPONDER-5-1XPDR-NW2-TX-toOpenROADM-5-1-SRG1-SRG1-PP2-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-5-1XPDR-NW3-TX-toOpenROADM-5-1-SRG1-SRG1-PP3-RX XPONDER-5-1XPDR-NW3-TX OpenROADM-5-1-SRG1SRG1-PP3-RX OpenROADM-5-1-SRG1-SRG1-PP3-TX-to-XPONDER-5-1XPDR-NW3-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-5-1-SRG1-SRG1-PP3-TX-to-XPONDER-5-1XPDR-NW3-RX OpenROADM-5-1-SRG1SRG1-PP3-TX XPONDER-5-1XPDR-NW3-RX XPONDER-5-1XPDR-NW3-TX-toOpenROADM-5-1-SRG1-SRG1-PP3-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-5-1XPDR-NW4-TX-toOpenROADM-5-1-SRG1-SRG1-PP4-RX XPONDER-5-1XPDR-NW4-TX OpenROADM-5-1-SRG1SRG1-PP4-RX OpenROADM-5-1-SRG1-SRG1-PP4-TX-to-XPONDER-5-1XPDR-NW4-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-5-1-SRG1-SRG1-PP4-TX-to-XPONDER-5-1XPDR-NW4-RX OpenROADM-5-1-SRG1SRG1-PP4-TX XPONDER-5-1XPDR-NW4-RX XPONDER-5-1XPDR-NW4-TX-toOpenROADM-5-1-SRG1-SRG1-PP4-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-5-1XPDR-NW5-TX-toOpenROADM-5-1-SRG1-SRG1-PP5-RX XPONDER-5-1XPDR-NW5-TX OpenROADM-5-1-SRG1SRG1-PP5-RX OpenROADM-5-1-SRG1-SRG1-PP5-TX-to-XPONDER-5-1XPDR-NW5-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-5-1-SRG1-SRG1-PP5-TX-to-XPONDER-5-1XPDR-NW5-RX OpenROADM-5-1-SRG1SRG1-PP5-TX XPONDER-5-1XPDR-NW5-RX XPONDER-5-1XPDR-NW5-TX-toOpenROADM-5-1-SRG1-SRG1-PP5-RX - XPONDER-INPUT + XPONDER-INPUT OpenROADM-5-2-DEG1-DEG1-CTP-TXtoOpenROADM-5-2-DEG2-DEG2-CTP-RX OpenROADM-5-2-DEG1DEG1-CTP-TX OpenROADM-5-2-DEG2DEG2-CTP-RX OpenROADM-5-2-DEG2-DEG2-CTP-TXtoOpenROADM-5-2-DEG1-DEG1-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-5-2-DEG1-DEG1-CTP-TXtoOpenROADM-5-2-DEG3-DEG3-CTP-RX OpenROADM-5-2-DEG1DEG1-CTP-TX OpenROADM-5-2-DEG3DEG3-CTP-RX OpenROADM-5-2-DEG3-DEG3-CTP-TXtoOpenROADM-5-2-DEG1-DEG1-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-5-2-SRG1-SRG1-CP-TXtoOpenROADM-5-2-DEG1-DEG1-CTP-RX OpenROADM-5-2-SRG1SRG1-CP-TX OpenROADM-5-2-DEG1DEG1-CTP-RX OpenROADM-5-2-DEG1-DEG1-CTP-TXtoOpenROADM-5-2-SRG1-SRG1-CP-RX - ADD-LINK + ADD-LINK OpenROADM-5-2-DEG1-DEG1-CTP-TXtoOpenROADM-5-2-SRG1-SRG1-CP-RX OpenROADM-5-2-DEG1DEG1-CTP-TX OpenROADM-5-2-SRG1SRG1-CP-RX OpenROADM-5-2-SRG1-SRG1-CP-TXtoOpenROADM-5-2-DEG1-DEG1-CTP-RX - DROP-LINK + DROP-LINK OpenROADM-5-2-DEG2-DEG2-CTP-TXtoOpenROADM-5-2-DEG1-DEG1-CTP-RX OpenROADM-5-2-DEG2DEG2-CTP-TX OpenROADM-5-2-DEG1DEG1-CTP-RX OpenROADM-5-2-DEG1-DEG1-CTP-TXtoOpenROADM-5-2-DEG2-DEG2-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-5-2-DEG2-DEG2-CTP-TXtoOpenROADM-5-2-DEG3-DEG3-CTP-RX OpenROADM-5-2-DEG2DEG2-CTP-TX OpenROADM-5-2-DEG3DEG3-CTP-RX OpenROADM-5-2-DEG3-DEG3-CTP-TXtoOpenROADM-5-2-DEG2-DEG2-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-5-2-SRG1-SRG1-CP-TXtoOpenROADM-5-2-DEG2-DEG2-CTP-RX OpenROADM-5-2-SRG1SRG1-CP-TX OpenROADM-5-2-DEG2DEG2-CTP-RX OpenROADM-5-2-DEG2-DEG2-CTP-TXtoOpenROADM-5-2-SRG1-SRG1-CP-RX - ADD-LINK + ADD-LINK OpenROADM-5-2-DEG2-DEG2-CTP-TXtoOpenROADM-5-2-SRG1-SRG1-CP-RX OpenROADM-5-2-DEG2DEG2-CTP-TX OpenROADM-5-2-SRG1SRG1-CP-RX OpenROADM-5-2-SRG1-SRG1-CP-TXtoOpenROADM-5-2-DEG2-DEG2-CTP-RX - DROP-LINK + DROP-LINK OpenROADM-5-2-DEG3-DEG3-CTP-TXtoOpenROADM-5-2-DEG1-DEG1-CTP-RX OpenROADM-5-2-DEG3DEG3-CTP-TX OpenROADM-5-2-DEG1DEG1-CTP-RX OpenROADM-5-2-DEG1-DEG1-CTP-TXtoOpenROADM-5-2-DEG3-DEG3-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-5-2-DEG3-DEG3-CTP-TXtoOpenROADM-5-2-DEG2-DEG2-CTP-RX OpenROADM-5-2-DEG3DEG3-CTP-TX OpenROADM-5-2-DEG2DEG2-CTP-RX OpenROADM-5-2-DEG2-DEG2-CTP-TXtoOpenROADM-5-2-DEG3-DEG3-CTP-RX - EXPRESS-LINK + EXPRESS-LINK OpenROADM-5-2-SRG1-SRG1-CP-TXtoOpenROADM-5-2-DEG3-DEG3-CTP-RX OpenROADM-5-2-SRG1SRG1-CP-TX OpenROADM-5-2-DEG3DEG3-CTP-RX OpenROADM-5-2-DEG3-DEG3-CTP-TXtoOpenROADM-5-2-SRG1-SRG1-CP-RX - ADD-LINK + ADD-LINK OpenROADM-5-2-DEG3-DEG3-CTP-TXtoOpenROADM-5-2-SRG1-SRG1-CP-RX OpenROADM-5-2-DEG3DEG3-CTP-TX OpenROADM-5-2-SRG1SRG1-CP-RX OpenROADM-5-2-SRG1-SRG1-CP-TXtoOpenROADM-5-2-DEG3-DEG3-CTP-RX - DROP-LINK + DROP-LINK XPONDER-5-2XPDR-NW1-TX-toOpenROADM-5-2-SRG1-SRG1-PP1-RX XPONDER-5-2XPDR-NW1-TX OpenROADM-5-2-SRG1SRG1-PP1-RX OpenROADM-5-2-SRG1-SRG1-PP1-TX-to-XPONDER-5-2XPDR-NW1-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-5-2-SRG1-SRG1-PP1-TX-to-XPONDER-5-2XPDR-NW1-RX OpenROADM-5-2-SRG1SRG1-PP1-TX XPONDER-5-2XPDR-NW1-RX XPONDER-5-2XPDR-NW1-TX-toOpenROADM-5-2-SRG1-SRG1-PP1-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-5-2XPDR-NW2-TX-toOpenROADM-5-2-SRG1-SRG1-PP2-RX XPONDER-5-2XPDR-NW2-TX OpenROADM-5-2-SRG1SRG1-PP2-RX OpenROADM-5-2-SRG1-SRG1-PP2-TX-to-XPONDER-5-2XPDR-NW2-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-5-2-SRG1-SRG1-PP2-TX-to-XPONDER-5-2XPDR-NW2-RX OpenROADM-5-2-SRG1SRG1-PP2-TX XPONDER-5-2XPDR-NW2-RX XPONDER-5-2XPDR-NW2-TX-toOpenROADM-5-2-SRG1-SRG1-PP2-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-5-2XPDR-NW3-TX-toOpenROADM-5-2-SRG1-SRG1-PP3-RX XPONDER-5-2XPDR-NW3-TX OpenROADM-5-2-SRG1SRG1-PP3-RX OpenROADM-5-2-SRG1-SRG1-PP3-TX-to-XPONDER-5-2XPDR-NW3-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-5-2-SRG1-SRG1-PP3-TX-to-XPONDER-5-2XPDR-NW3-RX OpenROADM-5-2-SRG1SRG1-PP3-TX XPONDER-5-2XPDR-NW3-RX XPONDER-5-2XPDR-NW3-TX-toOpenROADM-5-2-SRG1-SRG1-PP3-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-5-2XPDR-NW4-TX-toOpenROADM-5-2-SRG1-SRG1-PP4-RX XPONDER-5-2XPDR-NW4-TX OpenROADM-5-2-SRG1SRG1-PP4-RX OpenROADM-5-2-SRG1-SRG1-PP4-TX-to-XPONDER-5-2XPDR-NW4-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-5-2-SRG1-SRG1-PP4-TX-to-XPONDER-5-2XPDR-NW4-RX OpenROADM-5-2-SRG1SRG1-PP4-TX XPONDER-5-2XPDR-NW4-RX XPONDER-5-2XPDR-NW4-TX-toOpenROADM-5-2-SRG1-SRG1-PP4-RX - XPONDER-INPUT + XPONDER-INPUT XPONDER-5-2XPDR-NW5-TX-toOpenROADM-5-2-SRG1-SRG1-PP5-RX XPONDER-5-2XPDR-NW5-TX OpenROADM-5-2-SRG1SRG1-PP5-RX OpenROADM-5-2-SRG1-SRG1-PP5-TX-to-XPONDER-5-2XPDR-NW5-RX - XPONDER-OUTPUT + XPONDER-OUTPUT OpenROADM-5-2-SRG1-SRG1-PP5-TX-to-XPONDER-5-2XPDR-NW5-RX OpenROADM-5-2-SRG1SRG1-PP5-TX XPONDER-5-2XPDR-NW5-RX XPONDER-5-2XPDR-NW5-TX-toOpenROADM-5-2-SRG1-SRG1-PP5-RX - XPONDER-INPUT + XPONDER-INPUT OpenROADM-5-1-DEG1-to-OpenROADM-5-2-DEG1 OpenROADM-5-2-DEG1-to-OpenROADM-5-1-DEG1 1 - ROADM-TO-ROADM + ROADM-TO-ROADM OpenROADM-5-1-DEG1DEG1-TTP-TX OpenROADM-5-2-DEG1DEG1-TTP-RX @@ -2930,7 +2930,7 @@ OpenROADM-5-2-DEG1-to-OpenROADM-5-1-DEG1 OpenROADM-5-1-DEG1-to-OpenROADM-5-2-DEG1 1 - ROADM-TO-ROADM + ROADM-TO-ROADM OpenROADM-5-2-DEG1DEG1-TTP-TX OpenROADM-5-1-DEG1DEG1-TTP-RX @@ -2955,7 +2955,7 @@ OpenROADM-5-2-DEG2-to-OpenROADM-5-1-DEG2 OpenROADM-5-1-DEG2-to-OpenROADM-5-2-DEG2 1 - ROADM-TO-ROADM + ROADM-TO-ROADM OpenROADM-5-2-DEG2DEG2-TTP-TX OpenROADM-5-1-DEG2DEG2-TTP-RX @@ -2980,7 +2980,7 @@ OpenROADM-5-1-DEG2-to-OpenROADM-5-2-DEG2 OpenROADM-5-2-DEG2-to-OpenROADM-5-1-DEG2 1 - ROADM-TO-ROADM + ROADM-TO-ROADM OpenROADM-5-1-DEG2DEG2-TTP-TX OpenROADM-5-2-DEG2DEG2-TTP-RX @@ -3005,7 +3005,7 @@ OpenROADM-1-2-DEG3-to-OpenROADM-2-1-DEG3 OpenROADM-2-1-DEG3-to-OpenROADM-1-2-DEG3 1 - ROADM-TO-ROADM + ROADM-TO-ROADM OpenROADM-1-2-DEG3DEG3-TTP-TX OpenROADM-2-1-DEG3DEG3-TTP-RX @@ -3030,7 +3030,7 @@ OpenROADM-2-1-DEG3-to-OpenROADM-1-2-DEG3 OpenROADM-1-2-DEG3-to-OpenROADM-2-1-DEG3 1 - ROADM-TO-ROADM + ROADM-TO-ROADM OpenROADM-2-1-DEG3DEG3-TTP-TX OpenROADM-1-2-DEG3DEG3-TTP-RX @@ -3055,7 +3055,7 @@ OpenROADM-2-2-DEG3-to-OpenROADM-3-1-DEG3 OpenROADM-3-1-DEG3-to-OpenROADM-2-2-DEG3 1 - ROADM-TO-ROADM + ROADM-TO-ROADM OpenROADM-2-2-DEG3DEG3-TTP-TX OpenROADM-3-1-DEG3DEG3-TTP-RX @@ -3080,7 +3080,7 @@ OpenROADM-3-1-DEG3-to-OpenROADM-2-2-DEG3 OpenROADM-2-2-DEG3-to-OpenROADM-3-1-DEG3 1 - ROADM-TO-ROADM + ROADM-TO-ROADM OpenROADM-3-1-DEG3DEG3-TTP-TX OpenROADM-2-2-DEG3DEG3-TTP-RX @@ -3105,7 +3105,7 @@ OpenROADM-3-2-DEG3-to-OpenROADM-4-1-DEG3 OpenROADM-4-1-DEG3-to-OpenROADM-3-2-DEG3 1 - ROADM-TO-ROADM + ROADM-TO-ROADM OpenROADM-3-2-DEG3DEG3-TTP-TX OpenROADM-4-1-DEG3DEG3-TTP-RX @@ -3130,7 +3130,7 @@ OpenROADM-4-1-DEG3-to-OpenROADM-3-2-DEG3 OpenROADM-3-2-DEG3-to-OpenROADM-4-1-DEG3 1 - ROADM-TO-ROADM + ROADM-TO-ROADM OpenROADM-4-1-DEG3DEG3-TTP-TX OpenROADM-3-2-DEG3DEG3-TTP-RX @@ -3155,7 +3155,7 @@ OpenROADM-4-2-DEG3-to-OpenROADM-5-1-DEG3 OpenROADM-5-1-DEG3-to-OpenROADM-4-2-DEG3 1 - ROADM-TO-ROADM + ROADM-TO-ROADM OpenROADM-4-2-DEG3DEG3-TTP-TX OpenROADM-5-1-DEG3DEG3-TTP-RX @@ -3180,7 +3180,7 @@ OpenROADM-5-1-DEG3-to-OpenROADM-4-2-DEG3 OpenROADM-4-2-DEG3-to-OpenROADM-5-1-DEG3 1 - ROADM-TO-ROADM + ROADM-TO-ROADM OpenROADM-5-1-DEG3DEG3-TTP-TX OpenROADM-4-2-DEG3DEG3-TTP-RX @@ -3205,7 +3205,7 @@ OpenROADM-5-2-DEG3-to-OpenROADM-1-1-DEG3 OpenROADM-1-1-DEG3-to-OpenROADM-5-2-DEG3 1 - ROADM-TO-ROADM + ROADM-TO-ROADM OpenROADM-5-2-DEG3DEG3-TTP-TX OpenROADM-1-1-DEG3DEG3-TTP-RX @@ -3230,7 +3230,7 @@ OpenROADM-1-1-DEG3-to-OpenROADM-5-2-DEG3 OpenROADM-5-2-DEG3-to-OpenROADM-1-1-DEG3 1 - ROADM-TO-ROADM + ROADM-TO-ROADM OpenROADM-1-1-DEG3DEG3-TTP-TX OpenROADM-5-2-DEG3DEG3-TTP-RX diff --git a/tests/sample_configs/gnpy/openroadmNetwork.json b/tests/sample_configs/gnpy/openroadmNetwork.json index d63c24d96..c297b7625 100644 --- a/tests/sample_configs/gnpy/openroadmNetwork.json +++ b/tests/sample_configs/gnpy/openroadmNetwork.json @@ -8,7 +8,7 @@ "org-openroadm-network:model": "1", "org-openroadm-network:vendor": "vendorA", "org-openroadm-network:ip": "127.0.0.11", - "org-openroadm-network:node-type": "XPONDER", + "org-openroadm-common-network:node-type": "XPONDER", "supporting-node": [ { "network-ref": "clli-network", @@ -21,7 +21,7 @@ "org-openroadm-network:model": "1", "org-openroadm-network:vendor": "vendorA", "org-openroadm-network:ip": "127.0.0.21", - "org-openroadm-network:node-type": "XPONDER", + "org-openroadm-common-network:node-type": "XPONDER", "supporting-node": [ { "network-ref": "clli-network", @@ -34,7 +34,7 @@ "org-openroadm-network:model": "1", "org-openroadm-network:vendor": "vendorA", "org-openroadm-network:ip": "127.0.0.31", - "org-openroadm-network:node-type": "XPONDER", + "org-openroadm-common-network:node-type": "XPONDER", "supporting-node": [ { "network-ref": "clli-network", @@ -47,7 +47,7 @@ "org-openroadm-network:model": "1", "org-openroadm-network:vendor": "vendorA", "org-openroadm-network:ip": "127.0.0.41", - "org-openroadm-network:node-type": "XPONDER", + "org-openroadm-common-network:node-type": "XPONDER", "supporting-node": [ { "network-ref": "clli-network", @@ -60,7 +60,7 @@ "org-openroadm-network:model": "1", "org-openroadm-network:vendor": "vendorA", "org-openroadm-network:ip": "127.0.0.51", - "org-openroadm-network:node-type": "XPONDER", + "org-openroadm-common-network:node-type": "XPONDER", "supporting-node": [ { "network-ref": "clli-network", @@ -73,7 +73,7 @@ "org-openroadm-network:model": "2", "org-openroadm-network:vendor": "vendorA", "org-openroadm-network:ip": "127.0.0.10", - "org-openroadm-network:node-type": "ROADM", + "org-openroadm-common-network:node-type": "ROADM", "supporting-node": [ { "network-ref": "clli-network", @@ -86,7 +86,7 @@ "org-openroadm-network:model": "2", "org-openroadm-network:vendor": "vendorA", "org-openroadm-network:ip": "127.0.0.20", - "org-openroadm-network:node-type": "ROADM", + "org-openroadm-common-network:node-type": "ROADM", "supporting-node": [ { "network-ref": "clli-network", @@ -99,7 +99,7 @@ "org-openroadm-network:model": "2", "org-openroadm-network:vendor": "vendorA", "org-openroadm-network:ip": "127.0.0.30", - "org-openroadm-network:node-type": "ROADM", + "org-openroadm-common-network:node-type": "ROADM", "supporting-node": [ { "network-ref": "clli-network", @@ -112,7 +112,7 @@ "org-openroadm-network:model": "2", "org-openroadm-network:vendor": "vendorA", "org-openroadm-network:ip": "127.0.0.40", - "org-openroadm-network:node-type": "ROADM", + "org-openroadm-common-network:node-type": "ROADM", "supporting-node": [ { "network-ref": "clli-network", @@ -125,7 +125,7 @@ "org-openroadm-network:model": "2", "org-openroadm-network:vendor": "vendorA", "org-openroadm-network:ip": "127.0.0.50", - "org-openroadm-network:node-type": "ROADM", + "org-openroadm-common-network:node-type": "ROADM", "supporting-node": [ { "network-ref": "clli-network", diff --git a/tests/sample_configs/gnpy/openroadmTopology.json b/tests/sample_configs/gnpy/openroadmTopology.json index f3916b237..93fab7da3 100644 --- a/tests/sample_configs/gnpy/openroadmTopology.json +++ b/tests/sample_configs/gnpy/openroadmTopology.json @@ -9,7 +9,7 @@ "source-node": "XPONDER-1", "source-tp": "XPDR-NW1-TX" }, - "org-openroadm-network-topology:link-type": "XPONDER-OUTPUT", + "org-openroadm-common-network:link-type": "XPONDER-OUTPUT", "destination": { "dest-node": "OpenROADM-1-SRG1", "dest-tp": "SRG1-PP1-RX" @@ -22,7 +22,7 @@ "source-node": "XPONDER-2", "source-tp": "XPDR-NW1-TX" }, - "org-openroadm-network-topology:link-type": "XPONDER-OUTPUT", + "org-openroadm-common-network:link-type": "XPONDER-OUTPUT", "destination": { "dest-node": "OpenROADM-2-SRG1", "dest-tp": "SRG1-PP1-RX" @@ -35,7 +35,7 @@ "source-node": "XPONDER-3", "source-tp": "XPDR-NW1-TX" }, - "org-openroadm-network-topology:link-type": "XPONDER-OUTPUT", + "org-openroadm-common-network:link-type": "XPONDER-OUTPUT", "destination": { "dest-node": "OpenROADM-3-SRG1", "dest-tp": "SRG1-PP1-RX" @@ -48,7 +48,7 @@ "source-node": "XPONDER-4", "source-tp": "XPDR-NW1-TX" }, - "org-openroadm-network-topology:link-type": "XPONDER-OUTPUT", + "org-openroadm-common-network:link-type": "XPONDER-OUTPUT", "destination": { "dest-node": "OpenROADM-4-SRG1", "dest-tp": "SRG1-PP1-RX" @@ -61,7 +61,7 @@ "source-node": "XPONDER-5", "source-tp": "XPDR-NW1-TX" }, - "org-openroadm-network-topology:link-type": "XPONDER-OUTPUT", + "org-openroadm-common-network:link-type": "XPONDER-OUTPUT", "destination": { "dest-node": "OpenROADM-5-SRG1", "dest-tp": "SRG1-PP1-RX" @@ -74,7 +74,7 @@ "source-node": "OpenROADM-1-SRG1", "source-tp": "SRG1-PP1-TX" }, - "org-openroadm-network-topology:link-type": "XPONDER-INPUT", + "org-openroadm-common-network:link-type": "XPONDER-INPUT", "destination": { "dest-node": "XPONDER-1", "dest-tp": "XPDR-NW1-RX" @@ -87,7 +87,7 @@ "source-node": "OpenROADM-2-SRG1", "source-tp": "SRG1-PP1-TX" }, - "org-openroadm-network-topology:link-type": "XPONDER-INPUT", + "org-openroadm-common-network:link-type": "XPONDER-INPUT", "destination": { "dest-node": "XPONDER-2", "dest-tp": "XPDR-NW1-RX" @@ -100,7 +100,7 @@ "source-node": "OpenROADM-3-SRG1", "source-tp": "SRG1-PP1-TX" }, - "org-openroadm-network-topology:link-type": "XPONDER-INPUT", + "org-openroadm-common-network:link-type": "XPONDER-INPUT", "destination": { "dest-node": "XPONDER-3", "dest-tp": "XPDR-NW1-RX" @@ -113,7 +113,7 @@ "source-node": "OpenROADM-4-SRG1", "source-tp": "SRG1-PP1-TX" }, - "org-openroadm-network-topology:link-type": "XPONDER-INPUT", + "org-openroadm-common-network:link-type": "XPONDER-INPUT", "destination": { "dest-node": "XPONDER-4", "dest-tp": "XPDR-NW1-RX" @@ -126,7 +126,7 @@ "source-node": "OpenROADM-5-SRG1", "source-tp": "SRG1-PP1-TX" }, - "org-openroadm-network-topology:link-type": "XPONDER-INPUT", + "org-openroadm-common-network:link-type": "XPONDER-INPUT", "destination": { "dest-node": "XPONDER-5", "dest-tp": "XPDR-NW1-RX" @@ -139,7 +139,7 @@ "source-node": "OpenROADM-1-SRG1", "source-tp": "SRG1-CP-TX" }, - "org-openroadm-network-topology:link-type": "ADD-LINK", + "org-openroadm-common-network:link-type": "ADD-LINK", "destination": { "dest-node": "OpenROADM-1-DEG1", "dest-tp": "DEG1-CTP-RX" @@ -152,7 +152,7 @@ "source-node": "OpenROADM-1-SRG1", "source-tp": "SRG1-CP-TX" }, - "org-openroadm-network-topology:link-type": "ADD-LINK", + "org-openroadm-common-network:link-type": "ADD-LINK", "destination": { "dest-node": "OpenROADM-1-DEG2", "dest-tp": "DEG2-CTP-RX" @@ -165,7 +165,7 @@ "source-node": "OpenROADM-2-SRG1", "source-tp": "SRG1-CP-TX" }, - "org-openroadm-network-topology:link-type": "ADD-LINK", + "org-openroadm-common-network:link-type": "ADD-LINK", "destination": { "dest-node": "OpenROADM-2-DEG1", "dest-tp": "DEG1-CTP-RX" @@ -178,7 +178,7 @@ "source-node": "OpenROADM-2-SRG1", "source-tp": "SRG1-CP-TX" }, - "org-openroadm-network-topology:link-type": "ADD-LINK", + "org-openroadm-common-network:link-type": "ADD-LINK", "destination": { "dest-node": "OpenROADM-2-DEG2", "dest-tp": "DEG2-CTP-RX" @@ -191,7 +191,7 @@ "source-node": "OpenROADM-2-SRG1", "source-tp": "SRG1-CP-TX" }, - "org-openroadm-network-topology:link-type": "ADD-LINK", + "org-openroadm-common-network:link-type": "ADD-LINK", "destination": { "dest-node": "OpenROADM-2-DEG3", "dest-tp": "DEG3-CTP-RX" @@ -204,7 +204,7 @@ "source-node": "OpenROADM-3-SRG1", "source-tp": "SRG1-CP-TX" }, - "org-openroadm-network-topology:link-type": "ADD-LINK", + "org-openroadm-common-network:link-type": "ADD-LINK", "destination": { "dest-node": "OpenROADM-3-DEG1", "dest-tp": "DEG1-CTP-RX" @@ -217,7 +217,7 @@ "source-node": "OpenROADM-3-SRG1", "source-tp": "SRG1-CP-TX" }, - "org-openroadm-network-topology:link-type": "ADD-LINK", + "org-openroadm-common-network:link-type": "ADD-LINK", "destination": { "dest-node": "OpenROADM-3-DEG2", "dest-tp": "DEG2-CTP-RX" @@ -230,7 +230,7 @@ "source-node": "OpenROADM-3-SRG1", "source-tp": "SRG1-CP-TX" }, - "org-openroadm-network-topology:link-type": "ADD-LINK", + "org-openroadm-common-network:link-type": "ADD-LINK", "destination": { "dest-node": "OpenROADM-3-DEG3", "dest-tp": "DEG3-CTP-RX" @@ -243,7 +243,7 @@ "source-node": "OpenROADM-3-SRG1", "source-tp": "SRG1-CP-TX" }, - "org-openroadm-network-topology:link-type": "ADD-LINK", + "org-openroadm-common-network:link-type": "ADD-LINK", "destination": { "dest-node": "OpenROADM-3-DEG4", "dest-tp": "DEG4-CTP-RX" @@ -256,7 +256,7 @@ "source-node": "OpenROADM-4-SRG1", "source-tp": "SRG1-CP-TX" }, - "org-openroadm-network-topology:link-type": "ADD-LINK", + "org-openroadm-common-network:link-type": "ADD-LINK", "destination": { "dest-node": "OpenROADM-4-DEG1", "dest-tp": "DEG1-CTP-RX" @@ -269,7 +269,7 @@ "source-node": "OpenROADM-4-SRG1", "source-tp": "SRG1-CP-TX" }, - "org-openroadm-network-topology:link-type": "ADD-LINK", + "org-openroadm-common-network:link-type": "ADD-LINK", "destination": { "dest-node": "OpenROADM-4-DEG2", "dest-tp": "DEG2-CTP-RX" @@ -282,7 +282,7 @@ "source-node": "OpenROADM-5-SRG1", "source-tp": "SRG1-CP-TX" }, - "org-openroadm-network-topology:link-type": "ADD-LINK", + "org-openroadm-common-network:link-type": "ADD-LINK", "destination": { "dest-node": "OpenROADM-5-DEG1", "dest-tp": "DEG1-CTP-RX" @@ -295,7 +295,7 @@ "source-node": "OpenROADM-5-SRG1", "source-tp": "SRG1-CP-TX" }, - "org-openroadm-network-topology:link-type": "ADD-LINK", + "org-openroadm-common-network:link-type": "ADD-LINK", "destination": { "dest-node": "OpenROADM-5-DEG2", "dest-tp": "DEG2-CTP-RX" @@ -308,7 +308,7 @@ "source-node": "OpenROADM-5-SRG1", "source-tp": "SRG1-CP-TX" }, - "org-openroadm-network-topology:link-type": "ADD-LINK", + "org-openroadm-common-network:link-type": "ADD-LINK", "destination": { "dest-node": "OpenROADM-5-DEG3", "dest-tp": "DEG3-CTP-RX" @@ -321,7 +321,7 @@ "source-node": "OpenROADM-1-DEG1", "source-tp": "DEG1-CTP-TX" }, - "org-openroadm-network-topology:link-type": "DROP-LINK", + "org-openroadm-common-network:link-type": "DROP-LINK", "destination": { "dest-node": "OpenROADM-1-SRG1", "dest-tp": "SRG1-CP-RX" @@ -334,7 +334,7 @@ "source-node": "OpenROADM-1-DEG2", "source-tp": "DEG2-CTP-TX" }, - "org-openroadm-network-topology:link-type": "DROP-LINK", + "org-openroadm-common-network:link-type": "DROP-LINK", "destination": { "dest-node": "OpenROADM-1-SRG1", "dest-tp": "SRG1-CP-RX" @@ -347,7 +347,7 @@ "source-node": "OpenROADM-2-DEG1", "source-tp": "DEG1-CTP-TX" }, - "org-openroadm-network-topology:link-type": "DROP-LINK", + "org-openroadm-common-network:link-type": "DROP-LINK", "destination": { "dest-node": "OpenROADM-2-SRG1", "dest-tp": "SRG1-CP-RX" @@ -360,7 +360,7 @@ "source-node": "OpenROADM-2-DEG2", "source-tp": "DEG2-CTP-TX" }, - "org-openroadm-network-topology:link-type": "DROP-LINK", + "org-openroadm-common-network:link-type": "DROP-LINK", "destination": { "dest-node": "OpenROADM-2-SRG1", "dest-tp": "SRG1-CP-RX" @@ -373,7 +373,7 @@ "source-node": "OpenROADM-2-DEG3", "source-tp": "DEG3-CTP-TX" }, - "org-openroadm-network-topology:link-type": "DROP-LINK", + "org-openroadm-common-network:link-type": "DROP-LINK", "destination": { "dest-node": "OpenROADM-2-SRG1", "dest-tp": "SRG1-CP-RX" @@ -386,7 +386,7 @@ "source-node": "OpenROADM-3-DEG1", "source-tp": "DEG1-CTP-TX" }, - "org-openroadm-network-topology:link-type": "DROP-LINK", + "org-openroadm-common-network:link-type": "DROP-LINK", "destination": { "dest-node": "OpenROADM-3-SRG1", "dest-tp": "SRG1-CP-RX" @@ -399,7 +399,7 @@ "source-node": "OpenROADM-3-DEG2", "source-tp": "DEG2-CTP-TX" }, - "org-openroadm-network-topology:link-type": "DROP-LINK", + "org-openroadm-common-network:link-type": "DROP-LINK", "destination": { "dest-node": "OpenROADM-3-SRG1", "dest-tp": "SRG1-CP-RX" @@ -412,7 +412,7 @@ "source-node": "OpenROADM-3-DEG3", "source-tp": "DEG3-CTP-TX" }, - "org-openroadm-network-topology:link-type": "DROP-LINK", + "org-openroadm-common-network:link-type": "DROP-LINK", "destination": { "dest-node": "OpenROADM-3-SRG1", "dest-tp": "SRG1-CP-RX" @@ -425,7 +425,7 @@ "source-node": "OpenROADM-3-DEG4", "source-tp": "DEG4-CTP-TX" }, - "org-openroadm-network-topology:link-type": "DROP-LINK", + "org-openroadm-common-network:link-type": "DROP-LINK", "destination": { "dest-node": "OpenROADM-3-SRG1", "dest-tp": "SRG1-CP-RX" @@ -438,7 +438,7 @@ "source-node": "OpenROADM-4-DEG1", "source-tp": "DEG1-CTP-TX" }, - "org-openroadm-network-topology:link-type": "DROP-LINK", + "org-openroadm-common-network:link-type": "DROP-LINK", "destination": { "dest-node": "OpenROADM-4-SRG1", "dest-tp": "SRG1-CP-RX" @@ -451,7 +451,7 @@ "source-node": "OpenROADM-4-DEG2", "source-tp": "DEG2-CTP-TX" }, - "org-openroadm-network-topology:link-type": "DROP-LINK", + "org-openroadm-common-network:link-type": "DROP-LINK", "destination": { "dest-node": "OpenROADM-4-SRG1", "dest-tp": "SRG1-CP-RX" @@ -464,7 +464,7 @@ "source-node": "OpenROADM-5-DEG1", "source-tp": "DEG1-CTP-TX" }, - "org-openroadm-network-topology:link-type": "DROP-LINK", + "org-openroadm-common-network:link-type": "DROP-LINK", "destination": { "dest-node": "OpenROADM-5-SRG1", "dest-tp": "SRG1-CP-RX" @@ -477,7 +477,7 @@ "source-node": "OpenROADM-5-DEG2", "source-tp": "DEG2-CTP-TX" }, - "org-openroadm-network-topology:link-type": "DROP-LINK", + "org-openroadm-common-network:link-type": "DROP-LINK", "destination": { "dest-node": "OpenROADM-5-SRG1", "dest-tp": "SRG1-CP-RX" @@ -490,7 +490,7 @@ "source-node": "OpenROADM-5-DEG3", "source-tp": "DEG3-CTP-TX" }, - "org-openroadm-network-topology:link-type": "DROP-LINK", + "org-openroadm-common-network:link-type": "DROP-LINK", "destination": { "dest-node": "OpenROADM-5-SRG1", "dest-tp": "SRG1-CP-RX" @@ -522,7 +522,7 @@ }, "TE-metric": 10 }, - "org-openroadm-network-topology:link-type": "ROADM-TO-ROADM", + "org-openroadm-common-network:link-type": "ROADM-TO-ROADM", "org-openroadm-network-topology:link-latency": 1, "destination": { "dest-node": "OpenROADM-2-DEG1", @@ -555,7 +555,7 @@ }, "TE-metric": 10 }, - "org-openroadm-network-topology:link-type": "ROADM-TO-ROADM", + "org-openroadm-common-network:link-type": "ROADM-TO-ROADM", "org-openroadm-network-topology:link-latency": 1, "destination": { "dest-node": "OpenROADM-3-DEG1", @@ -588,7 +588,7 @@ }, "TE-metric": 10 }, - "org-openroadm-network-topology:link-type": "ROADM-TO-ROADM", + "org-openroadm-common-network:link-type": "ROADM-TO-ROADM", "org-openroadm-network-topology:link-latency": 1, "destination": { "dest-node": "OpenROADM-1-DEG1", @@ -621,7 +621,7 @@ }, "TE-metric": 10 }, - "org-openroadm-network-topology:link-type": "ROADM-TO-ROADM", + "org-openroadm-common-network:link-type": "ROADM-TO-ROADM", "org-openroadm-network-topology:link-latency": 1, "destination": { "dest-node": "OpenROADM-3-DEG2", @@ -654,7 +654,7 @@ }, "TE-metric": 10 }, - "org-openroadm-network-topology:link-type": "ROADM-TO-ROADM", + "org-openroadm-common-network:link-type": "ROADM-TO-ROADM", "org-openroadm-network-topology:link-latency": 1, "destination": { "dest-node": "OpenROADM-5-DEG3", @@ -687,7 +687,7 @@ }, "TE-metric": 10 }, - "org-openroadm-network-topology:link-type": "ROADM-TO-ROADM", + "org-openroadm-common-network:link-type": "ROADM-TO-ROADM", "org-openroadm-network-topology:link-latency": 1, "destination": { "dest-node": "OpenROADM-1-DEG2", @@ -720,7 +720,7 @@ }, "TE-metric": 10 }, - "org-openroadm-network-topology:link-type": "ROADM-TO-ROADM", + "org-openroadm-common-network:link-type": "ROADM-TO-ROADM", "org-openroadm-network-topology:link-latency": 1, "destination": { "dest-node": "OpenROADM-2-DEG2", @@ -753,7 +753,7 @@ }, "TE-metric": 10 }, - "org-openroadm-network-topology:link-type": "ROADM-TO-ROADM", + "org-openroadm-common-network:link-type": "ROADM-TO-ROADM", "org-openroadm-network-topology:link-latency": 1, "destination": { "dest-node": "OpenROADM-5-DEG2", @@ -786,7 +786,7 @@ }, "TE-metric": 10 }, - "org-openroadm-network-topology:link-type": "ROADM-TO-ROADM", + "org-openroadm-common-network:link-type": "ROADM-TO-ROADM", "org-openroadm-network-topology:link-latency": 1, "destination": { "dest-node": "OpenROADM-4-DEG2", @@ -819,7 +819,7 @@ }, "TE-metric": 10 }, - "org-openroadm-network-topology:link-type": "ROADM-TO-ROADM", + "org-openroadm-common-network:link-type": "ROADM-TO-ROADM", "org-openroadm-network-topology:link-latency": 1, "destination": { "dest-node": "OpenROADM-5-DEG1", @@ -852,7 +852,7 @@ }, "TE-metric": 10 }, - "org-openroadm-network-topology:link-type": "ROADM-TO-ROADM", + "org-openroadm-common-network:link-type": "ROADM-TO-ROADM", "org-openroadm-network-topology:link-latency": 1, "destination": { "dest-node": "OpenROADM-3-DEG4", @@ -885,7 +885,7 @@ }, "TE-metric": 10 }, - "org-openroadm-network-topology:link-type": "ROADM-TO-ROADM", + "org-openroadm-common-network:link-type": "ROADM-TO-ROADM", "org-openroadm-network-topology:link-latency": 1, "destination": { "dest-node": "OpenROADM-4-DEG1", @@ -918,7 +918,7 @@ }, "TE-metric": 10 }, - "org-openroadm-network-topology:link-type": "ROADM-TO-ROADM", + "org-openroadm-common-network:link-type": "ROADM-TO-ROADM", "org-openroadm-network-topology:link-latency": 1, "destination": { "dest-node": "OpenROADM-3-DEG3", @@ -951,7 +951,7 @@ }, "TE-metric": 10 }, - "org-openroadm-network-topology:link-type": "ROADM-TO-ROADM", + "org-openroadm-common-network:link-type": "ROADM-TO-ROADM", "org-openroadm-network-topology:link-latency": 1, "destination": { "dest-node": "OpenROADM-2-DEG3", @@ -965,7 +965,7 @@ "source-node": "OpenROADM-1-DEG1", "source-tp": "DEG1-CTP-TX" }, - "org-openroadm-network-topology:link-type": "EXPRESS-LINK", + "org-openroadm-common-network:link-type": "EXPRESS-LINK", "destination": { "dest-node": "OpenROADM-1-DEG2", "dest-tp": "DEG2-CTP-RX" @@ -978,7 +978,7 @@ "source-node": "OpenROADM-1-DEG2", "source-tp": "DEG2-CTP-TX" }, - "org-openroadm-network-topology:link-type": "EXPRESS-LINK", + "org-openroadm-common-network:link-type": "EXPRESS-LINK", "destination": { "dest-node": "OpenROADM-1-DEG1", "dest-tp": "DEG1-CTP-RX" @@ -991,7 +991,7 @@ "source-node": "OpenROADM-2-DEG1", "source-tp": "DEG1-CTP-TX" }, - "org-openroadm-network-topology:link-type": "EXPRESS-LINK", + "org-openroadm-common-network:link-type": "EXPRESS-LINK", "destination": { "dest-node": "OpenROADM-2-DEG2", "dest-tp": "DEG2-CTP-RX" @@ -1004,7 +1004,7 @@ "source-node": "OpenROADM-2-DEG1", "source-tp": "DEG1-CTP-TX" }, - "org-openroadm-network-topology:link-type": "EXPRESS-LINK", + "org-openroadm-common-network:link-type": "EXPRESS-LINK", "destination": { "dest-node": "OpenROADM-2-DEG3", "dest-tp": "DEG3-CTP-RX" @@ -1017,7 +1017,7 @@ "source-node": "OpenROADM-2-DEG2", "source-tp": "DEG2-CTP-TX" }, - "org-openroadm-network-topology:link-type": "EXPRESS-LINK", + "org-openroadm-common-network:link-type": "EXPRESS-LINK", "destination": { "dest-node": "OpenROADM-2-DEG1", "dest-tp": "DEG1-CTP-RX" @@ -1030,7 +1030,7 @@ "source-node": "OpenROADM-2-DEG2", "source-tp": "DEG2-CTP-TX" }, - "org-openroadm-network-topology:link-type": "EXPRESS-LINK", + "org-openroadm-common-network:link-type": "EXPRESS-LINK", "destination": { "dest-node": "OpenROADM-2-DEG3", "dest-tp": "DEG3-CTP-RX" @@ -1043,7 +1043,7 @@ "source-node": "OpenROADM-2-DEG3", "source-tp": "DEG3-CTP-TX" }, - "org-openroadm-network-topology:link-type": "EXPRESS-LINK", + "org-openroadm-common-network:link-type": "EXPRESS-LINK", "destination": { "dest-node": "OpenROADM-2-DEG1", "dest-tp": "DEG1-CTP-RX" @@ -1056,7 +1056,7 @@ "source-node": "OpenROADM-2-DEG3", "source-tp": "DEG3-CTP-TX" }, - "org-openroadm-network-topology:link-type": "EXPRESS-LINK", + "org-openroadm-common-network:link-type": "EXPRESS-LINK", "destination": { "dest-node": "OpenROADM-2-DEG2", "dest-tp": "DEG2-CTP-RX" @@ -1069,7 +1069,7 @@ "source-node": "OpenROADM-3-DEG1", "source-tp": "DEG1-CTP-TX" }, - "org-openroadm-network-topology:link-type": "EXPRESS-LINK", + "org-openroadm-common-network:link-type": "EXPRESS-LINK", "destination": { "dest-node": "OpenROADM-3-DEG2", "dest-tp": "DEG2-CTP-RX" @@ -1082,7 +1082,7 @@ "source-node": "OpenROADM-3-DEG1", "source-tp": "DEG1-CTP-TX" }, - "org-openroadm-network-topology:link-type": "EXPRESS-LINK", + "org-openroadm-common-network:link-type": "EXPRESS-LINK", "destination": { "dest-node": "OpenROADM-3-DEG3", "dest-tp": "DEG3-CTP-RX" @@ -1095,7 +1095,7 @@ "source-node": "OpenROADM-3-DEG1", "source-tp": "DEG1-CTP-TX" }, - "org-openroadm-network-topology:link-type": "EXPRESS-LINK", + "org-openroadm-common-network:link-type": "EXPRESS-LINK", "destination": { "dest-node": "OpenROADM-3-DEG4", "dest-tp": "DEG4-CTP-RX" @@ -1108,7 +1108,7 @@ "source-node": "OpenROADM-3-DEG2", "source-tp": "DEG2-CTP-TX" }, - "org-openroadm-network-topology:link-type": "EXPRESS-LINK", + "org-openroadm-common-network:link-type": "EXPRESS-LINK", "destination": { "dest-node": "OpenROADM-3-DEG1", "dest-tp": "DEG1-CTP-RX" @@ -1121,7 +1121,7 @@ "source-node": "OpenROADM-3-DEG2", "source-tp": "DEG2-CTP-TX" }, - "org-openroadm-network-topology:link-type": "EXPRESS-LINK", + "org-openroadm-common-network:link-type": "EXPRESS-LINK", "destination": { "dest-node": "OpenROADM-3-DEG3", "dest-tp": "DEG3-CTP-RX" @@ -1134,7 +1134,7 @@ "source-node": "OpenROADM-3-DEG2", "source-tp": "DEG2-CTP-TX" }, - "org-openroadm-network-topology:link-type": "EXPRESS-LINK", + "org-openroadm-common-network:link-type": "EXPRESS-LINK", "destination": { "dest-node": "OpenROADM-3-DEG4", "dest-tp": "DEG4-CTP-RX" @@ -1147,7 +1147,7 @@ "source-node": "OpenROADM-3-DEG3", "source-tp": "DEG3-CTP-TX" }, - "org-openroadm-network-topology:link-type": "EXPRESS-LINK", + "org-openroadm-common-network:link-type": "EXPRESS-LINK", "destination": { "dest-node": "OpenROADM-3-DEG1", "dest-tp": "DEG1-CTP-RX" @@ -1160,7 +1160,7 @@ "source-node": "OpenROADM-3-DEG3", "source-tp": "DEG3-CTP-TX" }, - "org-openroadm-network-topology:link-type": "EXPRESS-LINK", + "org-openroadm-common-network:link-type": "EXPRESS-LINK", "destination": { "dest-node": "OpenROADM-3-DEG2", "dest-tp": "DEG2-CTP-RX" @@ -1173,7 +1173,7 @@ "source-node": "OpenROADM-3-DEG3", "source-tp": "DEG3-CTP-TX" }, - "org-openroadm-network-topology:link-type": "EXPRESS-LINK", + "org-openroadm-common-network:link-type": "EXPRESS-LINK", "destination": { "dest-node": "OpenROADM-3-DEG4", "dest-tp": "DEG4-CTP-RX" @@ -1186,7 +1186,7 @@ "source-node": "OpenROADM-3-DEG4", "source-tp": "DEG4-CTP-TX" }, - "org-openroadm-network-topology:link-type": "EXPRESS-LINK", + "org-openroadm-common-network:link-type": "EXPRESS-LINK", "destination": { "dest-node": "OpenROADM-3-DEG1", "dest-tp": "DEG1-CTP-RX" @@ -1199,7 +1199,7 @@ "source-node": "OpenROADM-3-DEG4", "source-tp": "DEG4-CTP-TX" }, - "org-openroadm-network-topology:link-type": "EXPRESS-LINK", + "org-openroadm-common-network:link-type": "EXPRESS-LINK", "destination": { "dest-node": "OpenROADM-3-DEG2", "dest-tp": "DEG2-CTP-RX" @@ -1212,7 +1212,7 @@ "source-node": "OpenROADM-3-DEG4", "source-tp": "DEG4-CTP-TX" }, - "org-openroadm-network-topology:link-type": "EXPRESS-LINK", + "org-openroadm-common-network:link-type": "EXPRESS-LINK", "destination": { "dest-node": "OpenROADM-3-DEG3", "dest-tp": "DEG3-CTP-RX" @@ -1225,7 +1225,7 @@ "source-node": "OpenROADM-4-DEG1", "source-tp": "DEG1-CTP-TX" }, - "org-openroadm-network-topology:link-type": "EXPRESS-LINK", + "org-openroadm-common-network:link-type": "EXPRESS-LINK", "destination": { "dest-node": "OpenROADM-4-DEG2", "dest-tp": "DEG2-CTP-RX" @@ -1238,7 +1238,7 @@ "source-node": "OpenROADM-4-DEG2", "source-tp": "DEG2-CTP-TX" }, - "org-openroadm-network-topology:link-type": "EXPRESS-LINK", + "org-openroadm-common-network:link-type": "EXPRESS-LINK", "destination": { "dest-node": "OpenROADM-4-DEG1", "dest-tp": "DEG1-CTP-RX" @@ -1251,7 +1251,7 @@ "source-node": "OpenROADM-5-DEG1", "source-tp": "DEG1-CTP-TX" }, - "org-openroadm-network-topology:link-type": "EXPRESS-LINK", + "org-openroadm-common-network:link-type": "EXPRESS-LINK", "destination": { "dest-node": "OpenROADM-5-DEG2", "dest-tp": "DEG2-CTP-RX" @@ -1264,7 +1264,7 @@ "source-node": "OpenROADM-5-DEG1", "source-tp": "DEG1-CTP-TX" }, - "org-openroadm-network-topology:link-type": "EXPRESS-LINK", + "org-openroadm-common-network:link-type": "EXPRESS-LINK", "destination": { "dest-node": "OpenROADM-5-DEG3", "dest-tp": "DEG3-CTP-RX" @@ -1277,7 +1277,7 @@ "source-node": "OpenROADM-5-DEG2", "source-tp": "DEG2-CTP-TX" }, - "org-openroadm-network-topology:link-type": "EXPRESS-LINK", + "org-openroadm-common-network:link-type": "EXPRESS-LINK", "destination": { "dest-node": "OpenROADM-5-DEG1", "dest-tp": "DEG1-CTP-RX" @@ -1290,7 +1290,7 @@ "source-node": "OpenROADM-5-DEG2", "source-tp": "DEG2-CTP-TX" }, - "org-openroadm-network-topology:link-type": "EXPRESS-LINK", + "org-openroadm-common-network:link-type": "EXPRESS-LINK", "destination": { "dest-node": "OpenROADM-5-DEG3", "dest-tp": "DEG3-CTP-RX" @@ -1303,7 +1303,7 @@ "source-node": "OpenROADM-5-DEG3", "source-tp": "DEG3-CTP-TX" }, - "org-openroadm-network-topology:link-type": "EXPRESS-LINK", + "org-openroadm-common-network:link-type": "EXPRESS-LINK", "destination": { "dest-node": "OpenROADM-5-DEG1", "dest-tp": "DEG1-CTP-RX" @@ -1316,7 +1316,7 @@ "source-node": "OpenROADM-5-DEG3", "source-tp": "DEG3-CTP-TX" }, - "org-openroadm-network-topology:link-type": "EXPRESS-LINK", + "org-openroadm-common-network:link-type": "EXPRESS-LINK", "destination": { "dest-node": "OpenROADM-5-DEG2", "dest-tp": "DEG2-CTP-RX" @@ -1330,51 +1330,51 @@ "ietf-network-topology:termination-point": [ { "tp-id": "SRG1-CP-RX", - "org-openroadm-network-topology:tp-type": "SRG-RX-CP" + "org-openroadm-common-network:tp-type": "SRG-RX-CP" }, { "tp-id": "SRG1-PP4-TX", - "org-openroadm-network-topology:tp-type": "SRG-TX-PP" + "org-openroadm-common-network:tp-type": "SRG-TX-PP" }, { "tp-id": "SRG1-PP5-TX", - "org-openroadm-network-topology:tp-type": "SRG-TX-PP" + "org-openroadm-common-network:tp-type": "SRG-TX-PP" }, { "tp-id": "SRG1-PP1-RX", - "org-openroadm-network-topology:tp-type": "SRG-RX-PP" + "org-openroadm-common-network:tp-type": "SRG-RX-PP" }, { "tp-id": "SRG1-PP3-TX", - "org-openroadm-network-topology:tp-type": "SRG-TX-PP" + "org-openroadm-common-network:tp-type": "SRG-TX-PP" }, { "tp-id": "SRG1-PP4-RX", - "org-openroadm-network-topology:tp-type": "SRG-RX-PP" + "org-openroadm-common-network:tp-type": "SRG-RX-PP" }, { "tp-id": "SRG1-PP2-TX", - "org-openroadm-network-topology:tp-type": "SRG-TX-PP" + "org-openroadm-common-network:tp-type": "SRG-TX-PP" }, { "tp-id": "SRG1-PP5-RX", - "org-openroadm-network-topology:tp-type": "SRG-RX-PP" + "org-openroadm-common-network:tp-type": "SRG-RX-PP" }, { "tp-id": "SRG1-CP-TX", - "org-openroadm-network-topology:tp-type": "SRG-TX-CP" + "org-openroadm-common-network:tp-type": "SRG-TX-CP" }, { "tp-id": "SRG1-PP1-TX", - "org-openroadm-network-topology:tp-type": "SRG-TX-PP" + "org-openroadm-common-network:tp-type": "SRG-TX-PP" }, { "tp-id": "SRG1-PP3-RX", - "org-openroadm-network-topology:tp-type": "SRG-RX-PP" + "org-openroadm-common-network:tp-type": "SRG-RX-PP" }, { "tp-id": "SRG1-PP2-RX", - "org-openroadm-network-topology:tp-type": "SRG-RX-PP" + "org-openroadm-common-network:tp-type": "SRG-RX-PP" } ], "org-openroadm-network-topology:srg-attributes": { @@ -1411,7 +1411,7 @@ } ] }, - "org-openroadm-network-topology:node-type": "SRG", + "org-openroadm-common-network:node-type": "SRG", "supporting-node": [ { "network-ref":"openroadm-network", @@ -1424,19 +1424,19 @@ "ietf-network-topology:termination-point": [ { "tp-id": "DEG1-CTP-TX", - "org-openroadm-network-topology:tp-type": "DEGREE-TX-CTP" + "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP" }, { "tp-id": "DEG1-TTP-TX", - "org-openroadm-network-topology:tp-type": "DEGREE-TX-TTP" + "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP" }, { "tp-id": "DEG1-CTP-RX", - "org-openroadm-network-topology:tp-type": "DEGREE-RX-CTP" + "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP" }, { "tp-id": "DEG1-TTP-RX", - "org-openroadm-network-topology:tp-type": "DEGREE-RX-TTP" + "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP" } ], "org-openroadm-network-topology:degree-attributes": { @@ -1474,7 +1474,7 @@ } ] }, - "org-openroadm-network-topology:node-type": "DEGREE", + "org-openroadm-common-network:node-type": "DEGREE", "supporting-node": [ { "network-ref":"openroadm-network", @@ -1487,19 +1487,19 @@ "ietf-network-topology:termination-point": [ { "tp-id": "DEG2-CTP-RX", - "org-openroadm-network-topology:tp-type": "DEGREE-RX-CTP" + "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP" }, { "tp-id": "DEG2-CTP-TX", - "org-openroadm-network-topology:tp-type": "DEGREE-TX-CTP" + "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP" }, { "tp-id": "DEG2-TTP-TX", - "org-openroadm-network-topology:tp-type": "DEGREE-TX-TTP" + "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP" }, { "tp-id": "DEG2-TTP-RX", - "org-openroadm-network-topology:tp-type": "DEGREE-RX-TTP" + "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP" } ], "org-openroadm-network-topology:degree-attributes": { @@ -1537,7 +1537,7 @@ } ] }, - "org-openroadm-network-topology:node-type": "DEGREE", + "org-openroadm-common-network:node-type": "DEGREE", "supporting-node": [ { "network-ref":"openroadm-network", @@ -1550,51 +1550,51 @@ "ietf-network-topology:termination-point": [ { "tp-id": "SRG1-CP-RX", - "org-openroadm-network-topology:tp-type": "SRG-RX-CP" + "org-openroadm-common-network:tp-type": "SRG-RX-CP" }, { "tp-id": "SRG1-PP4-TX", - "org-openroadm-network-topology:tp-type": "SRG-TX-PP" + "org-openroadm-common-network:tp-type": "SRG-TX-PP" }, { "tp-id": "SRG1-PP5-TX", - "org-openroadm-network-topology:tp-type": "SRG-TX-PP" + "org-openroadm-common-network:tp-type": "SRG-TX-PP" }, { "tp-id": "SRG1-PP1-RX", - "org-openroadm-network-topology:tp-type": "SRG-RX-PP" + "org-openroadm-common-network:tp-type": "SRG-RX-PP" }, { "tp-id": "SRG1-PP3-TX", - "org-openroadm-network-topology:tp-type": "SRG-TX-PP" + "org-openroadm-common-network:tp-type": "SRG-TX-PP" }, { "tp-id": "SRG1-PP4-RX", - "org-openroadm-network-topology:tp-type": "SRG-RX-PP" + "org-openroadm-common-network:tp-type": "SRG-RX-PP" }, { "tp-id": "SRG1-PP2-TX", - "org-openroadm-network-topology:tp-type": "SRG-TX-PP" + "org-openroadm-common-network:tp-type": "SRG-TX-PP" }, { "tp-id": "SRG1-PP5-RX", - "org-openroadm-network-topology:tp-type": "SRG-RX-PP" + "org-openroadm-common-network:tp-type": "SRG-RX-PP" }, { "tp-id": "SRG1-CP-TX", - "org-openroadm-network-topology:tp-type": "SRG-TX-CP" + "org-openroadm-common-network:tp-type": "SRG-TX-CP" }, { "tp-id": "SRG1-PP1-TX", - "org-openroadm-network-topology:tp-type": "SRG-TX-PP" + "org-openroadm-common-network:tp-type": "SRG-TX-PP" }, { "tp-id": "SRG1-PP3-RX", - "org-openroadm-network-topology:tp-type": "SRG-RX-PP" + "org-openroadm-common-network:tp-type": "SRG-RX-PP" }, { "tp-id": "SRG1-PP2-RX", - "org-openroadm-network-topology:tp-type": "SRG-RX-PP" + "org-openroadm-common-network:tp-type": "SRG-RX-PP" } ], "org-openroadm-network-topology:srg-attributes": { @@ -1631,7 +1631,7 @@ } ] }, - "org-openroadm-network-topology:node-type": "SRG", + "org-openroadm-common-network:node-type": "SRG", "supporting-node": [ { "network-ref":"openroadm-network", @@ -1644,19 +1644,19 @@ "ietf-network-topology:termination-point": [ { "tp-id": "DEG1-CTP-TX", - "org-openroadm-network-topology:tp-type": "DEGREE-TX-CTP" + "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP" }, { "tp-id": "DEG1-TTP-TX", - "org-openroadm-network-topology:tp-type": "DEGREE-TX-TTP" + "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP" }, { "tp-id": "DEG1-CTP-RX", - "org-openroadm-network-topology:tp-type": "DEGREE-RX-CTP" + "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP" }, { "tp-id": "DEG1-TTP-RX", - "org-openroadm-network-topology:tp-type": "DEGREE-RX-TTP" + "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP" } ], "org-openroadm-network-topology:degree-attributes": { @@ -1694,7 +1694,7 @@ } ] }, - "org-openroadm-network-topology:node-type": "DEGREE", + "org-openroadm-common-network:node-type": "DEGREE", "supporting-node": [ { "network-ref":"openroadm-network", @@ -1707,19 +1707,19 @@ "ietf-network-topology:termination-point": [ { "tp-id": "DEG2-CTP-RX", - "org-openroadm-network-topology:tp-type": "DEGREE-RX-CTP" + "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP" }, { "tp-id": "DEG2-CTP-TX", - "org-openroadm-network-topology:tp-type": "DEGREE-TX-CTP" + "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP" }, { "tp-id": "DEG2-TTP-TX", - "org-openroadm-network-topology:tp-type": "DEGREE-TX-TTP" + "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP" }, { "tp-id": "DEG2-TTP-RX", - "org-openroadm-network-topology:tp-type": "DEGREE-RX-TTP" + "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP" } ], "org-openroadm-network-topology:degree-attributes": { @@ -1757,7 +1757,7 @@ } ] }, - "org-openroadm-network-topology:node-type": "DEGREE", + "org-openroadm-common-network:node-type": "DEGREE", "supporting-node": [ { "network-ref":"openroadm-network", @@ -1770,19 +1770,19 @@ "ietf-network-topology:termination-point": [ { "tp-id": "DEG3-TTP-TX", - "org-openroadm-network-topology:tp-type": "DEGREE-TX-TTP" + "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP" }, { "tp-id": "DEG3-CTP-TX", - "org-openroadm-network-topology:tp-type": "DEGREE-TX-CTP" + "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP" }, { "tp-id": "DEG3-CTP-RX", - "org-openroadm-network-topology:tp-type": "DEGREE-RX-CTP" + "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP" }, { "tp-id": "DEG3-TTP-RX", - "org-openroadm-network-topology:tp-type": "DEGREE-RX-TTP" + "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP" } ], "org-openroadm-network-topology:degree-attributes": { @@ -1820,7 +1820,7 @@ } ] }, - "org-openroadm-network-topology:node-type": "DEGREE", + "org-openroadm-common-network:node-type": "DEGREE", "supporting-node": [ { "network-ref":"openroadm-network", @@ -1833,51 +1833,51 @@ "ietf-network-topology:termination-point": [ { "tp-id": "SRG1-CP-RX", - "org-openroadm-network-topology:tp-type": "SRG-RX-CP" + "org-openroadm-common-network:tp-type": "SRG-RX-CP" }, { "tp-id": "SRG1-PP4-TX", - "org-openroadm-network-topology:tp-type": "SRG-TX-PP" + "org-openroadm-common-network:tp-type": "SRG-TX-PP" }, { "tp-id": "SRG1-PP5-TX", - "org-openroadm-network-topology:tp-type": "SRG-TX-PP" + "org-openroadm-common-network:tp-type": "SRG-TX-PP" }, { "tp-id": "SRG1-PP1-RX", - "org-openroadm-network-topology:tp-type": "SRG-RX-PP" + "org-openroadm-common-network:tp-type": "SRG-RX-PP" }, { "tp-id": "SRG1-PP3-TX", - "org-openroadm-network-topology:tp-type": "SRG-TX-PP" + "org-openroadm-common-network:tp-type": "SRG-TX-PP" }, { "tp-id": "SRG1-PP4-RX", - "org-openroadm-network-topology:tp-type": "SRG-RX-PP" + "org-openroadm-common-network:tp-type": "SRG-RX-PP" }, { "tp-id": "SRG1-PP2-TX", - "org-openroadm-network-topology:tp-type": "SRG-TX-PP" + "org-openroadm-common-network:tp-type": "SRG-TX-PP" }, { "tp-id": "SRG1-PP5-RX", - "org-openroadm-network-topology:tp-type": "SRG-RX-PP" + "org-openroadm-common-network:tp-type": "SRG-RX-PP" }, { "tp-id": "SRG1-CP-TX", - "org-openroadm-network-topology:tp-type": "SRG-TX-CP" + "org-openroadm-common-network:tp-type": "SRG-TX-CP" }, { "tp-id": "SRG1-PP1-TX", - "org-openroadm-network-topology:tp-type": "SRG-TX-PP" + "org-openroadm-common-network:tp-type": "SRG-TX-PP" }, { "tp-id": "SRG1-PP3-RX", - "org-openroadm-network-topology:tp-type": "SRG-RX-PP" + "org-openroadm-common-network:tp-type": "SRG-RX-PP" }, { "tp-id": "SRG1-PP2-RX", - "org-openroadm-network-topology:tp-type": "SRG-RX-PP" + "org-openroadm-common-network:tp-type": "SRG-RX-PP" } ], "org-openroadm-network-topology:srg-attributes": { @@ -1914,7 +1914,7 @@ } ] }, - "org-openroadm-network-topology:node-type": "SRG", + "org-openroadm-common-network:node-type": "SRG", "supporting-node": [ { "network-ref":"openroadm-network", @@ -1927,19 +1927,19 @@ "ietf-network-topology:termination-point": [ { "tp-id": "DEG1-CTP-TX", - "org-openroadm-network-topology:tp-type": "DEGREE-TX-CTP" + "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP" }, { "tp-id": "DEG1-TTP-TX", - "org-openroadm-network-topology:tp-type": "DEGREE-TX-TTP" + "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP" }, { "tp-id": "DEG1-CTP-RX", - "org-openroadm-network-topology:tp-type": "DEGREE-RX-CTP" + "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP" }, { "tp-id": "DEG1-TTP-RX", - "org-openroadm-network-topology:tp-type": "DEGREE-RX-TTP" + "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP" } ], "org-openroadm-network-topology:degree-attributes": { @@ -1977,7 +1977,7 @@ } ] }, - "org-openroadm-network-topology:node-type": "DEGREE", + "org-openroadm-common-network:node-type": "DEGREE", "supporting-node": [ { "network-ref":"openroadm-network", @@ -1990,19 +1990,19 @@ "ietf-network-topology:termination-point": [ { "tp-id": "DEG2-CTP-RX", - "org-openroadm-network-topology:tp-type": "DEGREE-RX-CTP" + "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP" }, { "tp-id": "DEG2-CTP-TX", - "org-openroadm-network-topology:tp-type": "DEGREE-TX-CTP" + "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP" }, { "tp-id": "DEG2-TTP-TX", - "org-openroadm-network-topology:tp-type": "DEGREE-TX-TTP" + "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP" }, { "tp-id": "DEG2-TTP-RX", - "org-openroadm-network-topology:tp-type": "DEGREE-RX-TTP" + "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP" } ], "org-openroadm-network-topology:degree-attributes": { @@ -2040,7 +2040,7 @@ } ] }, - "org-openroadm-network-topology:node-type": "DEGREE", + "org-openroadm-common-network:node-type": "DEGREE", "supporting-node": [ { "network-ref":"openroadm-network", @@ -2053,19 +2053,19 @@ "ietf-network-topology:termination-point": [ { "tp-id": "DEG3-TTP-TX", - "org-openroadm-network-topology:tp-type": "DEGREE-TX-TTP" + "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP" }, { "tp-id": "DEG3-CTP-TX", - "org-openroadm-network-topology:tp-type": "DEGREE-TX-CTP" + "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP" }, { "tp-id": "DEG3-CTP-RX", - "org-openroadm-network-topology:tp-type": "DEGREE-RX-CTP" + "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP" }, { "tp-id": "DEG3-TTP-RX", - "org-openroadm-network-topology:tp-type": "DEGREE-RX-TTP" + "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP" } ], "org-openroadm-network-topology:degree-attributes": { @@ -2103,7 +2103,7 @@ } ] }, - "org-openroadm-network-topology:node-type": "DEGREE", + "org-openroadm-common-network:node-type": "DEGREE", "supporting-node": [ { "network-ref":"openroadm-network", @@ -2116,19 +2116,19 @@ "ietf-network-topology:termination-point": [ { "tp-id": "DEG4-TTP-RX", - "org-openroadm-network-topology:tp-type": "DEGREE-RX-TTP" + "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP" }, { "tp-id": "DEG4-CTP-TX", - "org-openroadm-network-topology:tp-type": "DEGREE-TX-CTP" + "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP" }, { "tp-id": "DEG4-CTP-RX", - "org-openroadm-network-topology:tp-type": "DEGREE-RX-CTP" + "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP" }, { "tp-id": "DEG4-TTP-TX", - "org-openroadm-network-topology:tp-type": "DEGREE-TX-TTP" + "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP" } ], "org-openroadm-network-topology:degree-attributes": { @@ -2166,7 +2166,7 @@ } ] }, - "org-openroadm-network-topology:node-type": "DEGREE", + "org-openroadm-common-network:node-type": "DEGREE", "supporting-node": [ { "network-ref":"openroadm-network", @@ -2179,51 +2179,51 @@ "ietf-network-topology:termination-point": [ { "tp-id": "SRG1-CP-RX", - "org-openroadm-network-topology:tp-type": "SRG-RX-CP" + "org-openroadm-common-network:tp-type": "SRG-RX-CP" }, { "tp-id": "SRG1-PP4-TX", - "org-openroadm-network-topology:tp-type": "SRG-TX-PP" + "org-openroadm-common-network:tp-type": "SRG-TX-PP" }, { "tp-id": "SRG1-PP5-TX", - "org-openroadm-network-topology:tp-type": "SRG-TX-PP" + "org-openroadm-common-network:tp-type": "SRG-TX-PP" }, { "tp-id": "SRG1-PP1-RX", - "org-openroadm-network-topology:tp-type": "SRG-RX-PP" + "org-openroadm-common-network:tp-type": "SRG-RX-PP" }, { "tp-id": "SRG1-PP3-TX", - "org-openroadm-network-topology:tp-type": "SRG-TX-PP" + "org-openroadm-common-network:tp-type": "SRG-TX-PP" }, { "tp-id": "SRG1-PP4-RX", - "org-openroadm-network-topology:tp-type": "SRG-RX-PP" + "org-openroadm-common-network:tp-type": "SRG-RX-PP" }, { "tp-id": "SRG1-PP2-TX", - "org-openroadm-network-topology:tp-type": "SRG-TX-PP" + "org-openroadm-common-network:tp-type": "SRG-TX-PP" }, { "tp-id": "SRG1-PP5-RX", - "org-openroadm-network-topology:tp-type": "SRG-RX-PP" + "org-openroadm-common-network:tp-type": "SRG-RX-PP" }, { "tp-id": "SRG1-CP-TX", - "org-openroadm-network-topology:tp-type": "SRG-TX-CP" + "org-openroadm-common-network:tp-type": "SRG-TX-CP" }, { "tp-id": "SRG1-PP1-TX", - "org-openroadm-network-topology:tp-type": "SRG-TX-PP" + "org-openroadm-common-network:tp-type": "SRG-TX-PP" }, { "tp-id": "SRG1-PP3-RX", - "org-openroadm-network-topology:tp-type": "SRG-RX-PP" + "org-openroadm-common-network:tp-type": "SRG-RX-PP" }, { "tp-id": "SRG1-PP2-RX", - "org-openroadm-network-topology:tp-type": "SRG-RX-PP" + "org-openroadm-common-network:tp-type": "SRG-RX-PP" } ], "org-openroadm-network-topology:srg-attributes": { @@ -2260,7 +2260,7 @@ } ] }, - "org-openroadm-network-topology:node-type": "SRG", + "org-openroadm-common-network:node-type": "SRG", "supporting-node": [ { "network-ref":"openroadm-network", @@ -2273,19 +2273,19 @@ "ietf-network-topology:termination-point": [ { "tp-id": "DEG1-CTP-TX", - "org-openroadm-network-topology:tp-type": "DEGREE-TX-CTP" + "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP" }, { "tp-id": "DEG1-TTP-TX", - "org-openroadm-network-topology:tp-type": "DEGREE-TX-TTP" + "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP" }, { "tp-id": "DEG1-CTP-RX", - "org-openroadm-network-topology:tp-type": "DEGREE-RX-CTP" + "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP" }, { "tp-id": "DEG1-TTP-RX", - "org-openroadm-network-topology:tp-type": "DEGREE-RX-TTP" + "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP" } ], "org-openroadm-network-topology:degree-attributes": { @@ -2323,7 +2323,7 @@ } ] }, - "org-openroadm-network-topology:node-type": "DEGREE", + "org-openroadm-common-network:node-type": "DEGREE", "supporting-node": [ { "network-ref":"openroadm-network", @@ -2336,19 +2336,19 @@ "ietf-network-topology:termination-point": [ { "tp-id": "DEG2-CTP-RX", - "org-openroadm-network-topology:tp-type": "DEGREE-RX-CTP" + "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP" }, { "tp-id": "DEG2-CTP-TX", - "org-openroadm-network-topology:tp-type": "DEGREE-TX-CTP" + "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP" }, { "tp-id": "DEG2-TTP-TX", - "org-openroadm-network-topology:tp-type": "DEGREE-TX-TTP" + "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP" }, { "tp-id": "DEG2-TTP-RX", - "org-openroadm-network-topology:tp-type": "DEGREE-RX-TTP" + "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP" } ], "org-openroadm-network-topology:degree-attributes": { @@ -2386,7 +2386,7 @@ } ] }, - "org-openroadm-network-topology:node-type": "DEGREE", + "org-openroadm-common-network:node-type": "DEGREE", "supporting-node": [ { "network-ref":"openroadm-network", @@ -2399,51 +2399,51 @@ "ietf-network-topology:termination-point": [ { "tp-id": "SRG1-CP-RX", - "org-openroadm-network-topology:tp-type": "SRG-RX-CP" + "org-openroadm-common-network:tp-type": "SRG-RX-CP" }, { "tp-id": "SRG1-PP4-TX", - "org-openroadm-network-topology:tp-type": "SRG-TX-PP" + "org-openroadm-common-network:tp-type": "SRG-TX-PP" }, { "tp-id": "SRG1-PP5-TX", - "org-openroadm-network-topology:tp-type": "SRG-TX-PP" + "org-openroadm-common-network:tp-type": "SRG-TX-PP" }, { "tp-id": "SRG1-PP1-RX", - "org-openroadm-network-topology:tp-type": "SRG-RX-PP" + "org-openroadm-common-network:tp-type": "SRG-RX-PP" }, { "tp-id": "SRG1-PP3-TX", - "org-openroadm-network-topology:tp-type": "SRG-TX-PP" + "org-openroadm-common-network:tp-type": "SRG-TX-PP" }, { "tp-id": "SRG1-PP4-RX", - "org-openroadm-network-topology:tp-type": "SRG-RX-PP" + "org-openroadm-common-network:tp-type": "SRG-RX-PP" }, { "tp-id": "SRG1-PP2-TX", - "org-openroadm-network-topology:tp-type": "SRG-TX-PP" + "org-openroadm-common-network:tp-type": "SRG-TX-PP" }, { "tp-id": "SRG1-PP5-RX", - "org-openroadm-network-topology:tp-type": "SRG-RX-PP" + "org-openroadm-common-network:tp-type": "SRG-RX-PP" }, { "tp-id": "SRG1-CP-TX", - "org-openroadm-network-topology:tp-type": "SRG-TX-CP" + "org-openroadm-common-network:tp-type": "SRG-TX-CP" }, { "tp-id": "SRG1-PP1-TX", - "org-openroadm-network-topology:tp-type": "SRG-TX-PP" + "org-openroadm-common-network:tp-type": "SRG-TX-PP" }, { "tp-id": "SRG1-PP3-RX", - "org-openroadm-network-topology:tp-type": "SRG-RX-PP" + "org-openroadm-common-network:tp-type": "SRG-RX-PP" }, { "tp-id": "SRG1-PP2-RX", - "org-openroadm-network-topology:tp-type": "SRG-RX-PP" + "org-openroadm-common-network:tp-type": "SRG-RX-PP" } ], "org-openroadm-network-topology:srg-attributes": { @@ -2480,7 +2480,7 @@ } ] }, - "org-openroadm-network-topology:node-type": "SRG", + "org-openroadm-common-network:node-type": "SRG", "supporting-node": [ { "network-ref":"openroadm-network", @@ -2493,19 +2493,19 @@ "ietf-network-topology:termination-point": [ { "tp-id": "DEG1-CTP-TX", - "org-openroadm-network-topology:tp-type": "DEGREE-TX-CTP" + "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP" }, { "tp-id": "DEG1-TTP-TX", - "org-openroadm-network-topology:tp-type": "DEGREE-TX-TTP" + "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP" }, { "tp-id": "DEG1-CTP-RX", - "org-openroadm-network-topology:tp-type": "DEGREE-RX-CTP" + "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP" }, { "tp-id": "DEG1-TTP-RX", - "org-openroadm-network-topology:tp-type": "DEGREE-RX-TTP" + "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP" } ], "org-openroadm-network-topology:degree-attributes": { @@ -2543,7 +2543,7 @@ } ] }, - "org-openroadm-network-topology:node-type": "DEGREE", + "org-openroadm-common-network:node-type": "DEGREE", "supporting-node": [ { "network-ref":"openroadm-network", @@ -2556,19 +2556,19 @@ "ietf-network-topology:termination-point": [ { "tp-id": "DEG2-CTP-RX", - "org-openroadm-network-topology:tp-type": "DEGREE-RX-CTP" + "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP" }, { "tp-id": "DEG2-CTP-TX", - "org-openroadm-network-topology:tp-type": "DEGREE-TX-CTP" + "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP" }, { "tp-id": "DEG2-TTP-TX", - "org-openroadm-network-topology:tp-type": "DEGREE-TX-TTP" + "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP" }, { "tp-id": "DEG2-TTP-RX", - "org-openroadm-network-topology:tp-type": "DEGREE-RX-TTP" + "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP" } ], "org-openroadm-network-topology:degree-attributes": { @@ -2606,7 +2606,7 @@ } ] }, - "org-openroadm-network-topology:node-type": "DEGREE", + "org-openroadm-common-network:node-type": "DEGREE", "supporting-node": [ { "network-ref":"openroadm-network", @@ -2619,19 +2619,19 @@ "ietf-network-topology:termination-point": [ { "tp-id": "DEG3-TTP-TX", - "org-openroadm-network-topology:tp-type": "DEGREE-TX-TTP" + "org-openroadm-common-network:tp-type": "DEGREE-TX-TTP" }, { "tp-id": "DEG3-CTP-TX", - "org-openroadm-network-topology:tp-type": "DEGREE-TX-CTP" + "org-openroadm-common-network:tp-type": "DEGREE-TX-CTP" }, { "tp-id": "DEG3-CTP-RX", - "org-openroadm-network-topology:tp-type": "DEGREE-RX-CTP" + "org-openroadm-common-network:tp-type": "DEGREE-RX-CTP" }, { "tp-id": "DEG3-TTP-RX", - "org-openroadm-network-topology:tp-type": "DEGREE-RX-TTP" + "org-openroadm-common-network:tp-type": "DEGREE-RX-TTP" } ], "org-openroadm-network-topology:degree-attributes": { @@ -2669,7 +2669,7 @@ } ] }, - "org-openroadm-network-topology:node-type": "DEGREE", + "org-openroadm-common-network:node-type": "DEGREE", "supporting-node": [ { "network-ref":"openroadm-network", @@ -2685,7 +2685,7 @@ "org-openroadm-network-topology:xpdr-client-attributes": { "tail-equipment-id": "XPDR-NW1-RX" }, - "org-openroadm-network-topology:tp-type": "XPONDER-NETWORK", + "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "org-openroadm-network-topology:xpdr-network-attributes": { "tail-equipment-id": "Client-1" } @@ -2695,7 +2695,7 @@ "org-openroadm-network-topology:xpdr-client-attributes": { "tail-equipment-id": "XPDR-NW5-RX" }, - "org-openroadm-network-topology:tp-type": "XPONDER-NETWORK", + "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "org-openroadm-network-topology:xpdr-network-attributes": { "tail-equipment-id": "Client-5" } @@ -2705,7 +2705,7 @@ "org-openroadm-network-topology:xpdr-client-attributes": { "tail-equipment-id": "XPDR-NW4-RX" }, - "org-openroadm-network-topology:tp-type": "XPONDER-NETWORK", + "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "org-openroadm-network-topology:xpdr-network-attributes": { "tail-equipment-id": "Client-4" } @@ -2715,7 +2715,7 @@ "org-openroadm-network-topology:xpdr-client-attributes": { "tail-equipment-id": "XPDR-NW2-RX" }, - "org-openroadm-network-topology:tp-type": "XPONDER-NETWORK", + "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "org-openroadm-network-topology:xpdr-network-attributes": { "tail-equipment-id": "Client-2" } @@ -2725,7 +2725,7 @@ "org-openroadm-network-topology:xpdr-client-attributes": { "tail-equipment-id": "XPDR-NW1-TX" }, - "org-openroadm-network-topology:tp-type": "XPONDER-NETWORK", + "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "org-openroadm-network-topology:xpdr-network-attributes": { "tail-equipment-id": "Client-1" } @@ -2735,7 +2735,7 @@ "org-openroadm-network-topology:xpdr-client-attributes": { "tail-equipment-id": "XPDR-NW3-RX" }, - "org-openroadm-network-topology:tp-type": "XPONDER-NETWORK", + "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "org-openroadm-network-topology:xpdr-network-attributes": { "tail-equipment-id": "Client-3" } @@ -2745,7 +2745,7 @@ "org-openroadm-network-topology:xpdr-client-attributes": { "tail-equipment-id": "XPDR-NW2-TX" }, - "org-openroadm-network-topology:tp-type": "XPONDER-NETWORK", + "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "org-openroadm-network-topology:xpdr-network-attributes": { "tail-equipment-id": "Client-2" } @@ -2755,7 +2755,7 @@ "org-openroadm-network-topology:xpdr-client-attributes": { "tail-equipment-id": "XPDR-NW5-TX" }, - "org-openroadm-network-topology:tp-type": "XPONDER-NETWORK", + "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "org-openroadm-network-topology:xpdr-network-attributes": { "tail-equipment-id": "Client-5" } @@ -2765,7 +2765,7 @@ "org-openroadm-network-topology:xpdr-client-attributes": { "tail-equipment-id": "XPDR-NW3-TX" }, - "org-openroadm-network-topology:tp-type": "XPONDER-NETWORK", + "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "org-openroadm-network-topology:xpdr-network-attributes": { "tail-equipment-id": "Client-3" } @@ -2775,7 +2775,7 @@ "org-openroadm-network-topology:xpdr-client-attributes": { "tail-equipment-id": "XPDR-NW4-TX" }, - "org-openroadm-network-topology:tp-type": "XPONDER-NETWORK", + "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "org-openroadm-network-topology:xpdr-network-attributes": { "tail-equipment-id": "Client-4" } @@ -2785,38 +2785,38 @@ "org-openroadm-network-topology:xpdr-client-attributes": { "tail-equipment-id": "XPDR-NW4" }, - "org-openroadm-network-topology:tp-type": "XPONDER-CLIENT" + "org-openroadm-common-network:tp-type": "XPONDER-CLIENT" }, { "tp-id": "Client-5", "org-openroadm-network-topology:xpdr-client-attributes": { "tail-equipment-id": "XPDR-NW5" }, - "org-openroadm-network-topology:tp-type": "XPONDER-CLIENT" + "org-openroadm-common-network:tp-type": "XPONDER-CLIENT" }, { "tp-id": "Client-1", "org-openroadm-network-topology:xpdr-client-attributes": { "tail-equipment-id": "XPDR-NW1" }, - "org-openroadm-network-topology:tp-type": "XPONDER-CLIENT" + "org-openroadm-common-network:tp-type": "XPONDER-CLIENT" }, { "tp-id": "Client-2", "org-openroadm-network-topology:xpdr-client-attributes": { "tail-equipment-id": "XPDR-NW2" }, - "org-openroadm-network-topology:tp-type": "XPONDER-CLIENT" + "org-openroadm-common-network:tp-type": "XPONDER-CLIENT" }, { "tp-id": "Client-3", "org-openroadm-network-topology:xpdr-client-attributes": { "tail-equipment-id": "XPDR-NW3" }, - "org-openroadm-network-topology:tp-type": "XPONDER-CLIENT" + "org-openroadm-common-network:tp-type": "XPONDER-CLIENT" } ], - "org-openroadm-network-topology:node-type": "XPONDER", + "org-openroadm-common-network:node-type": "XPONDER", "supporting-node": [ { "network-ref":"openroadm-network", @@ -2832,7 +2832,7 @@ "org-openroadm-network-topology:xpdr-client-attributes": { "tail-equipment-id": "XPDR-NW1-RX" }, - "org-openroadm-network-topology:tp-type": "XPONDER-NETWORK", + "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "org-openroadm-network-topology:xpdr-network-attributes": { "tail-equipment-id": "Client-1" } @@ -2842,7 +2842,7 @@ "org-openroadm-network-topology:xpdr-client-attributes": { "tail-equipment-id": "XPDR-NW5-RX" }, - "org-openroadm-network-topology:tp-type": "XPONDER-NETWORK", + "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "org-openroadm-network-topology:xpdr-network-attributes": { "tail-equipment-id": "Client-5" } @@ -2852,7 +2852,7 @@ "org-openroadm-network-topology:xpdr-client-attributes": { "tail-equipment-id": "XPDR-NW4-RX" }, - "org-openroadm-network-topology:tp-type": "XPONDER-NETWORK", + "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "org-openroadm-network-topology:xpdr-network-attributes": { "tail-equipment-id": "Client-4" } @@ -2862,7 +2862,7 @@ "org-openroadm-network-topology:xpdr-client-attributes": { "tail-equipment-id": "XPDR-NW2-RX" }, - "org-openroadm-network-topology:tp-type": "XPONDER-NETWORK", + "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "org-openroadm-network-topology:xpdr-network-attributes": { "tail-equipment-id": "Client-2" } @@ -2872,7 +2872,7 @@ "org-openroadm-network-topology:xpdr-client-attributes": { "tail-equipment-id": "XPDR-NW1-TX" }, - "org-openroadm-network-topology:tp-type": "XPONDER-NETWORK", + "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "org-openroadm-network-topology:xpdr-network-attributes": { "tail-equipment-id": "Client-1" } @@ -2882,7 +2882,7 @@ "org-openroadm-network-topology:xpdr-client-attributes": { "tail-equipment-id": "XPDR-NW3-RX" }, - "org-openroadm-network-topology:tp-type": "XPONDER-NETWORK", + "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "org-openroadm-network-topology:xpdr-network-attributes": { "tail-equipment-id": "Client-3" } @@ -2892,7 +2892,7 @@ "org-openroadm-network-topology:xpdr-client-attributes": { "tail-equipment-id": "XPDR-NW2-TX" }, - "org-openroadm-network-topology:tp-type": "XPONDER-NETWORK", + "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "org-openroadm-network-topology:xpdr-network-attributes": { "tail-equipment-id": "Client-2" } @@ -2902,7 +2902,7 @@ "org-openroadm-network-topology:xpdr-client-attributes": { "tail-equipment-id": "XPDR-NW5-TX" }, - "org-openroadm-network-topology:tp-type": "XPONDER-NETWORK", + "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "org-openroadm-network-topology:xpdr-network-attributes": { "tail-equipment-id": "Client-5" } @@ -2912,7 +2912,7 @@ "org-openroadm-network-topology:xpdr-client-attributes": { "tail-equipment-id": "XPDR-NW3-TX" }, - "org-openroadm-network-topology:tp-type": "XPONDER-NETWORK", + "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "org-openroadm-network-topology:xpdr-network-attributes": { "tail-equipment-id": "Client-3" } @@ -2922,7 +2922,7 @@ "org-openroadm-network-topology:xpdr-client-attributes": { "tail-equipment-id": "XPDR-NW4-TX" }, - "org-openroadm-network-topology:tp-type": "XPONDER-NETWORK", + "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "org-openroadm-network-topology:xpdr-network-attributes": { "tail-equipment-id": "Client-4" } @@ -2932,38 +2932,38 @@ "org-openroadm-network-topology:xpdr-client-attributes": { "tail-equipment-id": "XPDR-NW4" }, - "org-openroadm-network-topology:tp-type": "XPONDER-CLIENT" + "org-openroadm-common-network:tp-type": "XPONDER-CLIENT" }, { "tp-id": "Client-5", "org-openroadm-network-topology:xpdr-client-attributes": { "tail-equipment-id": "XPDR-NW5" }, - "org-openroadm-network-topology:tp-type": "XPONDER-CLIENT" + "org-openroadm-common-network:tp-type": "XPONDER-CLIENT" }, { "tp-id": "Client-1", "org-openroadm-network-topology:xpdr-client-attributes": { "tail-equipment-id": "XPDR-NW1" }, - "org-openroadm-network-topology:tp-type": "XPONDER-CLIENT" + "org-openroadm-common-network:tp-type": "XPONDER-CLIENT" }, { "tp-id": "Client-2", "org-openroadm-network-topology:xpdr-client-attributes": { "tail-equipment-id": "XPDR-NW2" }, - "org-openroadm-network-topology:tp-type": "XPONDER-CLIENT" + "org-openroadm-common-network:tp-type": "XPONDER-CLIENT" }, { "tp-id": "Client-3", "org-openroadm-network-topology:xpdr-client-attributes": { "tail-equipment-id": "XPDR-NW3" }, - "org-openroadm-network-topology:tp-type": "XPONDER-CLIENT" + "org-openroadm-common-network:tp-type": "XPONDER-CLIENT" } ], - "org-openroadm-network-topology:node-type": "XPONDER", + "org-openroadm-common-network:node-type": "XPONDER", "supporting-node": [ { "network-ref":"openroadm-network", @@ -2979,7 +2979,7 @@ "org-openroadm-network-topology:xpdr-client-attributes": { "tail-equipment-id": "XPDR-NW1-RX" }, - "org-openroadm-network-topology:tp-type": "XPONDER-NETWORK", + "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "org-openroadm-network-topology:xpdr-network-attributes": { "tail-equipment-id": "Client-1" } @@ -2989,7 +2989,7 @@ "org-openroadm-network-topology:xpdr-client-attributes": { "tail-equipment-id": "XPDR-NW5-RX" }, - "org-openroadm-network-topology:tp-type": "XPONDER-NETWORK", + "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "org-openroadm-network-topology:xpdr-network-attributes": { "tail-equipment-id": "Client-5" } @@ -2999,7 +2999,7 @@ "org-openroadm-network-topology:xpdr-client-attributes": { "tail-equipment-id": "XPDR-NW4-RX" }, - "org-openroadm-network-topology:tp-type": "XPONDER-NETWORK", + "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "org-openroadm-network-topology:xpdr-network-attributes": { "tail-equipment-id": "Client-4" } @@ -3009,7 +3009,7 @@ "org-openroadm-network-topology:xpdr-client-attributes": { "tail-equipment-id": "XPDR-NW2-RX" }, - "org-openroadm-network-topology:tp-type": "XPONDER-NETWORK", + "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "org-openroadm-network-topology:xpdr-network-attributes": { "tail-equipment-id": "Client-2" } @@ -3019,7 +3019,7 @@ "org-openroadm-network-topology:xpdr-client-attributes": { "tail-equipment-id": "XPDR-NW1-TX" }, - "org-openroadm-network-topology:tp-type": "XPONDER-NETWORK", + "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "org-openroadm-network-topology:xpdr-network-attributes": { "tail-equipment-id": "Client-1" } @@ -3029,7 +3029,7 @@ "org-openroadm-network-topology:xpdr-client-attributes": { "tail-equipment-id": "XPDR-NW3-RX" }, - "org-openroadm-network-topology:tp-type": "XPONDER-NETWORK", + "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "org-openroadm-network-topology:xpdr-network-attributes": { "tail-equipment-id": "Client-3" } @@ -3039,7 +3039,7 @@ "org-openroadm-network-topology:xpdr-client-attributes": { "tail-equipment-id": "XPDR-NW2-TX" }, - "org-openroadm-network-topology:tp-type": "XPONDER-NETWORK", + "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "org-openroadm-network-topology:xpdr-network-attributes": { "tail-equipment-id": "Client-2" } @@ -3049,7 +3049,7 @@ "org-openroadm-network-topology:xpdr-client-attributes": { "tail-equipment-id": "XPDR-NW5-TX" }, - "org-openroadm-network-topology:tp-type": "XPONDER-NETWORK", + "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "org-openroadm-network-topology:xpdr-network-attributes": { "tail-equipment-id": "Client-5" } @@ -3059,7 +3059,7 @@ "org-openroadm-network-topology:xpdr-client-attributes": { "tail-equipment-id": "XPDR-NW3-TX" }, - "org-openroadm-network-topology:tp-type": "XPONDER-NETWORK", + "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "org-openroadm-network-topology:xpdr-network-attributes": { "tail-equipment-id": "Client-3" } @@ -3069,7 +3069,7 @@ "org-openroadm-network-topology:xpdr-client-attributes": { "tail-equipment-id": "XPDR-NW4-TX" }, - "org-openroadm-network-topology:tp-type": "XPONDER-NETWORK", + "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "org-openroadm-network-topology:xpdr-network-attributes": { "tail-equipment-id": "Client-4" } @@ -3079,38 +3079,38 @@ "org-openroadm-network-topology:xpdr-client-attributes": { "tail-equipment-id": "XPDR-NW4" }, - "org-openroadm-network-topology:tp-type": "XPONDER-CLIENT" + "org-openroadm-common-network:tp-type": "XPONDER-CLIENT" }, { "tp-id": "Client-5", "org-openroadm-network-topology:xpdr-client-attributes": { "tail-equipment-id": "XPDR-NW5" }, - "org-openroadm-network-topology:tp-type": "XPONDER-CLIENT" + "org-openroadm-common-network:tp-type": "XPONDER-CLIENT" }, { "tp-id": "Client-1", "org-openroadm-network-topology:xpdr-client-attributes": { "tail-equipment-id": "XPDR-NW1" }, - "org-openroadm-network-topology:tp-type": "XPONDER-CLIENT" + "org-openroadm-common-network:tp-type": "XPONDER-CLIENT" }, { "tp-id": "Client-2", "org-openroadm-network-topology:xpdr-client-attributes": { "tail-equipment-id": "XPDR-NW2" }, - "org-openroadm-network-topology:tp-type": "XPONDER-CLIENT" + "org-openroadm-common-network:tp-type": "XPONDER-CLIENT" }, { "tp-id": "Client-3", "org-openroadm-network-topology:xpdr-client-attributes": { "tail-equipment-id": "XPDR-NW3" }, - "org-openroadm-network-topology:tp-type": "XPONDER-CLIENT" + "org-openroadm-common-network:tp-type": "XPONDER-CLIENT" } ], - "org-openroadm-network-topology:node-type": "XPONDER", + "org-openroadm-common-network:node-type": "XPONDER", "supporting-node": [ { "network-ref":"openroadm-network", @@ -3126,7 +3126,7 @@ "org-openroadm-network-topology:xpdr-client-attributes": { "tail-equipment-id": "XPDR-NW1-RX" }, - "org-openroadm-network-topology:tp-type": "XPONDER-NETWORK", + "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "org-openroadm-network-topology:xpdr-network-attributes": { "tail-equipment-id": "Client-1" } @@ -3136,7 +3136,7 @@ "org-openroadm-network-topology:xpdr-client-attributes": { "tail-equipment-id": "XPDR-NW5-RX" }, - "org-openroadm-network-topology:tp-type": "XPONDER-NETWORK", + "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "org-openroadm-network-topology:xpdr-network-attributes": { "tail-equipment-id": "Client-5" } @@ -3146,7 +3146,7 @@ "org-openroadm-network-topology:xpdr-client-attributes": { "tail-equipment-id": "XPDR-NW4-RX" }, - "org-openroadm-network-topology:tp-type": "XPONDER-NETWORK", + "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "org-openroadm-network-topology:xpdr-network-attributes": { "tail-equipment-id": "Client-4" } @@ -3156,7 +3156,7 @@ "org-openroadm-network-topology:xpdr-client-attributes": { "tail-equipment-id": "XPDR-NW2-RX" }, - "org-openroadm-network-topology:tp-type": "XPONDER-NETWORK", + "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "org-openroadm-network-topology:xpdr-network-attributes": { "tail-equipment-id": "Client-2" } @@ -3166,7 +3166,7 @@ "org-openroadm-network-topology:xpdr-client-attributes": { "tail-equipment-id": "XPDR-NW1-TX" }, - "org-openroadm-network-topology:tp-type": "XPONDER-NETWORK", + "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "org-openroadm-network-topology:xpdr-network-attributes": { "tail-equipment-id": "Client-1" } @@ -3176,7 +3176,7 @@ "org-openroadm-network-topology:xpdr-client-attributes": { "tail-equipment-id": "XPDR-NW3-RX" }, - "org-openroadm-network-topology:tp-type": "XPONDER-NETWORK", + "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "org-openroadm-network-topology:xpdr-network-attributes": { "tail-equipment-id": "Client-3" } @@ -3186,7 +3186,7 @@ "org-openroadm-network-topology:xpdr-client-attributes": { "tail-equipment-id": "XPDR-NW2-TX" }, - "org-openroadm-network-topology:tp-type": "XPONDER-NETWORK", + "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "org-openroadm-network-topology:xpdr-network-attributes": { "tail-equipment-id": "Client-2" } @@ -3196,7 +3196,7 @@ "org-openroadm-network-topology:xpdr-client-attributes": { "tail-equipment-id": "XPDR-NW5-TX" }, - "org-openroadm-network-topology:tp-type": "XPONDER-NETWORK", + "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "org-openroadm-network-topology:xpdr-network-attributes": { "tail-equipment-id": "Client-5" } @@ -3206,7 +3206,7 @@ "org-openroadm-network-topology:xpdr-client-attributes": { "tail-equipment-id": "XPDR-NW3-TX" }, - "org-openroadm-network-topology:tp-type": "XPONDER-NETWORK", + "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "org-openroadm-network-topology:xpdr-network-attributes": { "tail-equipment-id": "Client-3" } @@ -3216,7 +3216,7 @@ "org-openroadm-network-topology:xpdr-client-attributes": { "tail-equipment-id": "XPDR-NW4-TX" }, - "org-openroadm-network-topology:tp-type": "XPONDER-NETWORK", + "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "org-openroadm-network-topology:xpdr-network-attributes": { "tail-equipment-id": "Client-4" } @@ -3226,38 +3226,38 @@ "org-openroadm-network-topology:xpdr-client-attributes": { "tail-equipment-id": "XPDR-NW4" }, - "org-openroadm-network-topology:tp-type": "XPONDER-CLIENT" + "org-openroadm-common-network:tp-type": "XPONDER-CLIENT" }, { "tp-id": "Client-5", "org-openroadm-network-topology:xpdr-client-attributes": { "tail-equipment-id": "XPDR-NW5" }, - "org-openroadm-network-topology:tp-type": "XPONDER-CLIENT" + "org-openroadm-common-network:tp-type": "XPONDER-CLIENT" }, { "tp-id": "Client-1", "org-openroadm-network-topology:xpdr-client-attributes": { "tail-equipment-id": "XPDR-NW1" }, - "org-openroadm-network-topology:tp-type": "XPONDER-CLIENT" + "org-openroadm-common-network:tp-type": "XPONDER-CLIENT" }, { "tp-id": "Client-2", "org-openroadm-network-topology:xpdr-client-attributes": { "tail-equipment-id": "XPDR-NW2" }, - "org-openroadm-network-topology:tp-type": "XPONDER-CLIENT" + "org-openroadm-common-network:tp-type": "XPONDER-CLIENT" }, { "tp-id": "Client-3", "org-openroadm-network-topology:xpdr-client-attributes": { "tail-equipment-id": "XPDR-NW3" }, - "org-openroadm-network-topology:tp-type": "XPONDER-CLIENT" + "org-openroadm-common-network:tp-type": "XPONDER-CLIENT" } ], - "org-openroadm-network-topology:node-type": "XPONDER", + "org-openroadm-common-network:node-type": "XPONDER", "supporting-node": [ { "network-ref":"openroadm-network", @@ -3273,7 +3273,7 @@ "org-openroadm-network-topology:xpdr-client-attributes": { "tail-equipment-id": "XPDR-NW1-RX" }, - "org-openroadm-network-topology:tp-type": "XPONDER-NETWORK", + "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "org-openroadm-network-topology:xpdr-network-attributes": { "tail-equipment-id": "Client-1" } @@ -3283,7 +3283,7 @@ "org-openroadm-network-topology:xpdr-client-attributes": { "tail-equipment-id": "XPDR-NW5-RX" }, - "org-openroadm-network-topology:tp-type": "XPONDER-NETWORK", + "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "org-openroadm-network-topology:xpdr-network-attributes": { "tail-equipment-id": "Client-5" } @@ -3293,7 +3293,7 @@ "org-openroadm-network-topology:xpdr-client-attributes": { "tail-equipment-id": "XPDR-NW4-RX" }, - "org-openroadm-network-topology:tp-type": "XPONDER-NETWORK", + "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "org-openroadm-network-topology:xpdr-network-attributes": { "tail-equipment-id": "Client-4" } @@ -3303,7 +3303,7 @@ "org-openroadm-network-topology:xpdr-client-attributes": { "tail-equipment-id": "XPDR-NW2-RX" }, - "org-openroadm-network-topology:tp-type": "XPONDER-NETWORK", + "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "org-openroadm-network-topology:xpdr-network-attributes": { "tail-equipment-id": "Client-2" } @@ -3313,7 +3313,7 @@ "org-openroadm-network-topology:xpdr-client-attributes": { "tail-equipment-id": "XPDR-NW1-TX" }, - "org-openroadm-network-topology:tp-type": "XPONDER-NETWORK", + "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "org-openroadm-network-topology:xpdr-network-attributes": { "tail-equipment-id": "Client-1" } @@ -3323,7 +3323,7 @@ "org-openroadm-network-topology:xpdr-client-attributes": { "tail-equipment-id": "XPDR-NW3-RX" }, - "org-openroadm-network-topology:tp-type": "XPONDER-NETWORK", + "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "org-openroadm-network-topology:xpdr-network-attributes": { "tail-equipment-id": "Client-3" } @@ -3333,7 +3333,7 @@ "org-openroadm-network-topology:xpdr-client-attributes": { "tail-equipment-id": "XPDR-NW2-TX" }, - "org-openroadm-network-topology:tp-type": "XPONDER-NETWORK", + "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "org-openroadm-network-topology:xpdr-network-attributes": { "tail-equipment-id": "Client-2" } @@ -3343,7 +3343,7 @@ "org-openroadm-network-topology:xpdr-client-attributes": { "tail-equipment-id": "XPDR-NW5-TX" }, - "org-openroadm-network-topology:tp-type": "XPONDER-NETWORK", + "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "org-openroadm-network-topology:xpdr-network-attributes": { "tail-equipment-id": "Client-5" } @@ -3353,7 +3353,7 @@ "org-openroadm-network-topology:xpdr-client-attributes": { "tail-equipment-id": "XPDR-NW3-TX" }, - "org-openroadm-network-topology:tp-type": "XPONDER-NETWORK", + "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "org-openroadm-network-topology:xpdr-network-attributes": { "tail-equipment-id": "Client-3" } @@ -3363,7 +3363,7 @@ "org-openroadm-network-topology:xpdr-client-attributes": { "tail-equipment-id": "XPDR-NW4-TX" }, - "org-openroadm-network-topology:tp-type": "XPONDER-NETWORK", + "org-openroadm-common-network:tp-type": "XPONDER-NETWORK", "org-openroadm-network-topology:xpdr-network-attributes": { "tail-equipment-id": "Client-4" } @@ -3373,38 +3373,38 @@ "org-openroadm-network-topology:xpdr-client-attributes": { "tail-equipment-id": "XPDR-NW4" }, - "org-openroadm-network-topology:tp-type": "XPONDER-CLIENT" + "org-openroadm-common-network:tp-type": "XPONDER-CLIENT" }, { "tp-id": "Client-5", "org-openroadm-network-topology:xpdr-client-attributes": { "tail-equipment-id": "XPDR-NW5" }, - "org-openroadm-network-topology:tp-type": "XPONDER-CLIENT" + "org-openroadm-common-network:tp-type": "XPONDER-CLIENT" }, { "tp-id": "Client-1", "org-openroadm-network-topology:xpdr-client-attributes": { "tail-equipment-id": "XPDR-NW1" }, - "org-openroadm-network-topology:tp-type": "XPONDER-CLIENT" + "org-openroadm-common-network:tp-type": "XPONDER-CLIENT" }, { "tp-id": "Client-2", "org-openroadm-network-topology:xpdr-client-attributes": { "tail-equipment-id": "XPDR-NW2" }, - "org-openroadm-network-topology:tp-type": "XPONDER-CLIENT" + "org-openroadm-common-network:tp-type": "XPONDER-CLIENT" }, { "tp-id": "Client-3", "org-openroadm-network-topology:xpdr-client-attributes": { "tail-equipment-id": "XPDR-NW3" }, - "org-openroadm-network-topology:tp-type": "XPONDER-CLIENT" + "org-openroadm-common-network:tp-type": "XPONDER-CLIENT" } ], - "org-openroadm-network-topology:node-type": "XPONDER", + "org-openroadm-common-network:node-type": "XPONDER", "supporting-node": [ { "network-ref":"openroadm-network", diff --git a/tests/sample_configs/honeynode-topo.xml b/tests/sample_configs/honeynode-topo.xml index baa3009e1..8798b8b96 100644 --- a/tests/sample_configs/honeynode-topo.xml +++ b/tests/sample_configs/honeynode-topo.xml @@ -11,7 +11,7 @@ ROADMA01-DEG2 DEG2-CTP-TXRX - EXPRESS-LINK + EXPRESS-LINK ROADMC01-SRG1-SRG1-CP-TXRXtoROADMC01-DEG2-DEG2-CTP-TXRX @@ -24,7 +24,7 @@ ROADMC01-SRG1 SRG1-CP-TXRX - ADD-LINK + ADD-LINK ROADMA01-SRG1-SRG1-CP-TXRXtoROADMA01-DEG1-DEG1-CTP-TXRX @@ -37,7 +37,7 @@ ROADMA01-SRG1 SRG1-CP-TXRX - ADD-LINK + ADD-LINK XPDRA01-XPDR1-XPDR1-NETWORK1toROADMA01-SRG1-SRG1-PP1-TXRX @@ -50,7 +50,7 @@ XPDRA01-XPDR1 XPDR1-NETWORK1 - XPONDER-OUTPUT + XPONDER-OUTPUT ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX @@ -63,7 +63,7 @@ ROADMA01-DEG1 DEG1-CTP-TXRX - EXPRESS-LINK + EXPRESS-LINK ROADMC01-DEG2-DEG2-CTP-TXRXtoROADMC01-DEG1-DEG1-CTP-TXRX @@ -76,7 +76,7 @@ ROADMC01-DEG2 DEG2-CTP-TXRX - EXPRESS-LINK + EXPRESS-LINK ROADMC01-DEG1-DEG1-CTP-TXRXtoROADMC01-DEG2-DEG2-CTP-TXRX @@ -89,7 +89,7 @@ ROADMC01-DEG1 DEG1-CTP-TXRX - EXPRESS-LINK + EXPRESS-LINK ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-SRG1-SRG1-CP-TXRX @@ -102,7 +102,7 @@ ROADMA01-DEG1 DEG1-CTP-TXRX - DROP-LINK + DROP-LINK ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-SRG1-SRG1-CP-TXRX @@ -115,7 +115,7 @@ ROADMA01-DEG2 DEG2-CTP-TXRX - DROP-LINK + DROP-LINK ROADMA01-DEG1-DEG1-TTP-TXRXtoROADMC01-DEG2-DEG2-TTP-TXRX @@ -145,7 +145,7 @@ - ROADM-TO-ROADM + ROADM-TO-ROADM 0 @@ -159,7 +159,7 @@ ROADMA01-SRG1 SRG1-PP1-TXRX - XPONDER-INPUT + XPONDER-INPUT ROADMC01-DEG2-DEG2-TTP-TXRXtoROADMA01-DEG1-DEG1-TTP-TXRX @@ -189,7 +189,7 @@ - ROADM-TO-ROADM + ROADM-TO-ROADM 0 @@ -203,7 +203,7 @@ ROADMC01-DEG1 DEG1-CTP-TXRX - DROP-LINK + DROP-LINK ROADMC01-SRG1-SRG1-CP-TXRXtoROADMC01-DEG1-DEG1-CTP-TXRX @@ -216,7 +216,7 @@ ROADMC01-SRG1 SRG1-CP-TXRX - ADD-LINK + ADD-LINK ROADMC01-DEG2-DEG2-CTP-TXRXtoROADMC01-SRG1-SRG1-CP-TXRX @@ -229,7 +229,7 @@ ROADMC01-DEG2 DEG2-CTP-TXRX - DROP-LINK + DROP-LINK ROADMC01-SRG1-SRG1-PP1-TXRXtoXPDRC01-XPDR1-XPDR1-NETWORK1 @@ -242,7 +242,7 @@ ROADMC01-SRG1 SRG1-PP1-TXRX - XPONDER-INPUT + XPONDER-INPUT ROADMA01-SRG1-SRG1-CP-TXRXtoROADMA01-DEG2-DEG2-CTP-TXRX @@ -255,7 +255,7 @@ ROADMA01-SRG1 SRG1-CP-TXRX - ADD-LINK + ADD-LINK XPDRC01-XPDR1-XPDR1-NETWORK1toROADMC01-SRG1-SRG1-PP1-TXRX @@ -268,7 +268,7 @@ XPDRC01-XPDR1 XPDR1-NETWORK1 - XPONDER-OUTPUT + XPONDER-OUTPUT @@ -277,71 +277,71 @@ ROADMC01-SRG1 SRG1-PP12-TXRX - SRG-TXRX-PP + SRG-TXRX-PP SRG1-PP15-TXRX - SRG-TXRX-PP + SRG-TXRX-PP SRG1-PP1-TXRX - SRG-TXRX-PP + SRG-TXRX-PP SRG1-PP2-TXRX - SRG-TXRX-PP + SRG-TXRX-PP SRG1-CP-TXRX - SRG-TXRX-CP + SRG-TXRX-CP SRG1-PP5-TXRX - SRG-TXRX-PP + SRG-TXRX-PP SRG1-PP8-TXRX - SRG-TXRX-PP + SRG-TXRX-PP SRG1-PP6-TXRX - SRG-TXRX-PP + SRG-TXRX-PP SRG1-PP9-TXRX - SRG-TXRX-PP + SRG-TXRX-PP SRG1-PP3-TXRX - SRG-TXRX-PP + SRG-TXRX-PP SRG1-PP10-TXRX - SRG-TXRX-PP + SRG-TXRX-PP SRG1-PP14-TXRX - SRG-TXRX-PP + SRG-TXRX-PP SRG1-PP16-TXRX - SRG-TXRX-PP + SRG-TXRX-PP SRG1-PP7-TXRX - SRG-TXRX-PP + SRG-TXRX-PP SRG1-PP11-TXRX - SRG-TXRX-PP + SRG-TXRX-PP SRG1-PP13-TXRX - SRG-TXRX-PP + SRG-TXRX-PP SRG1-PP4-TXRX - SRG-TXRX-PP + SRG-TXRX-PP openroadm-network @@ -637,23 +637,23 @@ 28 - SRG + SRG ROADMC01-DEG1 DEG1-CTP-TXRX - DEGREE-TXRX-CTP + DEGREE-TXRX-CTP DEG1-TTP-TXRX - DEGREE-TXRX-TTP + DEGREE-TXRX-TTP openroadm-network ROADMC01 - DEGREE + DEGREE 1 @@ -950,17 +950,17 @@ ROADMC01-DEG2 DEG2-TTP-TXRX - DEGREE-TXRX-TTP + DEGREE-TXRX-TTP DEG2-CTP-TXRX - DEGREE-TXRX-CTP + DEGREE-TXRX-CTP openroadm-network ROADMC01 - DEGREE + DEGREE 2 @@ -1257,71 +1257,71 @@ ROADMA01-SRG1 SRG1-PP12-TXRX - SRG-TXRX-PP + SRG-TXRX-PP SRG1-PP15-TXRX - SRG-TXRX-PP + SRG-TXRX-PP SRG1-PP1-TXRX - SRG-TXRX-PP + SRG-TXRX-PP SRG1-PP2-TXRX - SRG-TXRX-PP + SRG-TXRX-PP SRG1-CP-TXRX - SRG-TXRX-CP + SRG-TXRX-CP SRG1-PP5-TXRX - SRG-TXRX-PP + SRG-TXRX-PP SRG1-PP8-TXRX - SRG-TXRX-PP + SRG-TXRX-PP SRG1-PP6-TXRX - SRG-TXRX-PP + SRG-TXRX-PP SRG1-PP9-TXRX - SRG-TXRX-PP + SRG-TXRX-PP SRG1-PP3-TXRX - SRG-TXRX-PP + SRG-TXRX-PP SRG1-PP10-TXRX - SRG-TXRX-PP + SRG-TXRX-PP SRG1-PP14-TXRX - SRG-TXRX-PP + SRG-TXRX-PP SRG1-PP16-TXRX - SRG-TXRX-PP + SRG-TXRX-PP SRG1-PP7-TXRX - SRG-TXRX-PP + SRG-TXRX-PP SRG1-PP11-TXRX - SRG-TXRX-PP + SRG-TXRX-PP SRG1-PP13-TXRX - SRG-TXRX-PP + SRG-TXRX-PP SRG1-PP4-TXRX - SRG-TXRX-PP + SRG-TXRX-PP openroadm-network @@ -1617,13 +1617,13 @@ 28 - SRG + SRG XPDRA01-XPDR1 XPDR1-NETWORK2 - XPONDER-NETWORK + XPONDER-NETWORK XPDR1-NETWORK1 @@ -1633,21 +1633,21 @@ XPDR1-CLIENT2 - XPONDER-CLIENT + XPONDER-CLIENT XPDR1-NETWORK2 XPDR1-CLIENT1 - XPONDER-CLIENT + XPONDER-CLIENT XPDR1-NETWORK1 XPDR1-NETWORK1 - XPONDER-NETWORK + XPONDER-NETWORK XPDR1-NETWORK1 @@ -1659,23 +1659,23 @@ openroadm-network XPDRA01 - XPONDER + XPONDER ROADMA01-DEG2 DEG2-TTP-TXRX - DEGREE-TXRX-TTP + DEGREE-TXRX-TTP DEG2-CTP-TXRX - DEGREE-TXRX-CTP + DEGREE-TXRX-CTP openroadm-network ROADMA01 - DEGREE + DEGREE 2 @@ -1972,7 +1972,7 @@ XPDRC01-XPDR1 XPDR1-NETWORK2 - XPONDER-NETWORK + XPONDER-NETWORK XPDR1-NETWORK1 @@ -1982,21 +1982,21 @@ XPDR1-CLIENT2 - XPONDER-CLIENT + XPONDER-CLIENT XPDR1-NETWORK2 XPDR1-CLIENT1 - XPONDER-CLIENT + XPONDER-CLIENT XPDR1-NETWORK1 XPDR1-NETWORK1 - XPONDER-NETWORK + XPONDER-NETWORK XPDR1-NETWORK1 @@ -2008,23 +2008,23 @@ openroadm-network XPDRC01 - XPONDER + XPONDER ROADMA01-DEG1 DEG1-CTP-TXRX - DEGREE-TXRX-CTP + DEGREE-TXRX-CTP DEG1-TTP-TXRX - DEGREE-TXRX-TTP + DEGREE-TXRX-TTP openroadm-network ROADMA01 - DEGREE + DEGREE 1 diff --git a/tests/transportpce_tests/1.2.1/test_end2end.py b/tests/transportpce_tests/1.2.1/test_end2end.py index ad9580bea..4c4465530 100644 --- a/tests/transportpce_tests/1.2.1/test_end2end.py +++ b/tests/transportpce_tests/1.2.1/test_end2end.py @@ -1040,10 +1040,10 @@ class TransportPCEFulltesting(unittest.TestCase): res = response.json() liste_tp = res['node'][0]['ietf-network-topology:termination-point'] for ele in liste_tp: - if ((ele[u'org-openroadm-network-topology:tp-type'] == 'XPONDER-CLIENT') + if ((ele[u'org-openroadm-common-network:tp-type'] == 'XPONDER-CLIENT') and (ele['tp-id'] == 'XPDR1-CLIENT1' or ele['tp-id'] == 'XPDR1-CLIENT3')): self.assertNotIn('wavelength', dict.keys(ele['org-openroadm-network-topology:xpdr-client-attributes'])) - elif ((ele[u'org-openroadm-network-topology:tp-type'] == 'XPONDER-NETWORK') + elif ((ele[u'org-openroadm-common-network:tp-type'] == 'XPONDER-NETWORK') and (ele['tp-id'] == 'XPDR1-CLIENT1' or ele['tp-id'] == 'XPDR1-CLIENT3')): self.assertNotIn('wavelength', dict.keys(ele['org-openroadm-network-topology:xpdr-network-attributes'])) time.sleep(10) diff --git a/tests/transportpce_tests/1.2.1/test_topology.py b/tests/transportpce_tests/1.2.1/test_topology.py index ac1a5f7e5..e87f078bb 100644 --- a/tests/transportpce_tests/1.2.1/test_topology.py +++ b/tests/transportpce_tests/1.2.1/test_topology.py @@ -133,7 +133,7 @@ class TransportPCETopologyTesting(unittest.TestCase): self.assertEqual(res['network'][0]['node'][0]['node-id'],'ROADMA01') self.assertEqual(res['network'][0]['node'][0]['supporting-node'][0]['network-ref'],'clli-network') self.assertEqual(res['network'][0]['node'][0]['supporting-node'][0]['node-ref'],'NodeA') - self.assertEqual(res['network'][0]['node'][0]['org-openroadm-network:node-type'],'ROADM') + self.assertEqual(res['network'][0]['node'][0]['org-openroadm-common-network:node-type'],'ROADM') self.assertEqual(res['network'][0]['node'][0]['org-openroadm-network:model'],'2') def test_04_getLinks_OpenroadmTopology(self): @@ -154,15 +154,15 @@ class TransportPCETopologyTesting(unittest.TestCase): 'ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-SRG3-SRG3-CP-TXRX','ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-SRG3-SRG3-CP-TXRX'] for i in range(0,nbLink): linkId = res['network'][0]['ietf-network-topology:link'][i]['link-id'] - if (res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-network-topology:link-type']=='EXPRESS-LINK'): + if (res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-common-network:link-type']=='EXPRESS-LINK'): find= linkId in expressLink self.assertEqual(find, True) expressLink.remove(linkId) - elif (res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-network-topology:link-type']=='ADD-LINK'): + elif (res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-common-network:link-type']=='ADD-LINK'): find= linkId in addLink self.assertEqual(find, True) addLink.remove(linkId) - elif (res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-network-topology:link-type']=='DROP-LINK'): + elif (res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-common-network:link-type']=='DROP-LINK'): find= linkId in dropLink self.assertEqual(find, True) dropLink.remove(linkId) @@ -187,40 +187,40 @@ class TransportPCETopologyTesting(unittest.TestCase): for i in range(0,nbNode): self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMA01'}, res['network'][0]['node'][i]['supporting-node']) - nodeType=res['network'][0]['node'][i]['org-openroadm-network-topology:node-type'] + nodeType=res['network'][0]['node'][i]['org-openroadm-common-network:node-type'] nodeId=res['network'][0]['node'][i]['node-id'] if(nodeId=='ROADMA01-SRG1'): #Test related to SRG1 self.assertEqual(nodeType,'SRG') self.assertEqual(len(res['network'][0]['node'][i]['ietf-network-topology:termination-point']),17) - self.assertIn({'tp-id': 'SRG1-CP-TXRX', 'org-openroadm-network-topology:tp-type': 'SRG-TXRX-CP'}, + self.assertIn({'tp-id': 'SRG1-CP-TXRX', 'org-openroadm-common-network:tp-type': 'SRG-TXRX-CP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) - self.assertIn({'tp-id': 'SRG1-PP1-TXRX', 'org-openroadm-network-topology:tp-type': 'SRG-TXRX-PP'}, + self.assertIn({'tp-id': 'SRG1-PP1-TXRX', 'org-openroadm-common-network:tp-type': 'SRG-TXRX-PP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) listNode.remove(nodeId) elif(nodeId=='ROADMA01-SRG3'): #Test related to SRG1 self.assertEqual(nodeType,'SRG') self.assertEqual(len(res['network'][0]['node'][i]['ietf-network-topology:termination-point']),17) - self.assertIn({'tp-id': 'SRG3-CP-TXRX', 'org-openroadm-network-topology:tp-type': 'SRG-TXRX-CP'}, + self.assertIn({'tp-id': 'SRG3-CP-TXRX', 'org-openroadm-common-network:tp-type': 'SRG-TXRX-CP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) - self.assertIn({'tp-id': 'SRG3-PP1-TXRX', 'org-openroadm-network-topology:tp-type': 'SRG-TXRX-PP'}, + self.assertIn({'tp-id': 'SRG3-PP1-TXRX', 'org-openroadm-common-network:tp-type': 'SRG-TXRX-PP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) listNode.remove(nodeId) elif(nodeId=='ROADMA01-DEG1'): #Test related to DEG1 self.assertEqual(nodeType,'DEGREE') - self.assertIn({'tp-id': 'DEG1-TTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-TTP'}, + self.assertIn({'tp-id': 'DEG1-TTP-TXRX', 'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-TTP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) - self.assertIn({'tp-id': 'DEG1-CTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-CTP'}, + self.assertIn({'tp-id': 'DEG1-CTP-TXRX', 'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-CTP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) listNode.remove(nodeId) elif(nodeId=='ROADMA01-DEG2'): #Test related to DEG2 self.assertEqual(nodeType,'DEGREE') - self.assertIn({'tp-id': 'DEG2-TTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-TTP'}, + self.assertIn({'tp-id': 'DEG2-TTP-TXRX', 'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-TTP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) - self.assertIn({'tp-id': 'DEG2-CTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-CTP'}, + self.assertIn({'tp-id': 'DEG2-CTP-TXRX', 'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-CTP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) listNode.remove(nodeId) else: @@ -272,10 +272,10 @@ class TransportPCETopologyTesting(unittest.TestCase): self.assertEqual(res['network'][0]['node'][i]['supporting-node'][0]['node-ref'],'NodeA') nodeId=res['network'][0]['node'][i]['node-id'] if(nodeId=='XPDRA01'): - self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network:node-type'],'XPONDER') + self.assertEqual(res['network'][0]['node'][i]['org-openroadm-common-network:node-type'],'XPONDER') self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network:model'],'1') elif(nodeId=='ROADMA01'): - self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network:node-type'],'ROADM') + self.assertEqual(res['network'][0]['node'][i]['org-openroadm-common-network:node-type'],'ROADM') self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network:model'],'2') else: self.assertFalse(True) @@ -293,7 +293,7 @@ class TransportPCETopologyTesting(unittest.TestCase): self.assertEqual(nbNode,5) listNode=['XPDRA01-XPDR1','ROADMA01-SRG1','ROADMA01-SRG3','ROADMA01-DEG1','ROADMA01-DEG2'] for i in range(0,nbNode): - nodeType=res['network'][0]['node'][i]['org-openroadm-network-topology:node-type'] + nodeType=res['network'][0]['node'][i]['org-openroadm-common-network:node-type'] nodeId=res['network'][0]['node'][i]['node-id'] #Tests related to XPDRA nodes if(nodeId=='XPDRA01-XPDR1'): @@ -304,7 +304,7 @@ class TransportPCETopologyTesting(unittest.TestCase): client = 0 network = 0 for j in range(0,nbTps): - tpType=res['network'][0]['node'][i]['ietf-network-topology:termination-point'][j]['org-openroadm-network-topology:tp-type'] + tpType=res['network'][0]['node'][i]['ietf-network-topology:termination-point'][j]['org-openroadm-common-network:tp-type'] tpId=res['network'][0]['node'][i]['ietf-network-topology:termination-point'][j]['tp-id'] if (tpType=='XPONDER-CLIENT'): client += 1 @@ -321,9 +321,9 @@ class TransportPCETopologyTesting(unittest.TestCase): #Test related to SRG1 self.assertEqual(nodeType,'SRG') self.assertEqual(len(res['network'][0]['node'][i]['ietf-network-topology:termination-point']),17) - self.assertIn({'tp-id': 'SRG1-CP-TXRX', 'org-openroadm-network-topology:tp-type': 'SRG-TXRX-CP'}, + self.assertIn({'tp-id': 'SRG1-CP-TXRX', 'org-openroadm-common-network:tp-type': 'SRG-TXRX-CP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) - self.assertIn({'tp-id': 'SRG1-PP1-TXRX', 'org-openroadm-network-topology:tp-type': 'SRG-TXRX-PP'}, + self.assertIn({'tp-id': 'SRG1-PP1-TXRX', 'org-openroadm-common-network:tp-type': 'SRG-TXRX-PP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMA01'}, res['network'][0]['node'][i]['supporting-node']) @@ -332,9 +332,9 @@ class TransportPCETopologyTesting(unittest.TestCase): #Test related to SRG1 self.assertEqual(nodeType,'SRG') self.assertEqual(len(res['network'][0]['node'][i]['ietf-network-topology:termination-point']),17) - self.assertIn({'tp-id': 'SRG3-CP-TXRX', 'org-openroadm-network-topology:tp-type': 'SRG-TXRX-CP'}, + self.assertIn({'tp-id': 'SRG3-CP-TXRX', 'org-openroadm-common-network:tp-type': 'SRG-TXRX-CP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) - self.assertIn({'tp-id': 'SRG3-PP1-TXRX', 'org-openroadm-network-topology:tp-type': 'SRG-TXRX-PP'}, + self.assertIn({'tp-id': 'SRG3-PP1-TXRX', 'org-openroadm-common-network:tp-type': 'SRG-TXRX-PP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMA01'}, res['network'][0]['node'][i]['supporting-node']) @@ -342,9 +342,9 @@ class TransportPCETopologyTesting(unittest.TestCase): elif(nodeId=='ROADMA01-DEG1'): #Test related to DEG1 self.assertEqual(nodeType,'DEGREE') - self.assertIn({'tp-id': 'DEG1-TTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-TTP'}, + self.assertIn({'tp-id': 'DEG1-TTP-TXRX', 'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-TTP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) - self.assertIn({'tp-id': 'DEG1-CTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-CTP'}, + self.assertIn({'tp-id': 'DEG1-CTP-TXRX', 'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-CTP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMA01'}, res['network'][0]['node'][i]['supporting-node']) @@ -352,9 +352,9 @@ class TransportPCETopologyTesting(unittest.TestCase): elif(nodeId=='ROADMA01-DEG2'): #Test related to DEG2 self.assertEqual(nodeType,'DEGREE') - self.assertIn({'tp-id': 'DEG2-TTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-TTP'}, + self.assertIn({'tp-id': 'DEG2-TTP-TXRX', 'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-TTP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) - self.assertIn({'tp-id': 'DEG2-CTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-CTP'}, + self.assertIn({'tp-id': 'DEG2-CTP-TXRX', 'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-CTP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMA01'}, res['network'][0]['node'][i]['supporting-node']) @@ -427,7 +427,7 @@ class TransportPCETopologyTesting(unittest.TestCase): XPDR_IN=['ROADMA01-SRG1-SRG1-PP1-TXRXtoXPDRA01-XPDR1-XPDR1-NETWORK1'] XPDR_OUT=['XPDRA01-XPDR1-XPDR1-NETWORK1toROADMA01-SRG1-SRG1-PP1-TXRX'] for i in range(0,nbLink): - nodeType=res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-network-topology:link-type'] + nodeType=res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-common-network:link-type'] linkId=res['network'][0]['ietf-network-topology:link'][i]['link-id'] if(nodeType=='EXPRESS-LINK'): find= linkId in expressLink @@ -557,17 +557,17 @@ class TransportPCETopologyTesting(unittest.TestCase): nodeId=res['network'][0]['node'][i]['node-id'] if(nodeId=='XPDRA01'): self.assertEqual(res['network'][0]['node'][i]['supporting-node'][0]['node-ref'],'NodeA') - self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network:node-type'],'XPONDER') + self.assertEqual(res['network'][0]['node'][i]['org-openroadm-common-network:node-type'],'XPONDER') self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network:model'],'1') listNode.remove(nodeId) elif(nodeId=='ROADMA01'): self.assertEqual(res['network'][0]['node'][i]['supporting-node'][0]['node-ref'],'NodeA') - self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network:node-type'],'ROADM') + self.assertEqual(res['network'][0]['node'][i]['org-openroadm-common-network:node-type'],'ROADM') self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network:model'],'2') listNode.remove(nodeId) elif(nodeId=='ROADMC01'): self.assertEqual(res['network'][0]['node'][i]['supporting-node'][0]['node-ref'],'NodeC') - self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network:node-type'],'ROADM') + self.assertEqual(res['network'][0]['node'][i]['org-openroadm-common-network:node-type'],'ROADM') self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network:model'],'2') listNode.remove(nodeId) else: @@ -597,7 +597,7 @@ class TransportPCETopologyTesting(unittest.TestCase): XPDR_IN=['ROADMA01-SRG1-SRG1-PP1-TXRXtoXPDRA01-XPDR1-XPDR1-NETWORK1'] XPDR_OUT=['XPDRA01-XPDR1-XPDR1-NETWORK1toROADMA01-SRG1-SRG1-PP1-TXRX'] for i in range(0,nbLink): - nodeType=res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-network-topology:link-type'] + nodeType=res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-common-network:link-type'] linkId=res['network'][0]['ietf-network-topology:link'][i]['link-id'] if(nodeType=='EXPRESS-LINK'): find= linkId in expressLink @@ -646,7 +646,7 @@ class TransportPCETopologyTesting(unittest.TestCase): R2RLink=['ROADMA01-DEG1-DEG1-TTP-TXRXtoROADMC01-DEG2-DEG2-TTP-TXRX', 'ROADMC01-DEG2-DEG2-TTP-TXRXtoROADMA01-DEG1-DEG1-TTP-TXRX'] for i in range(0,nbLink): - nodeType = res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-network-topology:link-type'] + 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 @@ -676,7 +676,7 @@ class TransportPCETopologyTesting(unittest.TestCase): 'ROADMC01-SRG1','ROADMC01-DEG1','ROADMC01-DEG2'] #************************Tests related to XPDRA nodes for i in range(0,nbNode): - nodeType=res['network'][0]['node'][i]['org-openroadm-network-topology:node-type'] + nodeType=res['network'][0]['node'][i]['org-openroadm-common-network:node-type'] nodeId=res['network'][0]['node'][i]['node-id'] if(nodeId=='XPDRA01-XPDR1'): self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'XPDRA01'}, @@ -687,7 +687,7 @@ class TransportPCETopologyTesting(unittest.TestCase): client = 0 network = 0 for j in range(0,nbTps): - tpType=res['network'][0]['node'][i]['ietf-network-topology:termination-point'][j]['org-openroadm-network-topology:tp-type'] + tpType=res['network'][0]['node'][i]['ietf-network-topology:termination-point'][j]['org-openroadm-common-network:tp-type'] if (tpType=='XPONDER-CLIENT'): client += 1 elif (tpType=='XPONDER-NETWORK'): @@ -698,75 +698,75 @@ class TransportPCETopologyTesting(unittest.TestCase): elif(nodeId=='ROADMA01-SRG1'): #Test related to SRG1 self.assertEqual(len(res['network'][0]['node'][i]['ietf-network-topology:termination-point']),17) - self.assertIn({'tp-id': 'SRG1-CP-TXRX', 'org-openroadm-network-topology:tp-type': 'SRG-TXRX-CP'}, + self.assertIn({'tp-id': 'SRG1-CP-TXRX', 'org-openroadm-common-network:tp-type': 'SRG-TXRX-CP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) - self.assertIn({'tp-id': 'SRG1-PP1-TXRX', 'org-openroadm-network-topology:tp-type': 'SRG-TXRX-PP'}, + self.assertIn({'tp-id': 'SRG1-PP1-TXRX', 'org-openroadm-common-network:tp-type': 'SRG-TXRX-PP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMA01'}, res['network'][0]['node'][i]['supporting-node']) - self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network-topology:node-type'],'SRG') + self.assertEqual(res['network'][0]['node'][i]['org-openroadm-common-network:node-type'],'SRG') listNode.remove(nodeId) elif(nodeId=='ROADMA01-SRG3'): #Test related to SRG1 self.assertEqual(len(res['network'][0]['node'][i]['ietf-network-topology:termination-point']),17) - self.assertIn({'tp-id': 'SRG3-CP-TXRX', 'org-openroadm-network-topology:tp-type': 'SRG-TXRX-CP'}, + self.assertIn({'tp-id': 'SRG3-CP-TXRX', 'org-openroadm-common-network:tp-type': 'SRG-TXRX-CP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) - self.assertIn({'tp-id': 'SRG3-PP1-TXRX', 'org-openroadm-network-topology:tp-type': 'SRG-TXRX-PP'}, + self.assertIn({'tp-id': 'SRG3-PP1-TXRX', 'org-openroadm-common-network:tp-type': 'SRG-TXRX-PP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMA01'}, res['network'][0]['node'][i]['supporting-node']) - self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network-topology:node-type'],'SRG') + self.assertEqual(res['network'][0]['node'][i]['org-openroadm-common-network:node-type'],'SRG') listNode.remove(nodeId) elif(nodeId=='ROADMA01-DEG1'): #Test related to DEG1 - self.assertIn({'tp-id': 'DEG1-TTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-TTP'}, + self.assertIn({'tp-id': 'DEG1-TTP-TXRX', 'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-TTP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) - self.assertIn({'tp-id': 'DEG1-CTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-CTP'}, + self.assertIn({'tp-id': 'DEG1-CTP-TXRX', 'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-CTP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMA01'}, res['network'][0]['node'][i]['supporting-node']) - self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network-topology:node-type'],'DEGREE') + self.assertEqual(res['network'][0]['node'][i]['org-openroadm-common-network:node-type'],'DEGREE') listNode.remove(nodeId) elif(nodeId=='ROADMA01-DEG2'): #Test related to DEG2 - self.assertIn({'tp-id': 'DEG2-TTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-TTP'}, + self.assertIn({'tp-id': 'DEG2-TTP-TXRX', 'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-TTP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) - self.assertIn({'tp-id': 'DEG2-CTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-CTP'}, + self.assertIn({'tp-id': 'DEG2-CTP-TXRX', 'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-CTP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMA01'}, res['network'][0]['node'][i]['supporting-node']) - self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network-topology:node-type'],'DEGREE') + self.assertEqual(res['network'][0]['node'][i]['org-openroadm-common-network:node-type'],'DEGREE') listNode.remove(nodeId) elif(nodeId=='ROADMC01-SRG1'): #Test related to SRG1 self.assertEqual(len(res['network'][0]['node'][i]['ietf-network-topology:termination-point']),17) - self.assertIn({'tp-id': 'SRG1-CP-TXRX', 'org-openroadm-network-topology:tp-type': 'SRG-TXRX-CP'}, + self.assertIn({'tp-id': 'SRG1-CP-TXRX', 'org-openroadm-common-network:tp-type': 'SRG-TXRX-CP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) - self.assertIn({'tp-id': 'SRG1-PP1-TXRX', 'org-openroadm-network-topology:tp-type': 'SRG-TXRX-PP'}, + self.assertIn({'tp-id': 'SRG1-PP1-TXRX', 'org-openroadm-common-network:tp-type': 'SRG-TXRX-PP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMC01'}, res['network'][0]['node'][i]['supporting-node']) - self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network-topology:node-type'],'SRG') + self.assertEqual(res['network'][0]['node'][i]['org-openroadm-common-network:node-type'],'SRG') listNode.remove(nodeId) elif(nodeId=='ROADMC01-DEG1'): #Test related to DEG1 - self.assertIn({'tp-id': 'DEG1-TTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-TTP'}, + self.assertIn({'tp-id': 'DEG1-TTP-TXRX', 'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-TTP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) - self.assertIn({'tp-id': 'DEG1-CTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-CTP'}, + self.assertIn({'tp-id': 'DEG1-CTP-TXRX', 'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-CTP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMC01'}, res['network'][0]['node'][i]['supporting-node']) - self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network-topology:node-type'],'DEGREE') + self.assertEqual(res['network'][0]['node'][i]['org-openroadm-common-network:node-type'],'DEGREE') listNode.remove(nodeId) elif(nodeId=='ROADMC01-DEG2'): #Test related to DEG2 - self.assertIn({'tp-id': 'DEG2-TTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-TTP'}, + self.assertIn({'tp-id': 'DEG2-TTP-TXRX', 'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-TTP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) - self.assertIn({'tp-id': 'DEG2-CTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-CTP'}, + self.assertIn({'tp-id': 'DEG2-CTP-TXRX', 'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-CTP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMC01'}, res['network'][0]['node'][i]['supporting-node']) - self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network-topology:node-type'],'DEGREE') + self.assertEqual(res['network'][0]['node'][i]['org-openroadm-common-network:node-type'],'DEGREE') listNode.remove(nodeId) else: self.assertFalse(True) @@ -913,7 +913,7 @@ class TransportPCETopologyTesting(unittest.TestCase): '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'] for i in range(0,nbLink): - if res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-network-topology:link-type'] == 'ROADM-TO-ROADM': + 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'] find= link_id in listR2RLink self.assertEqual(find, True) @@ -933,7 +933,7 @@ class TransportPCETopologyTesting(unittest.TestCase): self.assertEqual(nbLink,34) for i in range(0,nbLink): link_id=res['network'][0]['ietf-network-topology:link'][i]['link-id'] - link_type=res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-network-topology:link-type'] + link_type=res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-common-network:link-type'] link_src=res['network'][0]['ietf-network-topology:link'][i]['source']['source-node'] link_dest=res['network'][0]['ietf-network-topology:link'][i]['destination']['dest-node'] oppLink_id=res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-common-network:opposite-link'] @@ -947,7 +947,7 @@ class TransportPCETopologyTesting(unittest.TestCase): self.assertEqual(res_oppLink['ietf-network-topology:link'][0]['org-openroadm-common-network:opposite-link'],link_id) self.assertEqual(res_oppLink['ietf-network-topology:link'][0]['source']['source-node'],link_dest) self.assertEqual(res_oppLink['ietf-network-topology:link'][0]['destination']['dest-node'],link_src) - oppLink_type=res_oppLink['ietf-network-topology:link'][0]['org-openroadm-network-topology:link-type'] + oppLink_type=res_oppLink['ietf-network-topology:link'][0]['org-openroadm-common-network:link-type'] if link_type=='ADD-LINK': self.assertEqual(oppLink_type, 'DROP-LINK') elif link_type=='DROP-LINK': @@ -978,7 +978,7 @@ class TransportPCETopologyTesting(unittest.TestCase): 'ROADMB-DEG1-DEG1-TTP-TXRXtoROADMA01-DEG2-DEG2-TTP-TXRX', 'ROADMB-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-network-topology:link-type'] + 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 @@ -1047,7 +1047,7 @@ class TransportPCETopologyTesting(unittest.TestCase): self.assertEqual(nbNode,5) listNode=['XPDRA01-XPDR1','ROADMA01-SRG1', 'ROADMA01-SRG3','ROADMA01-DEG1','ROADMA01-DEG2'] for i in range(0,nbNode): - nodeType=res['network'][0]['node'][i]['org-openroadm-network-topology:node-type'] + nodeType=res['network'][0]['node'][i]['org-openroadm-common-network:node-type'] nodeId=res['network'][0]['node'][i]['node-id'] #Tests related to XPDRA nodes if(nodeId=='XPDRA01-XPDR1'): @@ -1056,7 +1056,7 @@ class TransportPCETopologyTesting(unittest.TestCase): tpid = res['network'][0]['node'][i]['ietf-network-topology:termination-point'][j]['tp-id'] if (tpid == 'XPDR1-CLIENT1'): self.assertEqual(res['network'][0]['node'][i]['ietf-network-topology:termination-point'][j] - ['org-openroadm-network-topology:tp-type'], 'XPONDER-CLIENT') + ['org-openroadm-common-network:tp-type'], 'XPONDER-CLIENT') self.assertEqual(res['network'][0]['node'][i]['ietf-network-topology:termination-point'][j] ['org-openroadm-network-topology:xpdr-client-attributes']['tail-equipment-id'], 'XPDR1-NETWORK1') @@ -1067,9 +1067,9 @@ class TransportPCETopologyTesting(unittest.TestCase): #Test related to SRG1 self.assertEqual(nodeType,'SRG') self.assertEqual(len(res['network'][0]['node'][i]['ietf-network-topology:termination-point']),17) - self.assertIn({'tp-id': 'SRG1-CP-TXRX', 'org-openroadm-network-topology:tp-type': 'SRG-TXRX-CP'}, + self.assertIn({'tp-id': 'SRG1-CP-TXRX', 'org-openroadm-common-network:tp-type': 'SRG-TXRX-CP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) - self.assertIn({'tp-id': 'SRG1-PP1-TXRX', 'org-openroadm-network-topology:tp-type': 'SRG-TXRX-PP'}, + self.assertIn({'tp-id': 'SRG1-PP1-TXRX', 'org-openroadm-common-network:tp-type': 'SRG-TXRX-PP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMA01'}, res['network'][0]['node'][i]['supporting-node']) @@ -1078,9 +1078,9 @@ class TransportPCETopologyTesting(unittest.TestCase): #Test related to SRG1 self.assertEqual(nodeType,'SRG') self.assertEqual(len(res['network'][0]['node'][i]['ietf-network-topology:termination-point']),17) - self.assertIn({'tp-id': 'SRG3-CP-TXRX', 'org-openroadm-network-topology:tp-type': 'SRG-TXRX-CP'}, + self.assertIn({'tp-id': 'SRG3-CP-TXRX', 'org-openroadm-common-network:tp-type': 'SRG-TXRX-CP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) - self.assertIn({'tp-id': 'SRG3-PP1-TXRX', 'org-openroadm-network-topology:tp-type': 'SRG-TXRX-PP'}, + self.assertIn({'tp-id': 'SRG3-PP1-TXRX', 'org-openroadm-common-network:tp-type': 'SRG-TXRX-PP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMA01'}, res['network'][0]['node'][i]['supporting-node']) @@ -1088,9 +1088,9 @@ class TransportPCETopologyTesting(unittest.TestCase): elif(nodeId=='ROADMA01-DEG1'): #Test related to DEG1 self.assertEqual(nodeType,'DEGREE') - self.assertIn({'tp-id': 'DEG1-TTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-TTP'}, + self.assertIn({'tp-id': 'DEG1-TTP-TXRX', 'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-TTP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) - self.assertIn({'tp-id': 'DEG1-CTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-CTP'}, + self.assertIn({'tp-id': 'DEG1-CTP-TXRX', 'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-CTP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMA01'}, res['network'][0]['node'][i]['supporting-node']) @@ -1098,9 +1098,9 @@ class TransportPCETopologyTesting(unittest.TestCase): elif(nodeId=='ROADMA01-DEG2'): #Test related to DEG2 self.assertEqual(nodeType,'DEGREE') - self.assertIn({'tp-id': 'DEG2-TTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-TTP'}, + self.assertIn({'tp-id': 'DEG2-TTP-TXRX', 'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-TTP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) - self.assertIn({'tp-id': 'DEG2-CTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-CTP'}, + self.assertIn({'tp-id': 'DEG2-CTP-TXRX', 'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-CTP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMA01'}, res['network'][0]['node'][i]['supporting-node']) @@ -1192,40 +1192,40 @@ class TransportPCETopologyTesting(unittest.TestCase): for i in range(0,nbNode): self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADMA01'}, res['network'][0]['node'][i]['supporting-node']) - nodeType=res['network'][0]['node'][i]['org-openroadm-network-topology:node-type'] + nodeType=res['network'][0]['node'][i]['org-openroadm-common-network:node-type'] nodeId=res['network'][0]['node'][i]['node-id'] if(nodeId=='ROADMA01-SRG1'): #Test related to SRG1 self.assertEqual(nodeType,'SRG') self.assertEqual(len(res['network'][0]['node'][i]['ietf-network-topology:termination-point']),17) - self.assertIn({'tp-id': 'SRG1-CP-TXRX', 'org-openroadm-network-topology:tp-type': 'SRG-TXRX-CP'}, + self.assertIn({'tp-id': 'SRG1-CP-TXRX', 'org-openroadm-common-network:tp-type': 'SRG-TXRX-CP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) - self.assertIn({'tp-id': 'SRG1-PP1-TXRX', 'org-openroadm-network-topology:tp-type': 'SRG-TXRX-PP'}, + self.assertIn({'tp-id': 'SRG1-PP1-TXRX', 'org-openroadm-common-network:tp-type': 'SRG-TXRX-PP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) listNode.remove(nodeId) elif(nodeId=='ROADMA01-SRG3'): #Test related to SRG1 self.assertEqual(nodeType,'SRG') self.assertEqual(len(res['network'][0]['node'][i]['ietf-network-topology:termination-point']),17) - self.assertIn({'tp-id': 'SRG3-CP-TXRX', 'org-openroadm-network-topology:tp-type': 'SRG-TXRX-CP'}, + self.assertIn({'tp-id': 'SRG3-CP-TXRX', 'org-openroadm-common-network:tp-type': 'SRG-TXRX-CP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) - self.assertIn({'tp-id': 'SRG3-PP1-TXRX', 'org-openroadm-network-topology:tp-type': 'SRG-TXRX-PP'}, + self.assertIn({'tp-id': 'SRG3-PP1-TXRX', 'org-openroadm-common-network:tp-type': 'SRG-TXRX-PP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) listNode.remove(nodeId) elif(nodeId=='ROADMA01-DEG1'): #Test related to DEG1 self.assertEqual(nodeType,'DEGREE') - self.assertIn({'tp-id': 'DEG1-TTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-TTP'}, + self.assertIn({'tp-id': 'DEG1-TTP-TXRX', 'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-TTP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) - self.assertIn({'tp-id': 'DEG1-CTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-CTP'}, + self.assertIn({'tp-id': 'DEG1-CTP-TXRX', 'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-CTP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) listNode.remove(nodeId) elif(nodeId=='ROADMA01-DEG2'): #Test related to DEG2 self.assertEqual(nodeType,'DEGREE') - self.assertIn({'tp-id': 'DEG2-TTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-TTP'}, + self.assertIn({'tp-id': 'DEG2-TTP-TXRX', 'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-TTP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) - self.assertIn({'tp-id': 'DEG2-CTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-CTP'}, + self.assertIn({'tp-id': 'DEG2-CTP-TXRX', 'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-CTP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) listNode.remove(nodeId) else: @@ -1271,17 +1271,17 @@ class TransportPCETopologyTesting(unittest.TestCase): 'ROADMA01-DEG1-DEG1-CTP-TXRXtoROADMA01-SRG3-SRG3-CP-TXRX','ROADMA01-DEG2-DEG2-CTP-TXRXtoROADMA01-SRG3-SRG3-CP-TXRX'] roadmtoroadmLink = 0 for i in range(0,nbLink): - if (res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-network-topology:link-type']=='EXPRESS-LINK'): + if (res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-common-network:link-type']=='EXPRESS-LINK'): link_id = res['network'][0]['ietf-network-topology:link'][i]['link-id'] find= link_id in expressLink self.assertEqual(find, True) expressLink.remove(link_id) - elif (res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-network-topology:link-type']=='ADD-LINK'): + elif (res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-common-network:link-type']=='ADD-LINK'): link_id = res['network'][0]['ietf-network-topology:link'][i]['link-id'] find= link_id in addLink self.assertEqual(find, True) addLink.remove(link_id) - elif (res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-network-topology:link-type']=='DROP-LINK'): + elif (res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-common-network:link-type']=='DROP-LINK'): link_id = res['network'][0]['ietf-network-topology:link'][i]['link-id'] find= link_id in dropLink self.assertEqual(find, True) @@ -1293,8 +1293,8 @@ class TransportPCETopologyTesting(unittest.TestCase): self.assertEqual(len(dropLink),0) self.assertEqual(roadmtoroadmLink, 6) for i in range(0,nbLink): - self.assertNotEqual(res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-network-topology:link-type'],'XPONDER-OUTPUT') - self.assertNotEqual(res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-network-topology:link-type'],'XPONDER-INPUT') + 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_41_disconnect_ROADMA(self): url = ("{}/config/network-topology:" diff --git a/tests/transportpce_tests/2.2.1/test_end2end.py b/tests/transportpce_tests/2.2.1/test_end2end.py index 5939a3257..10d66d0de 100644 --- a/tests/transportpce_tests/2.2.1/test_end2end.py +++ b/tests/transportpce_tests/2.2.1/test_end2end.py @@ -1051,9 +1051,9 @@ class TransportPCEFulltesting(unittest.TestCase): res = response.json() liste_tp = res['node'][0]['ietf-network-topology:termination-point'] for ele in liste_tp: - if ele[u'org-openroadm-network-topology:tp-type'] == 'XPONDER-CLIENT': + if ele[u'org-openroadm-common-network:tp-type'] == 'XPONDER-CLIENT': self.assertNotIn('wavelength', dict.keys(ele['org-openroadm-network-topology:xpdr-client-attributes'])) - elif ele[u'org-openroadm-network-topology:tp-type'] == 'XPONDER-NETWORK': + elif ele[u'org-openroadm-common-network:tp-type'] == 'XPONDER-NETWORK': self.assertNotIn('wavelength', dict.keys(ele['org-openroadm-network-topology:xpdr-network-attributes'])) time.sleep(10) diff --git a/tests/transportpce_tests/2.2.1/test_otn_topology.py b/tests/transportpce_tests/2.2.1/test_otn_topology.py index 4c1fb6e69..6a7489634 100644 --- a/tests/transportpce_tests/2.2.1/test_otn_topology.py +++ b/tests/transportpce_tests/2.2.1/test_otn_topology.py @@ -107,7 +107,7 @@ class TransportPCEtesting(unittest.TestCase): self.assertEqual(res['network'][0]['node'][0]['node-id'], 'SPDR-SA1') self.assertEqual(res['network'][0]['node'][0]['supporting-node'][0]['network-ref'], 'clli-network') self.assertEqual(res['network'][0]['node'][0]['supporting-node'][0]['node-ref'], 'NodeSA') - self.assertEqual(res['network'][0]['node'][0]['org-openroadm-network:node-type'], 'XPONDER') + self.assertEqual(res['network'][0]['node'][0]['org-openroadm-common-network:node-type'], 'XPONDER') self.assertEqual(res['network'][0]['node'][0]['org-openroadm-network:model'], 'universal-switchponder') self.assertEqual(res['network'][0]['node'][0]['org-openroadm-network:vendor'], 'vendorA') self.assertEqual(res['network'][0]['node'][0]['org-openroadm-network:ip'], '1.2.3.4') diff --git a/tests/transportpce_tests/2.2.1/test_topology.py b/tests/transportpce_tests/2.2.1/test_topology.py index 115f30ea7..b5ae52b2b 100644 --- a/tests/transportpce_tests/2.2.1/test_topology.py +++ b/tests/transportpce_tests/2.2.1/test_topology.py @@ -133,7 +133,7 @@ class TransportPCEtesting(unittest.TestCase): self.assertEqual(res['network'][0]['node'][0]['node-id'],'ROADM-A1') self.assertEqual(res['network'][0]['node'][0]['supporting-node'][0]['network-ref'],'clli-network') self.assertEqual(res['network'][0]['node'][0]['supporting-node'][0]['node-ref'],'NodeA') - self.assertEqual(res['network'][0]['node'][0]['org-openroadm-network:node-type'],'ROADM') + self.assertEqual(res['network'][0]['node'][0]['org-openroadm-common-network:node-type'],'ROADM') self.assertEqual(res['network'][0]['node'][0]['org-openroadm-network:model'],'model2') def test_04_getLinks_OpenroadmTopology(self): @@ -159,15 +159,15 @@ class TransportPCEtesting(unittest.TestCase): 'ROADM-A1-DEG2-DEG2-CTP-TXRXtoROADM-A1-SRG3-SRG3-CP-TXRX'] for i in range(0,nbLink): linkId = res['network'][0]['ietf-network-topology:link'][i]['link-id'] - if (res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-network-topology:link-type']=='EXPRESS-LINK'): + if (res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-common-network:link-type']=='EXPRESS-LINK'): find= linkId in expressLink self.assertEqual(find, True) expressLink.remove(linkId) - elif (res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-network-topology:link-type']=='ADD-LINK'): + elif (res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-common-network:link-type']=='ADD-LINK'): find= linkId in addLink self.assertEqual(find, True) addLink.remove(linkId) - elif (res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-network-topology:link-type']=='DROP-LINK'): + elif (res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-common-network:link-type']=='DROP-LINK'): find= linkId in dropLink self.assertEqual(find, True) dropLink.remove(linkId) @@ -192,40 +192,40 @@ class TransportPCEtesting(unittest.TestCase): for i in range(0,nbNode): self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADM-A1'}, res['network'][0]['node'][i]['supporting-node']) - nodeType=res['network'][0]['node'][i]['org-openroadm-network-topology:node-type'] + nodeType=res['network'][0]['node'][i]['org-openroadm-common-network:node-type'] nodeId=res['network'][0]['node'][i]['node-id'] if(nodeId=='ROADM-A1-SRG1'): #Test related to SRG1 self.assertEqual(nodeType,'SRG') self.assertEqual(len(res['network'][0]['node'][i]['ietf-network-topology:termination-point']),5) - self.assertIn({'tp-id': 'SRG1-CP-TXRX', 'org-openroadm-network-topology:tp-type': 'SRG-TXRX-CP'}, + self.assertIn({'tp-id': 'SRG1-CP-TXRX', 'org-openroadm-common-network:tp-type': 'SRG-TXRX-CP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) - self.assertIn({'tp-id': 'SRG1-PP1-TXRX', 'org-openroadm-network-topology:tp-type': 'SRG-TXRX-PP'}, + self.assertIn({'tp-id': 'SRG1-PP1-TXRX', 'org-openroadm-common-network:tp-type': 'SRG-TXRX-PP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) listNode.remove(nodeId) elif(nodeId=='ROADM-A1-SRG3'): #Test related to SRG1 self.assertEqual(nodeType,'SRG') self.assertEqual(len(res['network'][0]['node'][i]['ietf-network-topology:termination-point']),5) - self.assertIn({'tp-id': 'SRG3-CP-TXRX', 'org-openroadm-network-topology:tp-type': 'SRG-TXRX-CP'}, + self.assertIn({'tp-id': 'SRG3-CP-TXRX', 'org-openroadm-common-network:tp-type': 'SRG-TXRX-CP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) - self.assertIn({'tp-id': 'SRG3-PP1-TXRX', 'org-openroadm-network-topology:tp-type': 'SRG-TXRX-PP'}, + self.assertIn({'tp-id': 'SRG3-PP1-TXRX', 'org-openroadm-common-network:tp-type': 'SRG-TXRX-PP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) listNode.remove(nodeId) elif(nodeId=='ROADM-A1-DEG1'): #Test related to DEG1 self.assertEqual(nodeType,'DEGREE') - self.assertIn({'tp-id': 'DEG1-TTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-TTP'}, + self.assertIn({'tp-id': 'DEG1-TTP-TXRX', 'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-TTP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) - self.assertIn({'tp-id': 'DEG1-CTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-CTP'}, + self.assertIn({'tp-id': 'DEG1-CTP-TXRX', 'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-CTP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) listNode.remove(nodeId) elif(nodeId=='ROADM-A1-DEG2'): #Test related to DEG2 self.assertEqual(nodeType,'DEGREE') - self.assertIn({'tp-id': 'DEG2-TTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-TTP'}, + self.assertIn({'tp-id': 'DEG2-TTP-TXRX', 'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-TTP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) - self.assertIn({'tp-id': 'DEG2-CTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-CTP'}, + self.assertIn({'tp-id': 'DEG2-CTP-TXRX', 'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-CTP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) listNode.remove(nodeId) else: @@ -277,10 +277,10 @@ class TransportPCEtesting(unittest.TestCase): self.assertEqual(res['network'][0]['node'][i]['supporting-node'][0]['node-ref'],'NodeA') nodeId=res['network'][0]['node'][i]['node-id'] if(nodeId=='XPDR-A1'): - self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network:node-type'],'XPONDER') + self.assertEqual(res['network'][0]['node'][i]['org-openroadm-common-network:node-type'],'XPONDER') self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network:model'],'model2') elif(nodeId=='ROADM-A1'): - self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network:node-type'],'ROADM') + self.assertEqual(res['network'][0]['node'][i]['org-openroadm-common-network:node-type'],'ROADM') self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network:model'],'model2') else: self.assertFalse(True) @@ -298,7 +298,7 @@ class TransportPCEtesting(unittest.TestCase): self.assertEqual(nbNode,5) listNode=['XPDR-A1-XPDR1','ROADM-A1-SRG1','ROADM-A1-SRG3','ROADM-A1-DEG1','ROADM-A1-DEG2'] for i in range(0,nbNode): - nodeType=res['network'][0]['node'][i]['org-openroadm-network-topology:node-type'] + nodeType=res['network'][0]['node'][i]['org-openroadm-common-network:node-type'] nodeId=res['network'][0]['node'][i]['node-id'] #Tests related to XPDRA nodes if(nodeId=='XPDR-A1-XPDR1'): @@ -309,7 +309,7 @@ class TransportPCEtesting(unittest.TestCase): client = 0 network = 0 for j in range(0,nbTps): - tpType=res['network'][0]['node'][i]['ietf-network-topology:termination-point'][j]['org-openroadm-network-topology:tp-type'] + tpType=res['network'][0]['node'][i]['ietf-network-topology:termination-point'][j]['org-openroadm-common-network:tp-type'] tpId=res['network'][0]['node'][i]['ietf-network-topology:termination-point'][j]['tp-id'] if (tpType=='XPONDER-CLIENT'): client += 1 @@ -329,9 +329,9 @@ class TransportPCEtesting(unittest.TestCase): #Test related to SRG1 self.assertEqual(nodeType,'SRG') self.assertEqual(len(res['network'][0]['node'][i]['ietf-network-topology:termination-point']),5) - self.assertIn({'tp-id': 'SRG1-CP-TXRX', 'org-openroadm-network-topology:tp-type': 'SRG-TXRX-CP'}, + self.assertIn({'tp-id': 'SRG1-CP-TXRX', 'org-openroadm-common-network:tp-type': 'SRG-TXRX-CP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) - self.assertIn({'tp-id': 'SRG1-PP1-TXRX', 'org-openroadm-network-topology:tp-type': 'SRG-TXRX-PP'}, + self.assertIn({'tp-id': 'SRG1-PP1-TXRX', 'org-openroadm-common-network:tp-type': 'SRG-TXRX-PP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADM-A1'}, res['network'][0]['node'][i]['supporting-node']) @@ -340,9 +340,9 @@ class TransportPCEtesting(unittest.TestCase): #Test related to SRG1 self.assertEqual(nodeType,'SRG') self.assertEqual(len(res['network'][0]['node'][i]['ietf-network-topology:termination-point']),5) - self.assertIn({'tp-id': 'SRG3-CP-TXRX', 'org-openroadm-network-topology:tp-type': 'SRG-TXRX-CP'}, + self.assertIn({'tp-id': 'SRG3-CP-TXRX', 'org-openroadm-common-network:tp-type': 'SRG-TXRX-CP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) - self.assertIn({'tp-id': 'SRG3-PP1-TXRX', 'org-openroadm-network-topology:tp-type': 'SRG-TXRX-PP'}, + self.assertIn({'tp-id': 'SRG3-PP1-TXRX', 'org-openroadm-common-network:tp-type': 'SRG-TXRX-PP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADM-A1'}, res['network'][0]['node'][i]['supporting-node']) @@ -350,9 +350,9 @@ class TransportPCEtesting(unittest.TestCase): elif(nodeId=='ROADM-A1-DEG1'): #Test related to DEG1 self.assertEqual(nodeType,'DEGREE') - self.assertIn({'tp-id': 'DEG1-TTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-TTP'}, + self.assertIn({'tp-id': 'DEG1-TTP-TXRX', 'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-TTP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) - self.assertIn({'tp-id': 'DEG1-CTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-CTP'}, + self.assertIn({'tp-id': 'DEG1-CTP-TXRX', 'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-CTP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADM-A1'}, res['network'][0]['node'][i]['supporting-node']) @@ -360,9 +360,9 @@ class TransportPCEtesting(unittest.TestCase): elif(nodeId=='ROADM-A1-DEG2'): #Test related to DEG2 self.assertEqual(nodeType,'DEGREE') - self.assertIn({'tp-id': 'DEG2-TTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-TTP'}, + self.assertIn({'tp-id': 'DEG2-TTP-TXRX', 'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-TTP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) - self.assertIn({'tp-id': 'DEG2-CTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-CTP'}, + self.assertIn({'tp-id': 'DEG2-CTP-TXRX', 'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-CTP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADM-A1'}, res['network'][0]['node'][i]['supporting-node']) @@ -435,7 +435,7 @@ class TransportPCEtesting(unittest.TestCase): XPDR_IN=['ROADM-A1-SRG1-SRG1-PP1-TXRXtoXPDR-A1-XPDR1-XPDR1-NETWORK1'] XPDR_OUT=['XPDR-A1-XPDR1-XPDR1-NETWORK1toROADM-A1-SRG1-SRG1-PP1-TXRX'] for i in range(0,nbLink): - nodeType=res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-network-topology:link-type'] + nodeType=res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-common-network:link-type'] linkId=res['network'][0]['ietf-network-topology:link'][i]['link-id'] if(nodeType=='EXPRESS-LINK'): find= linkId in expressLink @@ -523,17 +523,17 @@ class TransportPCEtesting(unittest.TestCase): nodeId=res['network'][0]['node'][i]['node-id'] if(nodeId=='XPDR-A1'): self.assertEqual(res['network'][0]['node'][i]['supporting-node'][0]['node-ref'],'NodeA') - self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network:node-type'],'XPONDER') + self.assertEqual(res['network'][0]['node'][i]['org-openroadm-common-network:node-type'],'XPONDER') self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network:model'],'model2') listNode.remove(nodeId) elif(nodeId=='ROADM-A1'): self.assertEqual(res['network'][0]['node'][i]['supporting-node'][0]['node-ref'],'NodeA') - self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network:node-type'],'ROADM') + self.assertEqual(res['network'][0]['node'][i]['org-openroadm-common-network:node-type'],'ROADM') self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network:model'],'model2') listNode.remove(nodeId) elif(nodeId=='ROADM-C1'): self.assertEqual(res['network'][0]['node'][i]['supporting-node'][0]['node-ref'],'NodeC') - self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network:node-type'],'ROADM') + self.assertEqual(res['network'][0]['node'][i]['org-openroadm-common-network:node-type'],'ROADM') self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network:model'],'model2') listNode.remove(nodeId) else: @@ -563,7 +563,7 @@ class TransportPCEtesting(unittest.TestCase): XPDR_IN=['ROADM-A1-SRG1-SRG1-PP1-TXRXtoXPDR-A1-XPDR1-XPDR1-NETWORK1'] XPDR_OUT=['XPDR-A1-XPDR1-XPDR1-NETWORK1toROADM-A1-SRG1-SRG1-PP1-TXRX'] for i in range(0,nbLink): - nodeType=res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-network-topology:link-type'] + nodeType=res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-common-network:link-type'] linkId=res['network'][0]['ietf-network-topology:link'][i]['link-id'] if(nodeType=='EXPRESS-LINK'): find= linkId in expressLink @@ -614,7 +614,7 @@ class TransportPCEtesting(unittest.TestCase): 'ROADM-C1-SRG1','ROADM-C1-DEG1', 'ROADM-C1-DEG2'] #************************Tests related to XPDRA nodes for i in range(0,nbNode): - nodeType=res['network'][0]['node'][i]['org-openroadm-network-topology:node-type'] + nodeType=res['network'][0]['node'][i]['org-openroadm-common-network:node-type'] nodeId=res['network'][0]['node'][i]['node-id'] if(nodeId=='XPDR-A1-XPDR1'): self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'XPDR-A1'}, @@ -625,7 +625,7 @@ class TransportPCEtesting(unittest.TestCase): client = 0 network = 0 for j in range(0,nbTps): - tpType=res['network'][0]['node'][i]['ietf-network-topology:termination-point'][j]['org-openroadm-network-topology:tp-type'] + tpType=res['network'][0]['node'][i]['ietf-network-topology:termination-point'][j]['org-openroadm-common-network:tp-type'] if (tpType=='XPONDER-CLIENT'): client += 1 elif (tpType=='XPONDER-NETWORK'): @@ -636,75 +636,75 @@ class TransportPCEtesting(unittest.TestCase): elif(nodeId=='ROADM-A1-SRG1'): #Test related to SRG1 self.assertEqual(len(res['network'][0]['node'][i]['ietf-network-topology:termination-point']),5) - self.assertIn({'tp-id': 'SRG1-CP-TXRX', 'org-openroadm-network-topology:tp-type': 'SRG-TXRX-CP'}, + self.assertIn({'tp-id': 'SRG1-CP-TXRX', 'org-openroadm-common-network:tp-type': 'SRG-TXRX-CP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) - self.assertIn({'tp-id': 'SRG1-PP1-TXRX', 'org-openroadm-network-topology:tp-type': 'SRG-TXRX-PP'}, + self.assertIn({'tp-id': 'SRG1-PP1-TXRX', 'org-openroadm-common-network:tp-type': 'SRG-TXRX-PP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADM-A1'}, res['network'][0]['node'][i]['supporting-node']) - self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network-topology:node-type'],'SRG') + self.assertEqual(res['network'][0]['node'][i]['org-openroadm-common-network:node-type'],'SRG') listNode.remove(nodeId) elif(nodeId=='ROADM-A1-SRG3'): #Test related to SRG1 self.assertEqual(len(res['network'][0]['node'][i]['ietf-network-topology:termination-point']),5) - self.assertIn({'tp-id': 'SRG3-CP-TXRX', 'org-openroadm-network-topology:tp-type': 'SRG-TXRX-CP'}, + self.assertIn({'tp-id': 'SRG3-CP-TXRX', 'org-openroadm-common-network:tp-type': 'SRG-TXRX-CP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) - self.assertIn({'tp-id': 'SRG3-PP1-TXRX', 'org-openroadm-network-topology:tp-type': 'SRG-TXRX-PP'}, + self.assertIn({'tp-id': 'SRG3-PP1-TXRX', 'org-openroadm-common-network:tp-type': 'SRG-TXRX-PP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADM-A1'}, res['network'][0]['node'][i]['supporting-node']) - self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network-topology:node-type'],'SRG') + self.assertEqual(res['network'][0]['node'][i]['org-openroadm-common-network:node-type'],'SRG') listNode.remove(nodeId) elif(nodeId=='ROADM-A1-DEG1'): #Test related to DEG1 - self.assertIn({'tp-id': 'DEG1-TTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-TTP'}, + self.assertIn({'tp-id': 'DEG1-TTP-TXRX', 'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-TTP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) - self.assertIn({'tp-id': 'DEG1-CTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-CTP'}, + self.assertIn({'tp-id': 'DEG1-CTP-TXRX', 'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-CTP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADM-A1'}, res['network'][0]['node'][i]['supporting-node']) - self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network-topology:node-type'],'DEGREE') + self.assertEqual(res['network'][0]['node'][i]['org-openroadm-common-network:node-type'],'DEGREE') listNode.remove(nodeId) elif(nodeId=='ROADM-A1-DEG2'): #Test related to DEG2 - self.assertIn({'tp-id': 'DEG2-TTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-TTP'}, + self.assertIn({'tp-id': 'DEG2-TTP-TXRX', 'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-TTP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) - self.assertIn({'tp-id': 'DEG2-CTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-CTP'}, + self.assertIn({'tp-id': 'DEG2-CTP-TXRX', 'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-CTP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADM-A1'}, res['network'][0]['node'][i]['supporting-node']) - self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network-topology:node-type'],'DEGREE') + self.assertEqual(res['network'][0]['node'][i]['org-openroadm-common-network:node-type'],'DEGREE') listNode.remove(nodeId) elif(nodeId=='ROADM-C1-SRG1'): #Test related to SRG1 self.assertEqual(len(res['network'][0]['node'][i]['ietf-network-topology:termination-point']),5) - self.assertIn({'tp-id': 'SRG1-CP-TXRX', 'org-openroadm-network-topology:tp-type': 'SRG-TXRX-CP'}, + self.assertIn({'tp-id': 'SRG1-CP-TXRX', 'org-openroadm-common-network:tp-type': 'SRG-TXRX-CP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) - self.assertIn({'tp-id': 'SRG1-PP1-TXRX', 'org-openroadm-network-topology:tp-type': 'SRG-TXRX-PP'}, + self.assertIn({'tp-id': 'SRG1-PP1-TXRX', 'org-openroadm-common-network:tp-type': 'SRG-TXRX-PP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADM-C1'}, res['network'][0]['node'][i]['supporting-node']) - self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network-topology:node-type'],'SRG') + self.assertEqual(res['network'][0]['node'][i]['org-openroadm-common-network:node-type'],'SRG') listNode.remove(nodeId) elif(nodeId=='ROADM-C1-DEG1'): #Test related to DEG1 - self.assertIn({'tp-id': 'DEG1-TTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-TTP'}, + self.assertIn({'tp-id': 'DEG1-TTP-TXRX', 'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-TTP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) - self.assertIn({'tp-id': 'DEG1-CTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-CTP'}, + self.assertIn({'tp-id': 'DEG1-CTP-TXRX', 'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-CTP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADM-C1'}, res['network'][0]['node'][i]['supporting-node']) - self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network-topology:node-type'],'DEGREE') + self.assertEqual(res['network'][0]['node'][i]['org-openroadm-common-network:node-type'],'DEGREE') listNode.remove(nodeId) elif(nodeId=='ROADM-C1-DEG2'): #Test related to DEG1 - self.assertIn({'tp-id': 'DEG2-TTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-TTP'}, + self.assertIn({'tp-id': 'DEG2-TTP-TXRX', 'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-TTP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) - self.assertIn({'tp-id': 'DEG2-CTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-CTP'}, + self.assertIn({'tp-id': 'DEG2-CTP-TXRX', 'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-CTP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADM-C1'}, res['network'][0]['node'][i]['supporting-node']) - self.assertEqual(res['network'][0]['node'][i]['org-openroadm-network-topology:node-type'],'DEGREE') + self.assertEqual(res['network'][0]['node'][i]['org-openroadm-common-network:node-type'],'DEGREE') listNode.remove(nodeId) else: self.assertFalse(True) @@ -767,7 +767,7 @@ class TransportPCEtesting(unittest.TestCase): '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): - if res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-network-topology:link-type'] == 'ROADM-TO-ROADM': + 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'] find= link_id in listR2RLink self.assertEqual(find, True) @@ -787,7 +787,7 @@ class TransportPCEtesting(unittest.TestCase): self.assertEqual(nbLink,26) for i in range(0,nbLink): link_id=res['network'][0]['ietf-network-topology:link'][i]['link-id'] - link_type=res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-network-topology:link-type'] + link_type=res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-common-network:link-type'] link_src=res['network'][0]['ietf-network-topology:link'][i]['source']['source-node'] link_dest=res['network'][0]['ietf-network-topology:link'][i]['destination']['dest-node'] oppLink_id=res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-common-network:opposite-link'] @@ -801,7 +801,7 @@ class TransportPCEtesting(unittest.TestCase): self.assertEqual(res_oppLink['ietf-network-topology:link'][0]['org-openroadm-common-network:opposite-link'],link_id) self.assertEqual(res_oppLink['ietf-network-topology:link'][0]['source']['source-node'],link_dest) self.assertEqual(res_oppLink['ietf-network-topology:link'][0]['destination']['dest-node'],link_src) - oppLink_type=res_oppLink['ietf-network-topology:link'][0]['org-openroadm-network-topology:link-type'] + oppLink_type=res_oppLink['ietf-network-topology:link'][0]['org-openroadm-common-network:link-type'] if link_type=='ADD-LINK': self.assertEqual(oppLink_type, 'DROP-LINK') elif link_type=='DROP-LINK': @@ -878,7 +878,7 @@ class TransportPCEtesting(unittest.TestCase): # XPDR_IN=['ROADMA-SRG1-SRG1-PP1-TXRXtoXPDRA-XPDR1-XPDR1-NETWORK1'] # XPDR_OUT=['XPDRA-XPDR1-XPDR1-NETWORK1toROADMA-SRG1-SRG1-PP1-TXRX'] # for i in range(0,nbLink): -# nodeType=res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-network-topology:link-type'] +# nodeType=res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-common-network:link-type'] # linkId=res['network'][0]['ietf-network-topology:link'][i]['link-id'] # if(nodeType=='EXPRESS-LINK'): # find= linkId in expressLink @@ -909,7 +909,7 @@ class TransportPCEtesting(unittest.TestCase): # self.assertEqual(len(XPDR_OUT),0) # # for i in range(0,nbLink): -# self.assertNotEqual(res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-network-topology:link-type'],'ROADM-TO-ROADM') +# self.assertNotEqual(res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-common-network:link-type'],'ROADM-TO-ROADM') # self.assertNotEqual(res['network'][0]['ietf-network-topology:link'][i]['link-id'],'ROADMC-SRG1-SRG1-CP-TXRXtoROADMC-DEG1-DEG1-CTP-TXRX') # self.assertNotEqual(res['network'][0]['ietf-network-topology:link'][i]['link-id'],'ROADMC-DEG1-DEG1-CTP-TXRXtoROADMC-SRG1-SRG1-CP-TXRX') # self.assertNotEqual(res['network'][0]['ietf-network-topology:link'][i]['link-id'],'ROADMC-SRG1-SRG1-CP-TXRXtoROADMC-DEG2-DEG1-CTP-TXRX') @@ -930,7 +930,7 @@ class TransportPCEtesting(unittest.TestCase): self.assertEqual(nbNode,5) listNode=['XPDR-A1-XPDR1','ROADM-A1-SRG1', 'ROADM-A1-SRG3','ROADM-A1-DEG1','ROADM-A1-DEG2'] for i in range(0,nbNode): - nodeType=res['network'][0]['node'][i]['org-openroadm-network-topology:node-type'] + nodeType=res['network'][0]['node'][i]['org-openroadm-common-network:node-type'] nodeId=res['network'][0]['node'][i]['node-id'] #Tests related to XPDRA nodes if(nodeId=='XPDR-A1-XPDR1'): @@ -939,7 +939,7 @@ class TransportPCEtesting(unittest.TestCase): tpid = res['network'][0]['node'][i]['ietf-network-topology:termination-point'][j]['tp-id'] if (tpid == 'XPDR1-CLIENT1'): self.assertEqual(res['network'][0]['node'][i]['ietf-network-topology:termination-point'][j] - ['org-openroadm-network-topology:tp-type'], 'XPONDER-CLIENT') + ['org-openroadm-common-network:tp-type'], 'XPONDER-CLIENT') self.assertEqual(res['network'][0]['node'][i]['ietf-network-topology:termination-point'][j] ['org-openroadm-network-topology:xpdr-client-attributes']['tail-equipment-id'], 'XPDR1-NETWORK1') @@ -950,9 +950,9 @@ class TransportPCEtesting(unittest.TestCase): #Test related to SRG1 self.assertEqual(nodeType,'SRG') self.assertEqual(len(res['network'][0]['node'][i]['ietf-network-topology:termination-point']),5) - self.assertIn({'tp-id': 'SRG1-CP-TXRX', 'org-openroadm-network-topology:tp-type': 'SRG-TXRX-CP'}, + self.assertIn({'tp-id': 'SRG1-CP-TXRX', 'org-openroadm-common-network:tp-type': 'SRG-TXRX-CP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) - self.assertIn({'tp-id': 'SRG1-PP1-TXRX', 'org-openroadm-network-topology:tp-type': 'SRG-TXRX-PP'}, + self.assertIn({'tp-id': 'SRG1-PP1-TXRX', 'org-openroadm-common-network:tp-type': 'SRG-TXRX-PP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADM-A1'}, res['network'][0]['node'][i]['supporting-node']) @@ -961,9 +961,9 @@ class TransportPCEtesting(unittest.TestCase): #Test related to SRG1 self.assertEqual(nodeType,'SRG') self.assertEqual(len(res['network'][0]['node'][i]['ietf-network-topology:termination-point']),5) - self.assertIn({'tp-id': 'SRG3-CP-TXRX', 'org-openroadm-network-topology:tp-type': 'SRG-TXRX-CP'}, + self.assertIn({'tp-id': 'SRG3-CP-TXRX', 'org-openroadm-common-network:tp-type': 'SRG-TXRX-CP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) - self.assertIn({'tp-id': 'SRG3-PP1-TXRX', 'org-openroadm-network-topology:tp-type': 'SRG-TXRX-PP'}, + self.assertIn({'tp-id': 'SRG3-PP1-TXRX', 'org-openroadm-common-network:tp-type': 'SRG-TXRX-PP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADM-A1'}, res['network'][0]['node'][i]['supporting-node']) @@ -971,9 +971,9 @@ class TransportPCEtesting(unittest.TestCase): elif(nodeId=='ROADM-A1-DEG1'): #Test related to DEG1 self.assertEqual(nodeType,'DEGREE') - self.assertIn({'tp-id': 'DEG1-TTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-TTP'}, + self.assertIn({'tp-id': 'DEG1-TTP-TXRX', 'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-TTP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) - self.assertIn({'tp-id': 'DEG1-CTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-CTP'}, + self.assertIn({'tp-id': 'DEG1-CTP-TXRX', 'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-CTP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADM-A1'}, res['network'][0]['node'][i]['supporting-node']) @@ -981,9 +981,9 @@ class TransportPCEtesting(unittest.TestCase): elif(nodeId=='ROADM-A1-DEG2'): #Test related to DEG2 self.assertEqual(nodeType,'DEGREE') - self.assertIn({'tp-id': 'DEG2-TTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-TTP'}, + self.assertIn({'tp-id': 'DEG2-TTP-TXRX', 'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-TTP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) - self.assertIn({'tp-id': 'DEG2-CTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-CTP'}, + self.assertIn({'tp-id': 'DEG2-CTP-TXRX', 'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-CTP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADM-A1'}, res['network'][0]['node'][i]['supporting-node']) @@ -1075,40 +1075,40 @@ class TransportPCEtesting(unittest.TestCase): for i in range(0,nbNode): self.assertIn({'network-ref': 'openroadm-network', 'node-ref': 'ROADM-A1'}, res['network'][0]['node'][i]['supporting-node']) - nodeType=res['network'][0]['node'][i]['org-openroadm-network-topology:node-type'] + nodeType=res['network'][0]['node'][i]['org-openroadm-common-network:node-type'] nodeId=res['network'][0]['node'][i]['node-id'] if(nodeId=='ROADM-A1-SRG1'): #Test related to SRG1 self.assertEqual(nodeType,'SRG') self.assertEqual(len(res['network'][0]['node'][i]['ietf-network-topology:termination-point']),5) - self.assertIn({'tp-id': 'SRG1-CP-TXRX', 'org-openroadm-network-topology:tp-type': 'SRG-TXRX-CP'}, + self.assertIn({'tp-id': 'SRG1-CP-TXRX', 'org-openroadm-common-network:tp-type': 'SRG-TXRX-CP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) - self.assertIn({'tp-id': 'SRG1-PP1-TXRX', 'org-openroadm-network-topology:tp-type': 'SRG-TXRX-PP'}, + self.assertIn({'tp-id': 'SRG1-PP1-TXRX', 'org-openroadm-common-network:tp-type': 'SRG-TXRX-PP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) listNode.remove(nodeId) elif(nodeId=='ROADM-A1-SRG3'): #Test related to SRG1 self.assertEqual(nodeType,'SRG') self.assertEqual(len(res['network'][0]['node'][i]['ietf-network-topology:termination-point']),5) - self.assertIn({'tp-id': 'SRG3-CP-TXRX', 'org-openroadm-network-topology:tp-type': 'SRG-TXRX-CP'}, + self.assertIn({'tp-id': 'SRG3-CP-TXRX', 'org-openroadm-common-network:tp-type': 'SRG-TXRX-CP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) - self.assertIn({'tp-id': 'SRG3-PP1-TXRX', 'org-openroadm-network-topology:tp-type': 'SRG-TXRX-PP'}, + self.assertIn({'tp-id': 'SRG3-PP1-TXRX', 'org-openroadm-common-network:tp-type': 'SRG-TXRX-PP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) listNode.remove(nodeId) elif(nodeId=='ROADM-A1-DEG1'): #Test related to DEG1 self.assertEqual(nodeType,'DEGREE') - self.assertIn({'tp-id': 'DEG1-TTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-TTP'}, + self.assertIn({'tp-id': 'DEG1-TTP-TXRX', 'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-TTP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) - self.assertIn({'tp-id': 'DEG1-CTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-CTP'}, + self.assertIn({'tp-id': 'DEG1-CTP-TXRX', 'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-CTP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) listNode.remove(nodeId) elif(nodeId=='ROADM-A1-DEG2'): #Test related to DEG2 self.assertEqual(nodeType,'DEGREE') - self.assertIn({'tp-id': 'DEG2-TTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-TTP'}, + self.assertIn({'tp-id': 'DEG2-TTP-TXRX', 'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-TTP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) - self.assertIn({'tp-id': 'DEG2-CTP-TXRX', 'org-openroadm-network-topology:tp-type': 'DEGREE-TXRX-CTP'}, + self.assertIn({'tp-id': 'DEG2-CTP-TXRX', 'org-openroadm-common-network:tp-type': 'DEGREE-TXRX-CTP'}, res['network'][0]['node'][i]['ietf-network-topology:termination-point']) listNode.remove(nodeId) else: @@ -1154,17 +1154,17 @@ class TransportPCEtesting(unittest.TestCase): 'ROADM-A1-DEG1-DEG1-CTP-TXRXtoROADM-A1-SRG3-SRG3-CP-TXRX','ROADM-A1-DEG2-DEG2-CTP-TXRXtoROADM-A1-SRG3-SRG3-CP-TXRX'] roadmtoroadmLink = 0 for i in range(0,nbLink): - if (res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-network-topology:link-type']=='EXPRESS-LINK'): + if (res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-common-network:link-type']=='EXPRESS-LINK'): link_id = res['network'][0]['ietf-network-topology:link'][i]['link-id'] find= link_id in expressLink self.assertEqual(find, True) expressLink.remove(link_id) - elif (res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-network-topology:link-type']=='ADD-LINK'): + elif (res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-common-network:link-type']=='ADD-LINK'): link_id = res['network'][0]['ietf-network-topology:link'][i]['link-id'] find= link_id in addLink self.assertEqual(find, True) addLink.remove(link_id) - elif (res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-network-topology:link-type']=='DROP-LINK'): + elif (res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-common-network:link-type']=='DROP-LINK'): link_id = res['network'][0]['ietf-network-topology:link'][i]['link-id'] find= link_id in dropLink self.assertEqual(find, True) @@ -1176,8 +1176,8 @@ class TransportPCEtesting(unittest.TestCase): self.assertEqual(len(dropLink),0) self.assertEqual(roadmtoroadmLink, 6) for i in range(0,nbLink): - self.assertNotEqual(res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-network-topology:link-type'],'XPONDER-OUTPUT') - self.assertNotEqual(res['network'][0]['ietf-network-topology:link'][i]['org-openroadm-network-topology:link-type'],'XPONDER-INPUT') + 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): url = ("{}/config/network-topology:" -- 2.36.6